From a098af2fcdd0a2cdefd7049cdc12a5fda8e46638 Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Wed, 17 Aug 2005 17:48:04 +0000 Subject: 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. --- packages/gstreamer/gst-plugins_0.8.8.bb | 2 ++ packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty | 0 .../gstreamer/gstreamer-0.8.10/filesrc-uri.patch | 22 ---------------------- packages/gstreamer/gstreamer/filesrc-uri.patch | 22 ++++++++++++++++++++++ packages/gstreamer/gstreamer_0.8.10.bb | 1 + packages/gstreamer/gstreamer_0.8.9.bb | 3 ++- 6 files changed, 27 insertions(+), 23 deletions(-) delete mode 100644 packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty delete mode 100644 packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch create mode 100644 packages/gstreamer/gstreamer/filesrc-uri.patch (limited to 'packages/gstreamer') 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 " 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-0.8.10/filesrc-uri.patch deleted file mode 100644 index 0bde73d970..0000000000 --- a/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: gst/elements/gstfilesrc.c -=================================================================== -RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfilesrc.c,v -retrieving revision 1.108.4.3 -diff -u -r1.108.4.3 gstfilesrc.c ---- gstreamer.orig/gst/elements/gstfilesrc.c 3 Jun 2005 09:29:31 -0000 1.108.4.3 -+++ gstreamer/gst/elements/gstfilesrc.c 12 Aug 2005 11:54:38 -0000 -@@ -306,7 +306,13 @@ - src->filename = NULL; - src->uri = NULL; - } else { -- src->filename = g_strdup (location); -+ const gchar *file_prefix = "file://"; -+ -+ if (g_str_has_prefix (location, file_prefix)) { -+ src->filename = g_strdup (location + strlen (file_prefix)); -+ } else { -+ src->filename = g_strdup (location); -+ } - src->uri = gst_uri_construct ("file", src->filename); - } - g_object_notify (G_OBJECT (src), "location"); diff --git a/packages/gstreamer/gstreamer/filesrc-uri.patch b/packages/gstreamer/gstreamer/filesrc-uri.patch new file mode 100644 index 0000000000..0bde73d970 --- /dev/null +++ b/packages/gstreamer/gstreamer/filesrc-uri.patch @@ -0,0 +1,22 @@ +Index: gst/elements/gstfilesrc.c +=================================================================== +RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfilesrc.c,v +retrieving revision 1.108.4.3 +diff -u -r1.108.4.3 gstfilesrc.c +--- gstreamer.orig/gst/elements/gstfilesrc.c 3 Jun 2005 09:29:31 -0000 1.108.4.3 ++++ gstreamer/gst/elements/gstfilesrc.c 12 Aug 2005 11:54:38 -0000 +@@ -306,7 +306,13 @@ + src->filename = NULL; + src->uri = NULL; + } else { +- src->filename = g_strdup (location); ++ const gchar *file_prefix = "file://"; ++ ++ if (g_str_has_prefix (location, file_prefix)) { ++ src->filename = g_strdup (location + strlen (file_prefix)); ++ } else { ++ src->filename = g_strdup (location); ++ } + src->uri = gst_uri_construct ("file", src->filename); + } + g_object_notify (G_OBJECT (src), "location"); 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" -- cgit v1.2.3