[oe-commits] Koen Kooi : fbida: update to latest git and make motif a PACKAGECONFIG option
git at git.openembedded.org
git at git.openembedded.org
Wed Apr 23 15:20:08 UTC 2014
Module: meta-openembedded.git
Branch: master-next
Commit: 07125053b775583c478b8ce6d2002c938f6e6f37
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=07125053b775583c478b8ce6d2002c938f6e6f37
Author: Koen Kooi <koen at dominion.thruhere.net>
Date: Mon Apr 21 10:55:58 2014 +0200
fbida: update to latest git and make motif a PACKAGECONFIG option
The x11 dependencies are now deterministic instead of enabling based on
DISTRO_FEATURES without changing DEPENDS.
Disable motif by default as well, since *fb*ida is supposed to be
framebuffer only by default.
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
meta-oe/recipes-graphics/fbida/fbida_git.bb | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb
index 9eea664..f4dd01d 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_git.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif curl"
SRC_URI = "git://git.kraxel.org/fbida"
-SRCREV = "cb0ce5fa5f42bfaea4f8f326bcd8914dd14e782d"
+SRCREV = "6aa5563cb3c8864ad15cf83eb6fca3b773da1099"
PV = "2.09+git${SRCPV}"
S = "${WORKDIR}/git"
@@ -21,15 +21,12 @@ PACKAGECONFIG ??= "gif png"
PACKAGECONFIG[gif] = ",,libungif"
PACKAGECONFIG[png] = ",,libpng"
PACKAGECONFIG[tiff] = ",,tiff"
+PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif"
do_compile() {
sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:' ${S}/GNUmakefile
- if [ -z "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" ]; then
- sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
- fi
-
# Be sure to respect preferences (force to "no")
# Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
if [ -z "${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)}" ]; then
@@ -41,6 +38,9 @@ do_compile() {
if [ -z "${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)}" ]; then
sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
fi
+ if [ -z "${@base_contains('PACKAGECONFIG', 'motif', 'motif', '', d)}" ]; then
+ sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
+ fi
oe_runmake
}
More information about the Openembedded-commits
mailing list