merge of '4c3e95612d7e11dff6afb443db21824d2266449b'

     and 'e07ea8506d3c48b797607d8f49339c4ac605d045'

9 files changed, 155 insertions, 3 deletions

diff --git a/packages/directfb/directfb-1.1.0/.mtn2git_empty b/packages/directfb/directfb-1.1.0/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/directfb/directfb-1.1.0/.mtn2git_empty
diff --git a/packages/directfb/directfb-1.1.0/fix-pkgconfig-cflags.patch b/packages/directfb/directfb-1.1.0/fix-pkgconfig-cflags.patch
new file mode 100644
index 0000000000..5526776de3
--- /dev/null
+++ b/packages/directfb/directfb-1.1.0/fix-pkgconfig-cflags.patch
@@ -0,0 +1,57 @@
+Index: DirectFB-1.1.0/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/directfb-internal.pc.in	2008-06-22 16:16:13.851722040 +0200
++++ DirectFB-1.1.0/directfb-internal.pc.in	2008-06-22 16:16:33.665465096 +0200
+@@ -2,10 +2,10 @@
+ exec_prefix=@exec_prefix@
+ moduledir=@MODULEDIR@
+ moduledirname=@MODULEDIRNAME@
+-includedir=@INTERNALINCLUDEDIR@
++includedir=@includedir@
+ 
+ Name: DirectFB-Internal
+ Description: Third party module support package for DirectFB.
+ Version: @VERSION@
+ Requires: directfb = @VERSION@
+-Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}/directfb-internal
+Index: DirectFB-1.1.0/directfb.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/directfb.pc.in	2008-06-22 16:16:13.868387652 +0200
++++ DirectFB-1.1.0/directfb.pc.in	2008-06-22 16:16:50.816223652 +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
+Index: DirectFB-1.1.0/lib/direct/direct.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/lib/direct/direct.pc.in	2008-06-22 16:16:13.888387824 +0200
++++ DirectFB-1.1.0/lib/direct/direct.pc.in	2008-06-22 16:16:17.121721173 +0200
+@@ -7,4 +7,4 @@
+ Description: DirectFB base development library
+ Version: @VERSION@
+ Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
+-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
+Index: DirectFB-1.1.0/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/lib/fusion/fusion.pc.in	2008-06-22 16:16:13.905054457 +0200
++++ DirectFB-1.1.0/lib/fusion/fusion.pc.in	2008-06-22 16:16:17.121721173 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lfusion
+-Cflags: -I@INCLUDEDIR@
++Cflags: -I${includedir}/directfb
+Index: DirectFB-1.1.0/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.1.0.orig/lib/voodoo/voodoo.pc.in	2008-06-22 16:16:13.931720483 +0200
++++ DirectFB-1.1.0/lib/voodoo/voodoo.pc.in	2008-06-22 16:16:17.121721173 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lvoodoo
+-Cflags: -I@INCLUDEDIR@
++Cflags: -I${includedir}/directfb
diff --git a/packages/directfb/directfb-1.1.1/.mtn2git_empty b/packages/directfb/directfb-1.1.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/directfb/directfb-1.1.1/.mtn2git_empty
diff --git a/packages/directfb/directfb-1.1.1/fix-pkgconfig-cflags.patch b/packages/directfb/directfb-1.1.1/fix-pkgconfig-cflags.patch
new file mode 100644
index 0000000000..745c561cc0
--- /dev/null
+++ b/packages/directfb/directfb-1.1.1/fix-pkgconfig-cflags.patch
@@ -0,0 +1,47 @@
+Index: DirectFB-1.1.1/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb-internal.pc.in	2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/directfb-internal.pc.in	2008-07-17 21:00:47.424654304 +0200
+@@ -2,10 +2,10 @@
+ exec_prefix=@exec_prefix@
+ moduledir=@MODULEDIR@
+ moduledirname=@MODULEDIRNAME@
+-includedir=@INTERNALINCLUDEDIR@
++includedir=@includedir@
+ 
+ Name: DirectFB-Internal
+ Description: Third party module support package for DirectFB.
+ Version: @VERSION@
+ Requires: directfb = @VERSION@
+-Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/directfb.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/directfb.pc.in	2007-12-15 16:23:16.000000000 +0100
++++ DirectFB-1.1.1/directfb.pc.in	2008-07-17 20:59:58.044985193 +0200
+@@ -9,4 +9,4 @@
+ Requires: fusion direct
+ Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@
+ Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@
+-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@
++Cflags: @THREADFLAGS@ -I${includedir}/directfb
+Index: DirectFB-1.1.1/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/fusion/fusion.pc.in	2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/fusion/fusion.pc.in	2008-07-17 20:58:07.051338866 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lfusion
+-Cflags: -I@INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
+Index: DirectFB-1.1.1/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.1.1.orig/lib/voodoo/voodoo.pc.in	2007-08-07 21:43:00.000000000 +0200
++++ DirectFB-1.1.1/lib/voodoo/voodoo.pc.in	2008-07-17 20:58:07.054671842 +0200
+@@ -8,4 +8,4 @@
+ Version: @VERSION@
+ Requires: direct
+ Libs: -L${libdir} -lvoodoo
+-Cflags: -I@INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc
index 150cbe66b3..07024402b9 100644
--- a/packages/directfb/directfb.inc
+++ b/packages/directfb/directfb.inc
@@ -7,17 +7,15 @@ SECTION = "libs"
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-RV = "1.0-0"
-PR = "r5"
 
 SRC_URI = " \
     http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
     file://fix-pkgconfig-cflags.patch;patch=1 \
     file://fix-font-missing-char.patch;patch=1 \
     file://getpagesize.patch;patch=1 \
