summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-01-14 13:49:38 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-01-15 00:50:14 +0100
commit279730510071b1ea34d317693608d5183757bf62 (patch)
treeac82ac7d1e77eeaeabd541fac5f8473f6760ac3c
parentfbf760ce9dad0e7e028d1eee16e082f6c2f82021 (diff)
fltk2: update SRCREV, fix build and packaging
* fix build by defining XFT_MAJOR, the same as koen's commit for fltk1 * update SRCREV to version recommended for dillo-2.1.1 * fix libfltk2-images packaging (missing .so, only links were in that package) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--recipes/fltk/fltk2_svn.bb5
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 0e46dd3828..703700f85a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -78,7 +78,7 @@ SRCREV_pn-ezxd ?= "2074"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-ffalarms ?= "67"
SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-fltk2 ?= "6671"
+SRCREV_pn-fltk2 ?= "6916"
SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
diff --git a/recipes/fltk/fltk2_svn.bb b/recipes/fltk/fltk2_svn.bb
index d34af94654..0d25ff6cb1 100644
--- a/recipes/fltk/fltk2_svn.bb
+++ b/recipes/fltk/fltk2_svn.bb
@@ -6,6 +6,7 @@ LICENSE = "LGPL"
DEPENDS = "zlib jpeg libpng libxext libxft xinput"
PV = "1.9.9+svnr${SRCPV}"
+PR = "r1"
SRC_URI = "\
svn://svn.easysw.com/public/fltk/fltk;proto=http;module=trunk \
@@ -29,6 +30,8 @@ do_configure() {
oe_runconf
}
+TARGET_CC_ARCH += "-DXFT_MAJOR=2"
+
do_install () {
sed -i "s|^STRIP.*=.*$|STRIP = ${STRIP}|" makeinclude
sed -i "s|^bindir.*=.*$|bindir = ${D}${bindir}|" makeinclude
@@ -47,5 +50,5 @@ do_install () {
PACKAGES =+ "${PN}-fluid ${PN}-images"
FILES_${PN}-fluid = "${bindir}/fluid2"
FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-images = "${libdir}/libfltk2_images*.so.*"
+FILES_${PN}-images = "${libdir}/libfltk2_images*.so*"
FILES_${PN}-dev += "${bindir}/fltk2-config"