[oe-commits] org.oe.dev directfb update:

mickeyl commit openembedded-commits at lists.openembedded.org
Thu Jun 21 04:03:23 UTC 2007 

directfb update:
* bump ++dfb to 1.0.0
* bump examples to 1.0.0
* bump fusionsound to 1.0.0
* clean up a bit

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: a1d9bb1b5ffce63159a1d8a542921bdbc87ec8d8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a1d9bb1b5ffce63159a1d8a542921bdbc87ec8d8
Files:
1
packages/directfb/++dfb_0.9.25.bb
packages/directfb/++dfb_1.0.0.bb
packages/directfb/directfb-examples_0.9.25.bb
packages/directfb/directfb-examples_1.0.0.bb
packages/directfb/fusionsound_0.9.26+cvs20070207.bb
packages/directfb/fusionsound_1.0.0.bb
packages/directfb/directfb_1.0.0.bb
packages/directfb/files/fix-includes.patch
packages/directfb/files/fix-pkgconfig-specs.patch
Diffs:

#
# mt diff -r2a2e9f066dfc0c1775cf73b9937396fff2d06905 -ra1d9bb1b5ffce63159a1d8a542921bdbc87ec8d8
#
# 
# 
# rename "packages/directfb/++dfb_0.9.25.bb"
#     to "packages/directfb/++dfb_1.0.0.bb"
# 
# rename "packages/directfb/directfb-examples_0.9.25.bb"
#     to "packages/directfb/directfb-examples_1.0.0.bb"
# 
# rename "packages/directfb/fusionsound_0.9.26+cvs20070207.bb"
#     to "packages/directfb/fusionsound_1.0.0.bb"
# 
# patch "packages/directfb/directfb-examples_1.0.0.bb"
#  from [f3d10022e0396113770eefb91a8bd4690b0a59ea]
#    to [88c9cc59f32b02ec4cd0c0f876b204399b265bdf]
# 
# patch "packages/directfb/directfb_1.0.0.bb"
#  from [699cc1c17fdd083ceba662b5c2e49634138d9cdc]
#    to [284596569fd9459370dc836bc4e4c3ffc6441b8a]
# 
# patch "packages/directfb/files/fix-includes.patch"
#  from [448a66e861106218de5d39787d0f5d5d6d15eceb]
#    to [274de9df29560e00aff15a8c72d58d83a3c75856]
# 
# patch "packages/directfb/files/fix-pkgconfig-specs.patch"
#  from [b1641134828f046419d1672f3e0bfc662b78da14]
#    to [b9af28670260844fb892da9417165c42ce1044b0]
# 
# patch "packages/directfb/fusionsound_1.0.0.bb"
#  from [90f7715976d6694cf8b2721e338f59dac2238633]
#    to [c3efac179b24756b04b879672f61890399c7d5b9]
# 
============================================================
--- packages/directfb/directfb-examples_0.9.25.bb	f3d10022e0396113770eefb91a8bd4690b0a59ea
+++ packages/directfb/directfb-examples_1.0.0.bb	88c9cc59f32b02ec4cd0c0f876b204399b265bdf
@@ -1,10 +1,10 @@
-DESCRIPTION = "DirectFB examples"
+DESCRIPTION = "DirectFB extra providers"
 DEPENDS = "directfb"
-SECTION = "devel/examples"
+SECTION = "libs"
 LICENSE = "GPL"
 
-SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz"
-S = "${WORKDIR}/DirectFB-examples-${PV}"
+SRC_URI = "http://www.directfb.org/downloads/Extras/DirectFB-extra-${PV}.tar.gz"
+S = "${WORKDIR}/DirectFB-extra-${PV}"
 
 inherit autotools
 
@@ -13,3 +13,8 @@ do_configure_append() {
     find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
 }
 
+do_stage() {
+	autotools_stage_all
+}
+
+
============================================================
--- packages/directfb/directfb_1.0.0.bb	699cc1c17fdd083ceba662b5c2e49634138d9cdc
+++ packages/directfb/directfb_1.0.0.bb	284596569fd9459370dc836bc4e4c3ffc6441b8a
@@ -7,7 +7,7 @@ DEPENDS = "jpeg libpng freetype zlib tsl
 LICENSE = "LGPL"
 HOMEPAGE = "http://directfb.org"
 DEPENDS = "jpeg libpng freetype zlib tslib"
-PR = "r4"
+PR = "r5"
 RV = "1.0-0"
 
 SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \
