4 files changed, 56 insertions, 2 deletions
diff --git a/recipes/fltk/efltk/fix.void.cast.patch b/recipes/fltk/efltk/fix.void.cast.patch
new file mode 100644
index 0000000000..d66c77f867
--- /dev/null
+++ b/recipes/fltk/efltk/fix.void.cast.patch
@@ -0,0 +1,15 @@
+From:
+http://sourceforge.net/projects/ede/forums/forum/249614/topic/3458921
+
+diff -uNr efltk.orig/src/core/filename_list.cpp efltk/src/core/filename_list.cpp
+--- efltk.orig/src/core/filename_list.cpp	2007-11-16 14:17:51.000000000 +0100
++++ efltk/src/core/filename_list.cpp	2010-01-15 01:03:59.000000000 +0100
+@@ -59,7 +59,7 @@
+     // The vast majority of Unix systems want the sort function to have this
+     // prototype, most likely so that it can be passed to qsort without any
+     // changes:
+-    return scandir(dir, list, 0, (int(*)(const void*,const void*))sort);
++    return scandir(dir, list, 0, (int(*)(const dirent **,const dirent **))sort);
+ #else
+     // This version is when we define our own scandir (WIN32 and perhaps
+     // some Unix systems) and apparently on Irix:
diff --git a/recipes/fltk/efltk_2.0.7.bb b/recipes/fltk/efltk_2.0.7.bb
index b048e078b3..35485f34f9 100644
--- a/recipes/fltk/efltk_2.0.7.bb
+++ b/recipes/fltk/efltk_2.0.7.bb
@@ -6,7 +6,8 @@ LICENSE = "LGPL"
 DEPENDS = "zlib jpeg libpng libxext libxft"
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/ede/efltk-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/ede/efltk-${PV}.tar.gz \
+           file://fix.void.cast.patch;patch=1"
 S = "${WORKDIR}/efltk"
 
 inherit autotools binconfig
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"
diff --git a/recipes/fltk/fltk_1.1.10.bb b/recipes/fltk/fltk_1.1.10.bb
new file mode 100644
index 0000000000..ec01343ed3
--- /dev/null
+++ b/recipes/fltk/fltk_1.1.10.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://www.fltk.org"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft"
+
+PR = "r1"
+
+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 \
+#       http://ftp.de.debian.org/debian/pool/main/f/fltk1.1/fltk1.1_1.1.10-2.diff.gz;patch=1 \
+	  "
+
+S = "${WORKDIR}/fltk-${PV}"
+
+inherit lib_package autotools_stage binconfig
+
+TARGET_CC_ARCH += "${LDFLAGS} -DXFT_MAJOR=2"
+
+EXTRA_OECONF = "--enable-shared \
+		--enable-threads \
+		--enable-xdbe --enable-xft --enable-gl \
+		--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+
+do_configure() {
+        oe_runconf
+}
+
+python populate_packages_prepend () {
+        if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
+                bb.data.setVar('PKG_${PN}', 'libfltk${PV}', d)
+}
+
+LEAD_SONAME = "libfltk.so"