[oe-commits] org.oe.dev merge of 'ac74fcc2453aa7482b87f6c60813db2ff346f849'

[hrw commit]

merge of 'ac74fcc2453aa7482b87f6c60813db2ff346f849'
     and 'd856396130f5cff8cb6cb3913650cd3132574135'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 5bd202316920d744a19326b228181e9a848e6474
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5bd202316920d744a19326b228181e9a848e6474
Files:
1
conf/distro/include/openmoko.inc
packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch
packages/automake/automake-native_1.10.bb
packages/gstreamer/gst-plugins-bad_0.10.5.bb
packages/libtool/libtool-native_1.5.24.bb
Diffs:

#
# mt diff -rac74fcc2453aa7482b87f6c60813db2ff346f849 -r5bd202316920d744a19326b228181e9a848e6474
#
# 
# 
# patch "conf/distro/include/openmoko.inc"
#  from [27a5d36dc0bcfacb3e5fde995bce62a5bfa53dfb]
#    to [32ab0ae71b9491de1aee14e4252a68c81db0e77a]
# 
============================================================
--- conf/distro/include/openmoko.inc	27a5d36dc0bcfacb3e5fde995bce62a5bfa53dfb
+++ conf/distro/include/openmoko.inc	32ab0ae71b9491de1aee14e4252a68c81db0e77a
@@ -119,7 +119,7 @@ PREFERRED_PROVIDER_qemu-native = "qemu-n
 # Development
 #
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
-PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}"
+PREFERRED_VERSION_qemu-native = "0.9.0+cvs${SRCDATE}"
 
 #
 # Opie


#
# mt diff -rd856396130f5cff8cb6cb3913650cd3132574135 -r5bd202316920d744a19326b228181e9a848e6474
#
# 
# 
# add_file "packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch"
#  content [3b1f8a7f19b38a6eb0cb315c5b95a94e554c4a8e]
# 
# patch "packages/automake/automake-native_1.10.bb"
#  from [515a0d90c13871057bedf62fc57fab2658deedf4]
#    to [e89ded3354afaf5045a9fb980fc6b9b4fdab6667]
# 
# patch "packages/gstreamer/gst-plugins-bad_0.10.5.bb"
#  from [06debe7657e7ce9b321d646ac413276b0ff212ac]
#    to [1ac94bddf7456f90c0dff28024d8d2221c674c97]
# 
# patch "packages/libtool/libtool-native_1.5.24.bb"
#  from [ce5d46716493d32c4426e47b7af6630ecd852160]
#    to [e5197c6fc402385737e26c1e4b3d057bc0c695c7]
# 
============================================================
--- 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/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/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)
============================================================
--- 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}"