@@ -38,18 +38,18 @@ FILES_directfb-dbg_append = " ${libdir}/
 
 
 FILES_directfb-dbg_append = " ${libdir}/directfb-${RV}/*/*/.debug/*.so \
-			      ${libdir}/directfb-${RV}/*/.debug/*.so \
-			  "
+                            ${libdir}/directfb-${RV}/*/.debug/*.so \
+"
 
 FILES_directfb-dev_append = " ${libdir}/directfb-${RV}/systems/*.la \
                               ${libdir}/directfb-${RV}/inputdrivers/*.la \
                               ${libdir}/directfb-${RV}/interfaces/*/*.la \
-                              ${libdir}/directfb-${RV}/wm/*.la"
+                              ${libdir}/directfb-${RV}/wm/*.la \
+"
 
-
 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-1.0.0 \
+"
-			  "
============================================================
--- packages/directfb/files/fix-includes.patch	448a66e861106218de5d39787d0f5d5d6d15eceb
+++ packages/directfb/files/fix-includes.patch	274de9df29560e00aff15a8c72d58d83a3c75856
@@ -1,7 +1,7 @@
 #
 # pkgconfig points to STAGING_INCDIR, hence
-# we need to append a directfb/ to make it
-# find its header files
+# we need to make this a local include
+# or else it doesn't find its own header files
 #
 # Signed-Off: mickey at openmoko.org
 #
@@ -14,11 +14,11 @@ Index: DirectFB-1.0.0/include/directfb.h
  #define __DIRECTFB_H__
  
 -#include <dfb_types.h>
-+#include <directfb/dfb_types.h>
++#include "dfb_types.h"
  #include <sys/time.h> /* struct timeval */
  
 -#include <directfb_keyboard.h>
-+#include <directfb/directfb_keyboard.h>
++#include "directfb_keyboard.h"
  
  #ifdef __cplusplus
  extern "C"
============================================================
--- packages/directfb/files/fix-pkgconfig-specs.patch	b1641134828f046419d1672f3e0bfc662b78da14
+++ packages/directfb/files/fix-pkgconfig-specs.patch	b9af28670260844fb892da9417165c42ce1044b0
@@ -1,43 +1,48 @@
-diff -ur DirectFB-1.0.0~org/directfb-internal.pc.in DirectFB-1.0.0/directfb-internal.pc.in
---- DirectFB-1.0.0~org/directfb-internal.pc.in	2003-07-04 13:30:22.000000000 -0400
-+++ DirectFB-1.0.0/directfb-internal.pc.in	2007-03-16 22:34:17.000000000 -0400
-@@ -8,4 +8,4 @@
+Index: DirectFB-1.0.0/directfb-internal.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/directfb-internal.pc.in
++++ DirectFB-1.0.0/directfb-internal.pc.in
+@@ -8,4 +8,4 @@ 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}
-diff -ur DirectFB-1.0.0~org/directfb.pc.in DirectFB-1.0.0/directfb.pc.in
---- DirectFB-1.0.0~org/directfb.pc.in	2004-08-04 12:28:20.000000000 -0400
-+++ DirectFB-1.0.0/directfb.pc.in	2007-03-16 22:31:33.000000000 -0400
-@@ -8,4 +8,4 @@
++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir} -I${includedir}/../directfb
+Index: DirectFB-1.0.0/directfb.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/directfb.pc.in
++++ DirectFB-1.0.0/directfb.pc.in
+@@ -8,4 +8,4 @@ Description: Graphics and windowing libr
  Version: @VERSION@
  Requires: fusion direct
  Libs: -L${libdir} -ldirectfb @THREADLIB@ @DYNLIB@ @ZLIB_LIBS@ @OSX_LIBS@
 -Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
 +Cflags: @THREADFLAGS@ -I${includedir}
-diff -ur DirectFB-1.0.0~org/lib/direct/direct.pc.in DirectFB-1.0.0/lib/direct/direct.pc.in
---- DirectFB-1.0.0~org/lib/direct/direct.pc.in	2005-11-23 09:18:59.000000000 -0500
-+++ DirectFB-1.0.0/lib/direct/direct.pc.in	2007-03-16 22:32:13.000000000 -0400
-@@ -7,4 +7,4 @@
+Index: DirectFB-1.0.0/lib/direct/direct.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/lib/direct/direct.pc.in
++++ DirectFB-1.0.0/lib/direct/direct.pc.in
+@@ -7,4 +7,4 @@ Name: Direct
  Description: DirectFB base development library
  Version: @VERSION@
  Libs: -L${libdir} -ldirect @THREADLIB@ @DYNLIB@
 -Cflags: @THREADFLAGS@ -I at INCLUDEDIR@
 +Cflags: @THREADFLAGS@ -I${includedir}
