[oe-commits] org.oe.dev merge of '14adef1cb8437a9298373d856f25c230125dcdf6'

[oe commit]

merge of '14adef1cb8437a9298373d856f25c230125dcdf6'
     and 'b1eda41fd5a73d8e2f521e7ad1668a7736e90afd'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 32c3532162bccf620b7b8cff0f98f92a1f519b3a
ViewMTN: http://monotone.openembedded.org/revision/info/32c3532162bccf620b7b8cff0f98f92a1f519b3a
Files:
1
packages/vim/gvim_7.0.bb
packages/fltk/efltk_2.0.7.bb
classes/sdl.bbclass
Diffs:

#
# mt diff -r14adef1cb8437a9298373d856f25c230125dcdf6 -r32c3532162bccf620b7b8cff0f98f92a1f519b3a
#
# 
# 
# patch "packages/vim/gvim_7.0.bb"
#  from [aca392c46df5bcfb14ee82d2c98c15441e2f9e43]
#    to [0a49cbbd6b912f9b8c9547ee29032ec0c986b41c]
# 
============================================================
--- packages/vim/gvim_7.0.bb	aca392c46df5bcfb14ee82d2c98c15441e2f9e43
+++ packages/vim/gvim_7.0.bb	0a49cbbd6b912f9b8c9547ee29032ec0c986b41c
@@ -1,8 +1,8 @@ require vim.inc
 VIMVER = "70"
 
 require vim.inc
 
-DEPENDS += "gtk+"
+DEPENDS += "gtk+ xt"
 PR = "r1"
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/vim-7.0', '${FILE_DIRNAME}/vim', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
 


#
# mt diff -rb1eda41fd5a73d8e2f521e7ad1668a7736e90afd -r32c3532162bccf620b7b8cff0f98f92a1f519b3a
#
# 
# 
# 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