[oe-commits] org.oe.dev fltk: update to 1.1.9 and make it build again

[woglinde2 commit]

fltk: update to 1.1.9 and make it build again
* make fltk build again
* disable test-dir for now and until we fixed that fluid is build natvie
* commit makes bug 430 invalid

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: e39129641bd214aff1dd438b4331a2f1531ca1cc
ViewMTN: http://monotone.openembedded.org/revision/info/e39129641bd214aff1dd438b4331a2f1531ca1cc
Files:
1
packages/fltk/fltk_1.1.7.bb
packages/fltk/fltk_1.1.9.bb
packages/fltk/files
packages/fltk/files/disable_test.patch
Diffs:

#
# mt diff -r3c3876e3f4fa037f2c9bfce18e3192822f1557cf -re39129641bd214aff1dd438b4331a2f1531ca1cc
#
#
#
# rename "packages/fltk/fltk_1.1.7.bb"
#     to "packages/fltk/fltk_1.1.9.bb"
# 
# add_dir "packages/fltk/files"
# 
# add_file "packages/fltk/files/disable_test.patch"
#  content [78a8f72d5cab855875150b4cf9a608df466cbd14]
# 
# add_file "packages/fltk/fltk_1.1.7.bb"
#  content [635fae23fe9dbb018af5f7fd420bbc8bad04517d]
# 
# patch "packages/fltk/fltk_1.1.9.bb"
#  from [635fae23fe9dbb018af5f7fd420bbc8bad04517d]
#    to [6dd950caacf61f669d6da46d96529e0cdb49d3b7]
#
============================================================
--- packages/fltk/files/disable_test.patch	78a8f72d5cab855875150b4cf9a608df466cbd14
+++ packages/fltk/files/disable_test.patch	78a8f72d5cab855875150b4cf9a608df466cbd14
@@ -0,0 +1,13 @@
+Index: fltk-1.1.9/Makefile
+===================================================================
+--- fltk-1.1.9.orig/Makefile	2008-06-06 16:14:11.936736201 +0200
++++ fltk-1.1.9/Makefile	2008-06-06 16:14:22.526357637 +0200
+@@ -27,7 +27,7 @@
+ 
+ include makeinclude
+ 
+-DIRS	=	$(IMAGEDIRS) src fluid test documentation
++DIRS	=	$(IMAGEDIRS) src fluid documentation
+ 
+ all: makeinclude fltk-config
+ 	for dir in $(DIRS); do\
============================================================
--- packages/fltk/fltk_1.1.7.bb	635fae23fe9dbb018af5f7fd420bbc8bad04517d
+++ packages/fltk/fltk_1.1.7.bb	635fae23fe9dbb018af5f7fd420bbc8bad04517d
@@ -0,0 +1,38 @@
+DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://www.fltk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "zlib jpeg libpng libxext libxft"
+PR = "r2"
+
+SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2"
+
+S = "${WORKDIR}/fltk-${PV}"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "--enable-shared --enable-xdbe --enable-xft --enable-gl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+
+do_configure() {
+        oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
+
+do_install () {
+        oe_runmake install prefix="${D}${prefix}" \
+                bindir="${D}${bindir}" \
+                libdir="${D}${libdir}" \
+                includedir="${D}${includedir}" \
+                datadir="${STAGING_DATADIR}"
+}
+
+python populate_packages_prepend () {
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d)
+}
+
+LEAD_SONAME = "libfltk.so"
============================================================
--- packages/fltk/fltk_1.1.7.bb	635fae23fe9dbb018af5f7fd420bbc8bad04517d
+++ packages/fltk/fltk_1.1.9.bb	6dd950caacf61f669d6da46d96529e0cdb49d3b7
@@ -3,16 +3,21 @@ LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "zlib jpeg libpng libxext libxft"
-PR = "r2"
+DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
+PR = "r0"
 
-SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2"
+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;patch=1 \
+	  "
 
 S = "${WORKDIR}/fltk-${PV}"
 
-inherit autotools binconfig
+inherit lib_package autotools binconfig
 
-EXTRA_OECONF = "--enable-shared --enable-xdbe --enable-xft --enable-gl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+EXTRA_OECONF = "--enable-shared \
+		--enable-threads \
+		--enable-xdbe --enable-xft --enable-gl \
+		--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
 
 do_configure() {
         oe_runconf
@@ -22,14 +27,6 @@ do_stage() {
 	autotools_stage_all
 }
 
-do_install () {
-        oe_runmake install prefix="${D}${prefix}" \
-                bindir="${D}${bindir}" \
-                libdir="${D}${libdir}" \
-                includedir="${D}${includedir}" \
-                datadir="${STAGING_DATADIR}"
-}
-
 python populate_packages_prepend () {
         if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
                 bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d)