-    file://fix-includes.patch;patch=1 \
     file://mkdfiff.patch;patch=1 \
     file://dont-use-linux-config.patch;patch=1 \
+    file://ts_lib_autotools.patch;patch=1 \
 "
 S = "${WORKDIR}/DirectFB-${PV}"
 
diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb
index fccb8dbfdd..3c98ea8597 100644
--- a/packages/directfb/directfb_1.0.0.bb
+++ b/packages/directfb/directfb_1.0.0.bb
@@ -1,3 +1,7 @@
 require directfb.inc
 
+
+SRC_URI += "file://fix-includes.patch;patch=1" 
+
 RV = "1.0-0"
+PR = "r6"
diff --git a/packages/directfb/directfb_1.1.0.bb b/packages/directfb/directfb_1.1.0.bb
index 8aa8f43c08..cd21b81a80 100644
--- a/packages/directfb/directfb_1.1.0.bb
+++ b/packages/directfb/directfb_1.1.0.bb
@@ -1,3 +1,6 @@
 require directfb.inc
 
 RV = "1.1-0"
+PR = "r6"
+
+LEAD_SONAME = "libdirect-1.1.so"
diff --git a/packages/directfb/directfb_1.1.1.bb b/packages/directfb/directfb_1.1.1.bb
new file mode 100644
index 0000000000..cd63eeca1c
--- /dev/null
+++ b/packages/directfb/directfb_1.1.1.bb
@@ -0,0 +1,27 @@
+require directfb.inc
+
+RV = "1.1-0"
+PR = "r0"
+
+DEPENDS += "sysfsutils"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = " \
+    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    file://fix-pkgconfig-cflags.patch;patch=1 \
+    file://fix-font-missing-char.patch;patch=1 \
+    file://mkdfiff.patch;patch=1 \
+    file://dont-use-linux-config.patch;patch=1 \
+    file://ts_lib_autotools.patch;patch=1 \
+"
+
+EXTRA_OECONF = "\
+  --enable-freetype=yes \
+  --enable-zlib \
+  --with-gfxdrivers=none \
+  --disable-libmpeg3 \
+  --disable-sdl \
+  --disable-vnc \
+  --disable-x11 \
+"
diff --git a/packages/directfb/files/ts_lib_autotools.patch b/packages/directfb/files/ts_lib_autotools.patch
new file mode 100644
index 0000000000..ced7104786
--- /dev/null
+++ b/packages/directfb/files/ts_lib_autotools.patch
@@ -0,0 +1,16 @@
+Index: DirectFB-1.1.1/configure.in
+===================================================================
+--- DirectFB-1.1.1.orig/configure.in	2008-05-07 23:08:04.000000000 +0200
++++ DirectFB-1.1.1/configure.in	2008-05-07 23:15:43.000000000 +0200
+@@ -1292,8 +1292,11 @@
+ 
+ enable_tslib=no
+ if test "$checkfor_tslib" = "yes"; then
++  PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no])
++  if test "$enable_tslib" = "no"; then
+     PKG_CHECK_MODULES([TSLIB], [tslib-0.0 >= 0.0.2], enable_tslib=yes, enable_tslib=no
+         AC_MSG_WARN([*** no tslib -- tslib driver will not be built.]))
++  fi
+ fi
+ 
+ enable_ucb1x00_ts=no