From: Rene Wagner <rw@handhelds.org>
Date: Wed, 17 Aug 2005 17:48:04 +0000 (+0000)
Subject: gstreamer: set DEFAULT_PREFERENCE = "-1" for gst-plugins_0.8.8 and gstreamer_0.8... 
X-Git-Tag: Release-2010-05/1~9453^2~3896
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a098af2fcdd0a2cdefd7049cdc12a5fda8e46638;p=openembedded.git

gstreamer: set DEFAULT_PREFERENCE = "-1" for gst-plugins_0.8.8 and gstreamer_0.8.10. apply filesrc-uri.patch to gstreamer_0.8.9.
---

diff --git a/packages/gstreamer/gst-plugins_0.8.8.bb b/packages/gstreamer/gst-plugins_0.8.8.bb
index 6b28922f27..3d94980c59 100644
--- a/packages/gstreamer/gst-plugins_0.8.8.bb
+++ b/packages/gstreamer/gst-plugins_0.8.8.bb
@@ -5,6 +5,8 @@ PRIORITY = "optional"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 PR = "r0"
 
+DEFAULT_PREFERENCE = "-1"
+
 DEPENDS = "gstreamer libmikmod libmad libogg tremor libvorbis libid3tag gpe-soundserver gconf"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-${PV}.tar.bz2 \
diff --git a/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty b/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch b/packages/gstreamer/gstreamer/filesrc-uri.patch
similarity index 100%
rename from packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch
rename to packages/gstreamer/gstreamer/filesrc-uri.patch
diff --git a/packages/gstreamer/gstreamer_0.8.10.bb b/packages/gstreamer/gstreamer_0.8.10.bb
index 7247bd831a..9369258018 100644
--- a/packages/gstreamer/gstreamer_0.8.10.bb
+++ b/packages/gstreamer/gstreamer_0.8.10.bb
@@ -1,5 +1,6 @@
 LICENSE = "LGPL"
 PR = "r0"
+DEFAULT_PREFERENCE = "-1"
 
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
diff --git a/packages/gstreamer/gstreamer_0.8.9.bb b/packages/gstreamer/gstreamer_0.8.9.bb
index ec5049e38f..02e93b78ec 100644
--- a/packages/gstreamer/gstreamer_0.8.9.bb
+++ b/packages/gstreamer/gstreamer_0.8.9.bb
@@ -1,5 +1,5 @@
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
 It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
@@ -13,6 +13,7 @@ FILES_${PN}-dev += " ${libdir}/gstreamer-0.8/*.la ${libdir}/gstreamer-0.8/*.a"
 SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
 	file://libm.patch;patch=1 \
 	file://no-libxml2.patch;patch=1 \
+	file://filesrc-uri.patch;patch=1 \
 	file://gstreamer.xsession"
 
 EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loadsave"