From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 14 Jan 2010 12:49:38 +0000 (+0100)
Subject: fltk2: update SRCREV, fix build and packaging
X-Git-Tag: Release-2010-05/1~892
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=279730510071b1ea34d317693608d5183757bf62;p=openembedded.git

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>
---

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"