merge of '47def83cc939b796d835e0a077a571398d185623'

     and 'fcedd5113583dc0d7c0732390bf864e09086a119'

1 files changed, 14 insertions, 14 deletions

diff --git a/packages/fltk/fltk_1.1.7.bb b/packages/fltk/fltk_1.1.7.bb
index 10b68ef017..dca48837a8 100644
--- a/packages/fltk/fltk_1.1.7.bb
+++ b/packages/fltk/fltk_1.1.7.bb
@@ -3,7 +3,9 @@ HOMEPAGE = "http://www.fltk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
-DEPENDS = "jpeg libpng zlib"
+PR= "r1"
+
+DEPENDS = "zlib jpeg libpng libxext libxft"
 
 SRC_URI = "ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${PV}/fltk-${PV}-source.tar.bz2"
 
@@ -11,26 +13,26 @@ S = "${WORKDIR}/fltk-${PV}"
 
 inherit autotools binconfig
 
-EXTRA_OECONF = "--enable-shared --disable-gl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
+EXTRA_OECONF = "--enable-shared --enable-xdbe --enable-xft --enable-gl --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}"
 
 do_configure() {
         oe_runconf
 }
 
+do_stage() {
+        oe_runmake install prefix="${STAGING_DIR}" \
+               bindir="${STAGING_BINDIR}" \
+               includedir="${STAGING_INCDIR}" \
+               libdir="${STAGING_LIBDIR}" \
+               datadir="${STAGING_DATADIR}"
+}
+
 do_install () {
-        oe_runmake prefix="${D}${prefix}" \
+        oe_runmake install prefix="${D}${prefix}" \
                 bindir="${D}${bindir}" \
                 libdir="${D}${libdir}" \
                 includedir="${D}${includedir}" \
-                install
-}
-
-do_stage() {
-        oe_runmake install prefix=${STAGING_DIR} \
-               bindir=${STAGING_BINDIR} \
-               includedir=${STAGING_INCDIR} \
-               libdir=${STAGING_LIBDIR} \
-               datadir=${STAGING_DATADIR}
+                datadir="${STAGING_DATADIR}"
 }
 
 python populate_packages_prepend () {
@@ -39,5 +41,3 @@ python populate_packages_prepend () {
 }
 
 LEAD_SONAME = "libfltk.so"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}/fltk-config"