[oe-commits] org.oe.dev merge of '63851b92b9273aff39e9034738719537beaaad00'

[koen commit]

merge of '63851b92b9273aff39e9034738719537beaaad00'
     and 'ad034cb2f897fe4f3dcd97de6ff164e3a696598f'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: ac74fcc2453aa7482b87f6c60813db2ff346f849
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ac74fcc2453aa7482b87f6c60813db2ff346f849
Files:
1
packages/automake/automake-native_1.10.bb
packages/libtool/libtool-native_1.5.24.bb
packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/gstreamer/gst-plugins-bad_0.10.5.bb
Diffs:

#
# mt diff -r63851b92b9273aff39e9034738719537beaaad00 -rac74fcc2453aa7482b87f6c60813db2ff346f849
#
# 
# 
# patch "packages/automake/automake-native_1.10.bb"
#  from [515a0d90c13871057bedf62fc57fab2658deedf4]
#    to [e89ded3354afaf5045a9fb980fc6b9b4fdab6667]
# 
# patch "packages/libtool/libtool-native_1.5.24.bb"
#  from [ce5d46716493d32c4426e47b7af6630ecd852160]
#    to [e5197c6fc402385737e26c1e4b3d057bc0c695c7]
# 
============================================================
--- packages/automake/automake-native_1.10.bb	515a0d90c13871057bedf62fc57fab2658deedf4
+++ packages/automake/automake-native_1.10.bb	e89ded3354afaf5045a9fb980fc6b9b4fdab6667
@@ -1,3 +1,5 @@ require automake-native.inc
 PV := "${PV}"
 
 require automake-native.inc
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/libtool/libtool-native_1.5.24.bb	ce5d46716493d32c4426e47b7af6630ecd852160
+++ packages/libtool/libtool-native_1.5.24.bb	e5197c6fc402385737e26c1e4b3d057bc0c695c7
@@ -1,5 +1,6 @@ require libtool_${PV}.bb
 SECTION = "devel"
 require libtool_${PV}.bb
+DEFAULT_PREFERENCE = "-1"
 
 PR = "r0"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}"


#
# mt diff -rad034cb2f897fe4f3dcd97de6ff164e3a696598f -rac74fcc2453aa7482b87f6c60813db2ff346f849
#
# 
# 
# add_file "packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch"
#  content [3b1f8a7f19b38a6eb0cb315c5b95a94e554c4a8e]
# 
# patch "packages/gsm/files/default"
#  from [f0238ff8fc0e3123941c19055fb0dd74d4fc5ed4]
#    to [0db3a380100ebc8548f519ca51e460e710593a18]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [ff7c3845f7e03d5a5327937e2feb3a7d129fd962]
#    to [9756c419c7d89327186ad79d5a2bdabac11695b0]
# 
# patch "packages/gstreamer/gst-plugins-bad_0.10.5.bb"
#  from [06debe7657e7ce9b321d646ac413276b0ff212ac]
#    to [1ac94bddf7456f90c0dff28024d8d2221c674c97]
# 
============================================================
--- packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch	3b1f8a7f19b38a6eb0cb315c5b95a94e554c4a8e
+++ packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch	3b1f8a7f19b38a6eb0cb315c5b95a94e554c4a8e
@@ -0,0 +1,32 @@
+--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c	2007-08-24 08:23:23.000000000 +0100
++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c	2007-08-24 08:24:28.000000000 +0100
+@@ -35,7 +35,7 @@
+ #include <math.h>
+ #include <time.h>
+ 
+-#include <directfb.h>
++#include <directfb/directfb.h>
+ #include <gst/gst.h>
+ #include <string.h>
+ 
+--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c	2007-08-24 08:23:24.000000000 +0100
++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c	2007-08-24 08:24:41.000000000 +0100
+@@ -1,5 +1,5 @@
+ 
+-#include <directfb.h>
++#include <directfb/directfb.h>
+ #include <gst/gst.h>
+ 
+ static IDirectFB *dfb = NULL;
+
+--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h	2007-08-24 08:23:24.000000000 +0100
++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h	2007-08-24 08:24:56.000000000 +0100
+@@ -22,7 +22,7 @@
+ 
+ #include <gst/video/gstvideosink.h>
+ 
+-#include <directfb.h>
++#include <directfb/directfb.h>
+ 
+ G_BEGIN_DECLS
+ 
============================================================
--- packages/gsm/files/default	f0238ff8fc0e3123941c19055fb0dd74d4fc5ed4
+++ packages/gsm/files/default	0db3a380100ebc8548f519ca51e460e710593a18
@@ -1,14 +1,14 @@ case `cpuinfo_id` in
 # gsmd	This shell script configures for the gsmd init script.
 
 . /etc/init.d/functions
 
 case `cpuinfo_id` in
-	"GTA01", "GTA02")
+	"GTA01"|"GTA02")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
 		GSM_DEV="/dev/ttySAC0"
 		;;
-	"HTC Apache", "HTC Blueangel")
+	"HTC Apache"|"HTC Blueangel")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_DEV="/dev/ttyS0"
 		;;
============================================================
--- packages/gsm/libgsmd_svn.bb	ff7c3845f7e03d5a5327937e2feb3a7d129fd962
+++ packages/gsm/libgsmd_svn.bb	9756c419c7d89327186ad79d5a2bdabac11695b0
@@ -1,10 +1,10 @@ PV = "0.1+svn${SRCDATE}"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svn${SRCDATE}"
-PR = "r20"
+PR = "r21"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
============================================================
--- packages/gstreamer/gst-plugins-bad_0.10.5.bb	06debe7657e7ce9b321d646ac413276b0ff212ac
+++ packages/gstreamer/gst-plugins-bad_0.10.5.bb	1ac94bddf7456f90c0dff28024d8d2221c674c97
@@ -1,8 +1,8 @@ require gst-plugins.inc
 require gst-plugins.inc
 
-SRC_URI += "file://vorbisenc.h file://vorbisdec.h"
-DEPENDS += "gst-plugins-base"
-EXTRA_OECONF += " --disable-directfb "
+SRC_URI += "file://vorbisenc.h file://vorbisdec.h \
+            file://gst-plugins-directfb-fix.patch;patch=1;pnum=2"
+DEPENDS += "gst-plugins-base directfb"
 
 do_compile_prepend() {
 	# work around missing files in upstream tarball (upstream bug #454078)