merge of 1ee22e5dc2cdeec8a88f1136a019329901a0c9f3

     and b971ecbe14a98d023c916e28714ea42ab6a3b1d0

4 files changed, 70 insertions, 4 deletions

diff --git a/packages/dfb++/.mtn2git_empty b/packages/dfb++/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/dfb++/.mtn2git_empty
+++ /dev/null
diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.23.bb
new file mode 100644
index 0000000000..4574b8eb4c
--- /dev/null
+++ b/packages/directfb/++dfb_0.9.23.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
+HOMEPAGE = "http://directfb.org"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "directfb"
+LICENSE = "LGPL"
+
+# needs a g++4 patch
+BROKEN = "1"
+
+SRC_URI = "http://www.directfb.org/downloads/Extras/++DFB-${PV}.tar.gz"
+S = "${WORKDIR}/++DFB-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+        oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \
+                          'oldincludedir=/include' 'datadir=/share' \
+                          'DESTDIR=${STAGING_LIBDIR}/..' \
+                          install-dfbppincludeHEADERS
+        oe_runmake -C dfb++ 'libdir=/lib' 'includedir=/include/dfb++' \
+                          'oldincludedir=/include' 'datadir=/share' \
+              'DESTDIR=${STAGING_LIBDIR}/..' \
+              install-libLTLIBRARIES
+}
+
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}
diff --git a/packages/dfb++/dfb++_0.9.22.bb b/packages/directfb/dfb++_0.9.23.bb
index 2e88ba6789..0e0772da94 100644
--- a/packages/dfb++/dfb++_0.9.22.bb
+++ b/packages/directfb/dfb++_0.9.23.bb
@@ -1,17 +1,18 @@
 DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
+HOMEPAGE = "http://directfb.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "directfb"
-
 LICENSE = "LGPL"
 
-SRC_URI = "http://www.directfb.org/downloads/Old/DFB++-${PV}.tar.gz"
+# needs a g++4 patch
+BROKEN = "1"
+
+SRC_URI = "http://www.directfb.org/downloads/Extras/DFB++-${PV}.tar.gz"
 S = "${WORKDIR}/DFB++-${PV}"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = ""
-
 do_stage() {
         oe_runmake -C include 'libdir=/lib' 'includedir=/include/dfb++' \
                           'oldincludedir=/include' 'datadir=/share' \
diff --git a/packages/directfb/directfb_0.9.25.1.bb b/packages/directfb/directfb_0.9.25.1.bb
new file mode 100644
index 0000000000..7a54f3f304
--- /dev/null
+++ b/packages/directfb/directfb_0.9.25.1.bb
@@ -0,0 +1,35 @@
+DESCRIPTION = "DirectFB is a thin library that provides developers \
+with hardware graphics acceleration, input device handling and \
+abstraction, an integrated windowing system with support for \
+translucent windows and multiple display layers on top of the \
+Linux framebuffer device."
+SECTION = "libs"
+LICENSE = "LGPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://directfb.org"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "jpeg libpng freetype zlib"
+PR = "r0"
+RV = "0.9.25"
+
+SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz"
+S = "${WORKDIR}/DirectFB-${PV}"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-gfxdrivers=none --enable-libmpeg3=no --enable-freetype=yes --enable-sdl=no"
+PARALLEL_MAKE = ""
+
+do_stage() {
+	oe_runmake 'DESTDIR=${STAGING_LIBDIR}/' install
+}
+
+do_install() {
+        oe_runmake 'DESTDIR=${D}' install
+}
+
+FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
+                          ${libdir}/directfb-${RV}/inputdrivers/*.so \
+                          ${libdir}/directfb-${RV}/interfaces/*/*.so \
+			  ${libdir}/directfb-${RV}/wm/*.so \
+                          ${datadir}/directfb-${RV}"