CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fltk: Replace use of freetype-config with pkg-config Drop blacklist entry

Browse Source 
Tested building for MIPS 32bit QEMU

Signed-off-by: Florian Boor <florian@kernelconcepts.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Florian Boor 2015-03-02 11:33:47 +01:00 committed by Martin Jansa
parent 75212d36f5
commit 308aeec34f
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
meta-oe/recipes-support/fltk/fltk-1.1.10/fltk-no-freetype-config.patch Normal file
View File

@ -0,0 +1,18 @@
--- a/configure.in.orig 2015-03-01 16:00:35.956432907 +0100
+++ b/configure.in 2015-03-01 16:04:23.269580093 +0100
@@ -865,11 +865,11 @@
AC_ARG_ENABLE(xft, [ --enable-xft turn on Xft support [default=no]])
if test x$enable_xft = xyes; then
- AC_PATH_PROG(FTCONFIG,freetype-config)
+ AC_PATH_PROG(PKGCONFIG,pkg-config)
- if test "x$FTCONFIG" != x; then
- CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
- CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
+ if test "x$PKGCONFIG" != x; then
+ CPPFLAGS="`$PKGCONFIG --cflags xft` $CPPFLAGS"
+ CXXFLAGS="`$PKGCONFIG --cflags xft` $CXXFLAGS"
AC_CHECK_HEADER(X11/Xft/Xft.h,
AC_CHECK_LIB(Xft, XftDrawCreate,

7
meta-oe/recipes-support/fltk/fltk_1.1.10.bb
View File

@ -6,19 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1c0b73db66884b6a925e727400315130"
DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
PR = "r1"
PNBLACKLIST[fltk] ?= "broken: still uses /usr/bin/freetype-config"
PR = "r2"
SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2 \
file://disable_test.patch \
file://dso-fix.patch \
file://libpng15.patch \
file://fltk-no-freetype-config.patch \
"
S = "${WORKDIR}/fltk-${PV}"
inherit lib_package autotools-brokensep binconfig
inherit lib_package autotools-brokensep binconfig pkgconfig
TARGET_CC_ARCH += "${LDFLAGS} -DXFT_MAJOR=2"