-diff -ur DirectFB-1.0.0~org/lib/fusion/fusion.pc.in DirectFB-1.0.0/lib/fusion/fusion.pc.in
---- DirectFB-1.0.0~org/lib/fusion/fusion.pc.in	2004-05-19 07:30:56.000000000 -0400
-+++ DirectFB-1.0.0/lib/fusion/fusion.pc.in	2007-03-16 22:32:34.000000000 -0400
-@@ -8,4 +8,4 @@
+Index: DirectFB-1.0.0/lib/fusion/fusion.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/lib/fusion/fusion.pc.in
++++ DirectFB-1.0.0/lib/fusion/fusion.pc.in
+@@ -8,4 +8,4 @@ Description: High Level IPC Mechanisms
  Version: @VERSION@
  Requires: direct
  Libs: -L${libdir} -lfusion
 -Cflags: -I at INCLUDEDIR@
 +Cflags: -I${includedir}
-diff -ur DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
---- DirectFB-1.0.0~org/lib/voodoo/voodoo.pc.in	2004-05-19 07:31:28.000000000 -0400
-+++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in	2007-03-16 22:32:55.000000000 -0400
-@@ -8,4 +8,4 @@
+Index: DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
+===================================================================
+--- DirectFB-1.0.0.orig/lib/voodoo/voodoo.pc.in
++++ DirectFB-1.0.0/lib/voodoo/voodoo.pc.in
+@@ -8,4 +8,4 @@ Description: Interface based network tra
  Version: @VERSION@
  Requires: direct
  Libs: -L${libdir} -lvoodoo
============================================================
--- packages/directfb/fusionsound_0.9.26+cvs20070207.bb	90f7715976d6694cf8b2721e338f59dac2238633
+++ packages/directfb/fusionsound_1.0.0.bb	c3efac179b24756b04b879672f61890399c7d5b9
@@ -1,18 +1,15 @@ DESCRIPTION = "FusionSound for DirectFB"
 DESCRIPTION = "FusionSound for DirectFB"
-DEPENDS = "directfb"
+DEPENDS = "directfb libmad libvorbis"
 SECTION = "libs"
 LICENSE = "LGPL"
 
-# this is a CVS only release
+SRC_URI = "http://www.directfb.org/downloads/Core/FusionSound-${PV}.tar.gz"
+S = "${WORKDIR}/FusionSound-${PV}"
 
-SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=FusionSound;date=${@bb.data.getVar('PV', d, 1)[9:]}"
-
-S = "${WORKDIR}/FusionSound"
-
 inherit autotools pkgconfig
 
 do_configure_append() {
-    find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
+    find ${S} -type f | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}/directfb:g'
 }
 
 do_stage() {
@@ -23,15 +20,18 @@ do_install() {
         oe_runmake 'DESTDIR=${D}' install
 }
 
-FILES_fusionsound-dbg_append = " ${libdir}/directfb-1.0-0/*/*/.debug/*.so \
-                              ${libdir}/directfb-1.0-0/*/.debug/*.so \
-                          "
+FILES_${PN} += "\
+  ${libdir}/directfb-1.0-0/interfaces/*/*.so \
+  ${libdir}/directfb-1.0-0/snddrivers/*.so \
+"
 
-FILES_fusionsound-dev_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.la \
-			         ${libdir}/directfb-1.0-0/snddrivers/*.la \
-			       "
+FILES_${PN}-dbg += "\
+  ${libdir}/directfb-1.0-0/*/*/.debug/*.so \
+  ${libdir}/directfb-1.0-0/*/.debug/*.so \
+"
 
-FILES_fusionsound_append = " ${libdir}/directfb-1.0-0/interfaces/*/*.so \
-                             ${libdir}/directfb-1.0-0/snddrivers/*.so \
-			   "
+FILES_${PN}-dev += "\
+  ${libdir}/directfb-1.0-0/interfaces/*/*.la \
+  ${libdir}/directfb-1.0-0/snddrivers/*.la \
+"

More information about the Openembedded-commits mailing list