[oe-commits] org.oe.dev merge of '64e8fcf86d823ff35b714a70b3125d2fc95ded55'

[mickeyl commit]

merge of '64e8fcf86d823ff35b714a70b3125d2fc95ded55'
     and '7cc9c98056838b4d2eb67baf00c13e220ae94a0a'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 14adef1cb8437a9298373d856f25c230125dcdf6
ViewMTN: http://monotone.openembedded.org/revision/info/14adef1cb8437a9298373d856f25c230125dcdf6
Files:
1
packages/dbus/dbus.inc
packages/fltk/efltk_2.0.7.bb
classes/sdl.bbclass
Diffs:

#
# mt diff -r64e8fcf86d823ff35b714a70b3125d2fc95ded55 -r14adef1cb8437a9298373d856f25c230125dcdf6
#
# 
# 
# patch "packages/dbus/dbus.inc"
#  from [841819e6fcb66b9b194b83aa29fec8029bca31db]
#    to [f59c7592c9d9fa4d19d5c3debfde3b58b9bfdf79]
# 
============================================================
--- packages/dbus/dbus.inc	841819e6fcb66b9b194b83aa29fec8029bca31db
+++ packages/dbus/dbus.inc	f59c7592c9d9fa4d19d5c3debfde3b58b9bfdf79
@@ -85,5 +85,7 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/init.d
 	install -m 0755 ${WORKDIR}/dbus-1.init ${D}${sysconfdir}/init.d/dbus-1
 	# the stock install seems to install the libtool wrapper script, so we have to copy this manually :M:
-	install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
+	if [ -e bus/.libs/dbus-daemon-launch-helper ]; then
+		install -m 0755 bus/.libs/dbus-daemon-launch-helper ${D}${libexecdir}/
+	fi
 }


#
# mt diff -r7cc9c98056838b4d2eb67baf00c13e220ae94a0a -r14adef1cb8437a9298373d856f25c230125dcdf6
#
# 
# 
# add_file "packages/fltk/efltk_2.0.7.bb"
#  content [517c26248bfb9ee15cc164e0da939463e64635a8]
# 
# patch "classes/sdl.bbclass"
#  from [5f1c659d9ecfa56214c29c1ef56adb91b4aab3d0]
#    to [d03f6596dbd93ec0a728e892a635a3627562ac60]
# 
============================================================
--- packages/fltk/efltk_2.0.7.bb	517c26248bfb9ee15cc164e0da939463e64635a8
+++ packages/fltk/efltk_2.0.7.bb	517c26248bfb9ee15cc164e0da939463e64635a8
@@ -0,0 +1,67 @@
+DESCRIPTION = "EFLTK is a cross-platform C++ GUI toolkit"
+HOMEPAGE = "http://equinox-project.org/page/documentation"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+DEPENDS = "zlib jpeg libpng libxext libxft"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ede/efltk-${PV}.tar.gz"
+S = "${WORKDIR}/efltk"
+
+inherit autotools binconfig
+
+EXTRA_OECONF = "\
+  --enable-shared \
+  --enable-xdbe \
+  --enable-xft \
+  --enable-gl \
+  --disable-mysql \
+  --disable-unixODBC \
+  --x-includes=${STAGING_INCDIR}/freetype2 \
+  --x-libraries=${STAGING_LIBDIR} \
+"
+
+# yes, this is nasty, but configure is so broken there is no other way
+do_configure() {
+	gnu-configize
+	oe_runconf
+	mv -f config.h save
+	autotools_do_configure
+	mv -f save config.h
+}
+
+# more nasties
+do_configure_append() {
+	sed -i s,/usr/include,${STAGING_INCDIR}, makeinclude
+	sed -i s,/usr/include/freetype2,, makeinclude
+	sed -i s,/usr/bin/strip,echo, makeinclude
+	sed -i s,CONFIGDIR,'"${datadir}/ede/"', src/core/Fl_Config.cpp
+}
+
+do_stage() {
+    oe_runmake install prefix="${STAGING_DIR}" \
+              bindir="${STAGING_BINDIR}" \
+              includedir="${STAGING_INCDIR}" \
+              libdir="${STAGING_LIBDIR}" \
+              datadir="${STAGING_DATADIR}"
+}
+
+do_install () {
+	install -d ${D}${libdir}
+    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}', 'libefltk${PV}', d)
+}
+
+LEAD_SONAME = "libefltk.so"
+
+FILES_${PN} += "${libdir}/fltk/*.theme"
+FILES_${PN}-dbg += "${libdir}/fltk/.debug"
============================================================
--- classes/sdl.bbclass	5f1c659d9ecfa56214c29c1ef56adb91b4aab3d0
+++ classes/sdl.bbclass	d03f6596dbd93ec0a728e892a635a3627562ac60
@@ -8,6 +8,8 @@ APPIMAGE ?= "${WORKDIR}/${PN}.png"
 APPNAME ?= "${PN}"
 APPIMAGE ?= "${WORKDIR}/${PN}.png"
 
+export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config"
+
 sdl_do_sdl_install() {
 	install -d ${D}${datadir}/applications
 	install -d ${D}${datadir}/pixmaps