From d2f11bf46d4b6929b75b786171105561f91a525c Mon Sep 17 00:00:00 2001 From: Rene Wagner Date: Sat, 13 Aug 2005 21:09:42 +0000 Subject: gstreamer: bump to gstreamer-0.8.10. apply patch submitted in gnome bug #313322. move patches around a bit. --- packages/gstreamer/files/.mtn2git_empty | 0 packages/gstreamer/files/lame-autoconf.patch | 21 ------ packages/gstreamer/files/no-libxml2.patch | 75 ---------------------- packages/gstreamer/files/try-esdsink.patch | 22 ------- packages/gstreamer/gst-plugins/lame-autoconf.patch | 21 ++++++ packages/gstreamer/gst-plugins/try-esdsink.patch | 22 +++++++ packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty | 0 .../gstreamer/gstreamer-0.8.10/filesrc-uri.patch | 22 +++++++ .../gstreamer/gstreamer-0.8.9/no-libxml2.patch | 75 ++++++++++++++++++++++ packages/gstreamer/gstreamer_0.8.10.bb | 34 ++++++++++ 10 files changed, 174 insertions(+), 118 deletions(-) delete mode 100644 packages/gstreamer/files/.mtn2git_empty delete mode 100644 packages/gstreamer/files/lame-autoconf.patch delete mode 100644 packages/gstreamer/files/no-libxml2.patch delete mode 100644 packages/gstreamer/files/try-esdsink.patch create mode 100644 packages/gstreamer/gst-plugins/lame-autoconf.patch create mode 100644 packages/gstreamer/gst-plugins/try-esdsink.patch create mode 100644 packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty create mode 100644 packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch create mode 100644 packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch create mode 100644 packages/gstreamer/gstreamer_0.8.10.bb diff --git a/packages/gstreamer/files/.mtn2git_empty b/packages/gstreamer/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gstreamer/files/lame-autoconf.patch b/packages/gstreamer/files/lame-autoconf.patch deleted file mode 100644 index 3fb85e7d88..0000000000 --- a/packages/gstreamer/files/lame-autoconf.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- gst-plugins-0.8.6.orig/configure.ac 2004-11-25 16:41:47.000000000 +0100 -+++ gst-plugins-0.8.6/configure.ac 2005-02-22 19:02:58.000000000 +0100 -@@ -1135,8 +1135,9 @@ - GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame -lm") - ]) - dnl is lame presets available -+if test "x$HAVE_LAME" = "xyes"; then - LAME_CFLAGS="" --AC_TRY_RUN([ -+AC_TRY_COMPILE([ - #include - int main (int argc, char *argv[]) - { -@@ -1144,6 +1145,7 @@ - return 0; - } - ],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""]) -+fi - AC_SUBST(LAME_CFLAGS) - AC_SUBST(LAME_LIBS) - diff --git a/packages/gstreamer/files/no-libxml2.patch b/packages/gstreamer/files/no-libxml2.patch deleted file mode 100644 index c676c2387f..0000000000 --- a/packages/gstreamer/files/no-libxml2.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -ur gstreamer-0.8.9/configure gstreamer-0.8.9-jeh3/configure ---- gstreamer-0.8.9/configure 2005-02-08 04:45:25.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/configure 2005-03-03 22:34:09.213409312 -0500 -@@ -25655,10 +25655,10 @@ - - - --if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" -+if test "x$GST_DISABLE_LOADSAVE" = "xyes" - then -- { echo "$as_me:$LINENO: Registry and load/save are disabled, not checking for libxml2" >&5 --echo "$as_me: Registry and load/save are disabled, not checking for libxml2" >&6;} -+ { echo "$as_me:$LINENO: Load/save are disabled, not checking for libxml2" >&5 -+echo "$as_me: Load/save are disabled, not checking for libxml2" >&6;} - else - - LIBXML2_REQ=2.4.9 -diff -ur gstreamer-0.8.9/configure.ac gstreamer-0.8.9-jeh3/configure.ac ---- gstreamer-0.8.9/configure.ac 2005-02-08 04:44:47.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/configure.ac 2005-03-03 22:34:09.215409008 -0500 -@@ -275,9 +275,9 @@ - AC_SUBST(GLIB_ONLY_LIBS) - - dnl === libxml 2 === --if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" -+if test "x$GST_DISABLE_LOADSAVE" = "xyes" - then -- AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2]) -+ AC_MSG_NOTICE([Load/save is disabled, not checking for libxml2]) - else - dnl check for libxml2 with minimum req version - GST_LIBXML2_CHECK(2.4.9) -diff -ur gstreamer-0.8.9/gst/gstconfig.h.in gstreamer-0.8.9-jeh3/gst/gstconfig.h.in ---- gstreamer-0.8.9/gst/gstconfig.h.in 2004-07-26 06:09:02.000000000 -0400 -+++ gstreamer-0.8.9-jeh3/gst/gstconfig.h.in 2005-03-03 22:36:13.860460080 -0500 -@@ -61,10 +61,11 @@ - - /***** Deal with XML stuff, we have to handle both loadsave and registry *****/ - --#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) -+#if (! defined(GST_DISABLE_LOADSAVE) ) - # include - #else --# define GST_DISABLE_LOADSAVE_REGISTRY -+/* misnomer but we cannot rename symbols */ -+# define GST_DISABLE_LOADSAVE_REGISTRY - #endif - - #ifdef WIN32 -Only in gstreamer-0.8.9-jeh3/gst: gstconfig.h.in.orig -diff -ur gstreamer-0.8.9/gst/indexers/gstindexers.c gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c ---- gstreamer-0.8.9/gst/indexers/gstindexers.c 2004-03-15 14:20:30.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c 2005-03-03 22:34:09.228407032 -0500 -@@ -30,7 +30,9 @@ - gboolean res = TRUE; - - res &= gst_mem_index_plugin_init (plugin); -+#ifndef GST_DISABLE_LOADSAVE_REGISTRY - res &= gst_file_index_plugin_init (plugin); -+#endif - - return res; - } -diff -ur gstreamer-0.8.9/gst/registries/gstxmlregistry.h gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h ---- gstreamer-0.8.9/gst/registries/gstxmlregistry.h 2004-03-15 10:08:32.000000000 -0500 -+++ gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h 2005-03-03 22:34:09.229406880 -0500 -@@ -25,6 +25,7 @@ - #define __GST_XML_REGISTRY_H__ - - #include -+#include - - G_BEGIN_DECLS - -Only in gstreamer-0.8.9-jeh3/win32: gstconfig.h.orig diff --git a/packages/gstreamer/files/try-esdsink.patch b/packages/gstreamer/files/try-esdsink.patch deleted file mode 100644 index 9c6242663c..0000000000 --- a/packages/gstreamer/files/try-esdsink.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c~ 2004-08-17 17:55:46.000000000 +0100 -+++ gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c 2004-08-17 18:04:00.000000000 +0100 -@@ -204,10 +204,16 @@ - if (!ret) { - ret = gst_element_factory_make ("osssink", NULL); - -- if (!ret) -- g_warning ("No GConf default audio sink key and osssink doesn't work"); -- else -+ if (!ret) { -+ ret = gst_element_factory_make ("esdsink", NULL); -+ -+ if (!ret) -+ g_warning ("No GConf default audio sink key and osssink & esdsink don't work"); -+ else -+ g_print ("GConf audio sink and osssink not found, using esdsink\n"); -+ } else { - g_print ("GConf audio sink not found, using osssink\n"); -+ } - } - - return ret; diff --git a/packages/gstreamer/gst-plugins/lame-autoconf.patch b/packages/gstreamer/gst-plugins/lame-autoconf.patch new file mode 100644 index 0000000000..3fb85e7d88 --- /dev/null +++ b/packages/gstreamer/gst-plugins/lame-autoconf.patch @@ -0,0 +1,21 @@ +--- gst-plugins-0.8.6.orig/configure.ac 2004-11-25 16:41:47.000000000 +0100 ++++ gst-plugins-0.8.6/configure.ac 2005-02-22 19:02:58.000000000 +0100 +@@ -1135,8 +1135,9 @@ + GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h, HAVE_LAME="yes" LAME_LIBS="-lmp3lame -lm") + ]) + dnl is lame presets available ++if test "x$HAVE_LAME" = "xyes"; then + LAME_CFLAGS="" +-AC_TRY_RUN([ ++AC_TRY_COMPILE([ + #include + int main (int argc, char *argv[]) + { +@@ -1144,6 +1145,7 @@ + return 0; + } + ],[LAME_CFLAGS="-DGSTLAME_PRESET"],[LAME_CFLAGS=""]) ++fi + AC_SUBST(LAME_CFLAGS) + AC_SUBST(LAME_LIBS) + diff --git a/packages/gstreamer/gst-plugins/try-esdsink.patch b/packages/gstreamer/gst-plugins/try-esdsink.patch new file mode 100644 index 0000000000..9c6242663c --- /dev/null +++ b/packages/gstreamer/gst-plugins/try-esdsink.patch @@ -0,0 +1,22 @@ +--- gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c~ 2004-08-17 17:55:46.000000000 +0100 ++++ gst-plugins-0.8.1/gst-libs/gst/gconf/gconf.c 2004-08-17 18:04:00.000000000 +0100 +@@ -204,10 +204,16 @@ + if (!ret) { + ret = gst_element_factory_make ("osssink", NULL); + +- if (!ret) +- g_warning ("No GConf default audio sink key and osssink doesn't work"); +- else ++ if (!ret) { ++ ret = gst_element_factory_make ("esdsink", NULL); ++ ++ if (!ret) ++ g_warning ("No GConf default audio sink key and osssink & esdsink don't work"); ++ else ++ g_print ("GConf audio sink and osssink not found, using esdsink\n"); ++ } else { + g_print ("GConf audio sink not found, using osssink\n"); ++ } + } + + return ret; diff --git a/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty b/packages/gstreamer/gstreamer-0.8.10/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch b/packages/gstreamer/gstreamer-0.8.10/filesrc-uri.patch new file mode 100644 index 0000000000..0bde73d970 --- /dev/null +++ b/packages/gstreamer/gstreamer-0.8.10/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.9/no-libxml2.patch b/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch new file mode 100644 index 0000000000..c676c2387f --- /dev/null +++ b/packages/gstreamer/gstreamer-0.8.9/no-libxml2.patch @@ -0,0 +1,75 @@ +diff -ur gstreamer-0.8.9/configure gstreamer-0.8.9-jeh3/configure +--- gstreamer-0.8.9/configure 2005-02-08 04:45:25.000000000 -0500 ++++ gstreamer-0.8.9-jeh3/configure 2005-03-03 22:34:09.213409312 -0500 +@@ -25655,10 +25655,10 @@ + + + +-if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" ++if test "x$GST_DISABLE_LOADSAVE" = "xyes" + then +- { echo "$as_me:$LINENO: Registry and load/save are disabled, not checking for libxml2" >&5 +-echo "$as_me: Registry and load/save are disabled, not checking for libxml2" >&6;} ++ { echo "$as_me:$LINENO: Load/save are disabled, not checking for libxml2" >&5 ++echo "$as_me: Load/save are disabled, not checking for libxml2" >&6;} + else + + LIBXML2_REQ=2.4.9 +diff -ur gstreamer-0.8.9/configure.ac gstreamer-0.8.9-jeh3/configure.ac +--- gstreamer-0.8.9/configure.ac 2005-02-08 04:44:47.000000000 -0500 ++++ gstreamer-0.8.9-jeh3/configure.ac 2005-03-03 22:34:09.215409008 -0500 +@@ -275,9 +275,9 @@ + AC_SUBST(GLIB_ONLY_LIBS) + + dnl === libxml 2 === +-if test "x$GST_DISABLE_LOADSAVE" = "xyes" && test "x$GST_DISABLE_REGISTRY" = "xyes" ++if test "x$GST_DISABLE_LOADSAVE" = "xyes" + then +- AC_MSG_NOTICE([Registry and load/save are disabled, not checking for libxml2]) ++ AC_MSG_NOTICE([Load/save is disabled, not checking for libxml2]) + else + dnl check for libxml2 with minimum req version + GST_LIBXML2_CHECK(2.4.9) +diff -ur gstreamer-0.8.9/gst/gstconfig.h.in gstreamer-0.8.9-jeh3/gst/gstconfig.h.in +--- gstreamer-0.8.9/gst/gstconfig.h.in 2004-07-26 06:09:02.000000000 -0400 ++++ gstreamer-0.8.9-jeh3/gst/gstconfig.h.in 2005-03-03 22:36:13.860460080 -0500 +@@ -61,10 +61,11 @@ + + /***** Deal with XML stuff, we have to handle both loadsave and registry *****/ + +-#if (! (defined(GST_DISABLE_LOADSAVE) && defined(GST_DISABLE_REGISTRY)) ) ++#if (! defined(GST_DISABLE_LOADSAVE) ) + # include + #else +-# define GST_DISABLE_LOADSAVE_REGISTRY ++/* misnomer but we cannot rename symbols */ ++# define GST_DISABLE_LOADSAVE_REGISTRY + #endif + + #ifdef WIN32 +Only in gstreamer-0.8.9-jeh3/gst: gstconfig.h.in.orig +diff -ur gstreamer-0.8.9/gst/indexers/gstindexers.c gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c +--- gstreamer-0.8.9/gst/indexers/gstindexers.c 2004-03-15 14:20:30.000000000 -0500 ++++ gstreamer-0.8.9-jeh3/gst/indexers/gstindexers.c 2005-03-03 22:34:09.228407032 -0500 +@@ -30,7 +30,9 @@ + gboolean res = TRUE; + + res &= gst_mem_index_plugin_init (plugin); ++#ifndef GST_DISABLE_LOADSAVE_REGISTRY + res &= gst_file_index_plugin_init (plugin); ++#endif + + return res; + } +diff -ur gstreamer-0.8.9/gst/registries/gstxmlregistry.h gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h +--- gstreamer-0.8.9/gst/registries/gstxmlregistry.h 2004-03-15 10:08:32.000000000 -0500 ++++ gstreamer-0.8.9-jeh3/gst/registries/gstxmlregistry.h 2005-03-03 22:34:09.229406880 -0500 +@@ -25,6 +25,7 @@ + #define __GST_XML_REGISTRY_H__ + + #include ++#include + + G_BEGIN_DECLS + +Only in gstreamer-0.8.9-jeh3/win32: gstconfig.h.orig diff --git a/packages/gstreamer/gstreamer_0.8.10.bb b/packages/gstreamer/gstreamer_0.8.10.bb new file mode 100644 index 0000000000..7247bd831a --- /dev/null +++ b/packages/gstreamer/gstreamer_0.8.10.bb @@ -0,0 +1,34 @@ +LICENSE = "LGPL" +PR = "r0" + +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." +DEPENDS = "glib-2.0 gettext-native popt" +SECTION = "base" +PRIORITY = "optional" + +FILES_${PN} += " ${libdir}/gstreamer-0.8/*.so" +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://filesrc-uri.patch;patch=1 \ + file://gstreamer.xsession" + +EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --disable-loadsave" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} \ + mandir=${STAGING_DIR}/share/man +} + +do_install_append() { + install -d ${D}${sysconfdir}/X11/Xsession.d + install ${WORKDIR}/gstreamer.xsession ${D}${sysconfdir}/X11/Xsession.d/90gst-register +} + -- cgit v1.2.3