merge of 28a5dee63c03c0d1372c9c00f5faaee2054fc87c

     and 91ec22075c5dc6f8ba0182e3781c2c79b37a8ba6

6 files changed, 19 insertions, 46 deletions

diff --git a/packages/directfb/++dfb_0.9.23.bb b/packages/directfb/++dfb_0.9.23.bb
index 4574b8eb4c..4c1f6bc482 100644
--- a/packages/directfb/++dfb_0.9.23.bb
+++ b/packages/directfb/++dfb_0.9.23.bb
@@ -1,30 +1,19 @@
 DESCRIPTION = "A C++ Wrapper for the directfb framebuffer library."
 HOMEPAGE = "http://directfb.org"
 SECTION = "libs"
-PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 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
+	autotools_stage_all
 }
 
-
 do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
diff --git a/packages/directfb/dfb++_0.9.23.bb b/packages/directfb/dfb++_0.9.23.bb
deleted file mode 100644
index 0e0772da94..0000000000
--- a/packages/directfb/dfb++_0.9.23.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-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/directfb/directfb-examples_0.9.23.bb b/packages/directfb/directfb-examples_0.9.23.bb
index 423e888fd8..5357b55b6d 100644
--- a/packages/directfb/directfb-examples_0.9.23.bb
+++ b/packages/directfb/directfb-examples_0.9.23.bb
@@ -2,6 +2,7 @@ DESCRIPTION = "DirectFB examples"
 DEPENDS = "directfb"
 SECTION = "devel/examples"
 LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de"
 
 SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz"
 S = "${WORKDIR}/DirectFB-examples-${PV}"
diff --git a/packages/directfb/directfb_0.9.25.1.bb b/packages/directfb/directfb_0.9.25.1.bb
index 9d5566405a..76e849d14b 100644
--- a/packages/directfb/directfb_0.9.25.1.bb
+++ b/packages/directfb/directfb_0.9.25.1.bb
@@ -5,14 +5,14 @@ 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 = "r1"
 RV = "0.9.25"
 
-SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz"
+SRC_URI = "http://directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
+           file://fix-pkgconfig-specs.patch;patch=1"
 S = "${WORKDIR}/DirectFB-${PV}"
 
 inherit autotools pkgconfig
@@ -31,5 +31,5 @@ do_install() {
 FILES_directfb_append = " ${libdir}/directfb-${RV}/systems/*.so \
                           ${libdir}/directfb-${RV}/inputdrivers/*.so \
                           ${libdir}/directfb-${RV}/interfaces/*/*.so \
-			  ${libdir}/directfb-${RV}/wm/*.so \
+                          ${libdir}/directfb-${RV}/wm/*.so \
                           ${datadir}/directfb-${RV}"
diff --git a/packages/directfb/files/.mtn2git_empty b/packages/directfb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/directfb/files/.mtn2git_empty
diff --git a/packages/directfb/files/fix-pkgconfig-specs.patch b/packages/directfb/files/fix-pkgconfig-specs.patch
new file mode 100644
index 0000000000..401d7fa443
--- /dev/null
+++ b/packages/directfb/files/fix-pkgconfig-specs.patch
@@ -0,0 +1,13 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- DirectFB-0.9.25.1/directfb.pc.in~fix-pkgconfig-specs	2005-10-19 01:14:04.000000000 +0200
++++ DirectFB-0.9.25.1/directfb.pc.in	2006-05-20 01:02:37.000000000 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
+-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb