[oe-commits] org.oe.dev merge of '0c72fca9e0c0a27bd39068df21078215a4362b1c'

[Laibsch commit]

merge of '0c72fca9e0c0a27bd39068df21078215a4362b1c'
     and '8f11add2be832596eef0720d2ab23e1cc7a840b4'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: c77f662812e5a91aea56788a9bdbc9f2b84b7829
ViewMTN: http://monotone.openembedded.org/revision/info/c77f662812e5a91aea56788a9bdbc9f2b84b7829
Files:
1
packages/libexif
packages/nonworking/libexif
packages/directfb/directfb_1.1.1.bb
packages/directfb/directfb_1.2.3.bb
packages/directfb/directfb-1.2.3
packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch
packages/directfb/directfb.inc
Diffs:

#
# mt diff -r0c72fca9e0c0a27bd39068df21078215a4362b1c -rc77f662812e5a91aea56788a9bdbc9f2b84b7829
#
#
#
# rename "packages/libexif"
#     to "packages/nonworking/libexif"
#


#
# mt diff -r8f11add2be832596eef0720d2ab23e1cc7a840b4 -rc77f662812e5a91aea56788a9bdbc9f2b84b7829
#
#
#
# rename "packages/directfb/directfb_1.1.1.bb"
#     to "packages/directfb/directfb_1.2.3.bb"
# 
# add_dir "packages/directfb/directfb-1.2.3"
# 
# add_file "packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch"
#  content [7eb9f5067ab77fa58b944af9d2fe6a8d40866b63]
# 
# add_file "packages/directfb/directfb_1.1.1.bb"
#  content [2d3add3ec1b53538f6ff50763d4c32884b226774]
# 
# patch "packages/directfb/directfb.inc"
#  from [4563eb9b40a7a1dbf5bdc129a16d536619b1347d]
#    to [b9a7af335a989a5d0012b70b32e85ea327de147c]
# 
# patch "packages/directfb/directfb_1.2.3.bb"
#  from [2d3add3ec1b53538f6ff50763d4c32884b226774]
#    to [a533fec46b1dd083dd1aa1397725c23c7e99fcd1]
#
============================================================
--- packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch	7eb9f5067ab77fa58b944af9d2fe6a8d40866b63
+++ packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch	7eb9f5067ab77fa58b944af9d2fe6a8d40866b63
@@ -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 at 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 at 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 at 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 at INCLUDEDIR@
++Cflags: -I${includedir}/directfb -I${includedir}
============================================================
--- packages/directfb/directfb_1.1.1.bb	2d3add3ec1b53538f6ff50763d4c32884b226774
+++ packages/directfb/directfb_1.1.1.bb	2d3add3ec1b53538f6ff50763d4c32884b226774
@@ -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 \
+"
============================================================
--- packages/directfb/directfb.inc	4563eb9b40a7a1dbf5bdc129a16d536619b1347d
+++ packages/directfb/directfb.inc	b9a7af335a989a5d0012b70b32e85ea327de147c
@@ -9,7 +9,7 @@ SRC_URI = " \
 DEPENDS = "jpeg libpng freetype zlib tslib"
 
 SRC_URI = " \
-    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \
     file://fix-pkgconfig-cflags.patch;patch=1 \
     file://fix-font-missing-char.patch;patch=1 \
     file://getpagesize.patch;patch=1 \
@@ -21,7 +21,7 @@ LDFLAGS_append =" -lts -lm"
 
 LDFLAGS_append =" -lts -lm"
 
-inherit autotools pkgconfig
+inherit autotools binconfig pkgconfig
 
 EXTRA_OECONF = "\
   --with-gfxdrivers=none \
============================================================
--- packages/directfb/directfb_1.1.1.bb	2d3add3ec1b53538f6ff50763d4c32884b226774
+++ packages/directfb/directfb_1.2.3.bb	a533fec46b1dd083dd1aa1397725c23c7e99fcd1
@@ -1,16 +1,13 @@ require directfb.inc
 require directfb.inc
 
-RV = "1.1-0"
+RV = "1.2-0"
 PR = "r0"
 
 DEPENDS += "sysfsutils"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = " \
-    http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
+    http://www.directfb.org/downloads/Core/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 \
@@ -25,3 +22,7 @@ EXTRA_OECONF = "\
   --disable-vnc \
   --disable-x11 \
 "
+
+LDFLAGS_append = ""
+
+LEAD_SONAME = "libdirectfb-1.2.so.0"