[oe-commits] org.oe.dev fltk 1.1.7: Better configure options and revamped staging.

[joaquinduran commit]

fltk 1.1.7: Better configure options and revamped staging.
* Add support for anti aliased fonts.
* Enable double buffer to avoid flicking.
* Enable OpenGL.
* Fix dependency problems with X11 libraries.
* Closes #1555

Author: joaquinduran at adtelecom.es
Branch: org.openembedded.dev
Revision: fcedd5113583dc0d7c0732390bf864e09086a119
ViewMTN: http://monotone.openembedded.org/revision.psp?id=fcedd5113583dc0d7c0732390bf864e09086a119
Files:
1
packages/fltk/fltk_1.1.7.bb
Diffs:

#
# mt diff -r75de3114c40a44451af2c6d7f40334d41425ff61 -rfcedd5113583dc0d7c0732390bf864e09086a119
#
# 
# 
# patch "packages/fltk/fltk_1.1.7.bb"
#  from [198861d3e28408c50aaa88380a13229f8af7c624]
#    to [03b316af3d0169c43d4f41d12dec0ab2e918e3ef]
# 
============================================================
--- packages/fltk/fltk_1.1.7.bb	198861d3e28408c50aaa88380a13229f8af7c624
+++ packages/fltk/fltk_1.1.7.bb	03b316af3d0169c43d4f41d12dec0ab2e918e3ef
@@ -1,43 +1,43 @@ LICENSE = "LGPL"
 DESCRIPTION = "FLTK is a cross-platform C++ GUI toolkit"
 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"
 
 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
+                datadir="${STAGING_DATADIR}"
 }
 
-do_stage() {
-        oe_runmake install prefix=${STAGING_DIR} \
-               bindir=${STAGING_BINDIR} \
-               includedir=${STAGING_INCDIR} \
-               libdir=${STAGING_LIBDIR} \
-               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"
-FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += " ${bindir}/fltk-config"