From a943bea9ce0c11de6fe1352a4dd78fc044edd4fd Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 28 Dec 2010 10:53:36 +0800 Subject: gst-plugins-base: upgrade to version 0.10.31 upgrade from 0.10.30 to 0.10.31 Remove make-382.patch since the fix is already in upstream Signed-off-by: Dongxiao Xu --- .../gst-plugins-base-tremor.patch | 17 ------------- .../gst-plugins-base-tremor.patch | 17 +++++++++++++ .../gstreamer/gst-plugins-base_0.10.30.bb | 28 ---------------------- .../gstreamer/gst-plugins-base_0.10.31.bb | 27 +++++++++++++++++++++ .../gstreamer/gst-plugins/make-382.patch | 25 ------------------- 5 files changed, 44 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.31/gst-plugins-base-tremor.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb delete mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch deleted file mode 100644 index a6494fd4a..000000000 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.30/gst-plugins-base-tremor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Remove -DTREMOR option since Tremor has dropped its internal -libogg2, and gst-plugins-base has dependency on that. - -Signed-off-by: Dongxiao Xu - -diff -ruN gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am gst-plugins-base-0.10.30/ext/vorbis/Makefile.am ---- gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am 2010-11-17 16:11:03.000000000 +0800 -+++ gst-plugins-base-0.10.30/ext/vorbis/Makefile.am 2010-11-17 16:12:41.000000000 +0800 -@@ -28,7 +28,7 @@ - libgstivorbisdec_la_SOURCES = gstivorbisdec.c \ - gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c - libgstivorbisdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ -- -DTREMOR $(IVORBIS_CFLAGS) -+ $(IVORBIS_CFLAGS) - libgstivorbisdec_la_LIBADD = \ - $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.31/gst-plugins-base-tremor.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.31/gst-plugins-base-tremor.patch new file mode 100644 index 000000000..a6494fd4a --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.31/gst-plugins-base-tremor.patch @@ -0,0 +1,17 @@ +Remove -DTREMOR option since Tremor has dropped its internal +libogg2, and gst-plugins-base has dependency on that. + +Signed-off-by: Dongxiao Xu + +diff -ruN gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am gst-plugins-base-0.10.30/ext/vorbis/Makefile.am +--- gst-plugins-base-0.10.30-orig/ext/vorbis/Makefile.am 2010-11-17 16:11:03.000000000 +0800 ++++ gst-plugins-base-0.10.30/ext/vorbis/Makefile.am 2010-11-17 16:12:41.000000000 +0800 +@@ -28,7 +28,7 @@ + libgstivorbisdec_la_SOURCES = gstivorbisdec.c \ + gstvorbisdec.c gstvorbisdeclib.c gstvorbiscommon.c + libgstivorbisdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ +- -DTREMOR $(IVORBIS_CFLAGS) ++ $(IVORBIS_CFLAGS) + libgstivorbisdec_la_LIBADD = \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb deleted file mode 100644 index cbc13daf0..000000000 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.30.bb +++ /dev/null @@ -1,28 +0,0 @@ -require gst-plugins.inc - -LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ - file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ - file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ - file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" - -DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi" -RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ - gnome-vfs-plugin-sftp" - -SRC_URI += " file://gst-plugins-base-tremor.patch \ - file://make-382.patch" - -SRC_URI[md5sum] = "3ad90152b58563e1314af26c263f3c4c" -SRC_URI[sha256sum] = "63938641380be9935c804ae8d55acdcfd93920ed2deb72dcf70f027a78b085d7" - -PR = "r3" - -inherit gettext - -EXTRA_OECONF += "--disable-freetypetest --disable-pango" - -do_configure_prepend() { - # This m4 file contains nastiness which conflicts with libtool 2.2.2 - rm -f ${S}/m4/lib-link.m4 -} diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb new file mode 100644 index 000000000..77330b605 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.31.bb @@ -0,0 +1,27 @@ +require gst-plugins.inc + +LICENSE = "GPLv2+ & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ + file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ + file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \ + file://gst/ffmpegcolorspace/utils.c;beginline=1;endline=20;md5=9c83a200b8e597b26ca29df20fc6ecd0" + +DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis libxv libtheora avahi" +RDEPENDS_${PN} += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ + gnome-vfs-plugin-sftp" + +SRC_URI += " file://gst-plugins-base-tremor.patch" + +SRC_URI[md5sum] = "9baa0d87e81c88b2477a3554ab629c46" +SRC_URI[sha256sum] = "abb006c78222cfb69d31e983268d1d5219e9d4e0da24c6c4cd687968af7a33bd" + +PR = "r0" + +inherit gettext + +EXTRA_OECONF += "--disable-freetypetest --disable-pango" + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm -f ${S}/m4/lib-link.m4 +} diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch b/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch deleted file mode 100644 index 28caf076a..000000000 --- a/meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak -=================================================================== ---- gst-plugins-base-0.10.29.orig/common/gtk-doc-plugins.mak -+++ gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak -@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html -+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs - -Index: gst-plugins-base-0.10.29/common/gtk-doc.mak -=================================================================== ---- gst-plugins-base-0.10.29.orig/common/gtk-doc.mak -+++ gst-plugins-base-0.10.29/common/gtk-doc.mak -@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) -- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html -+ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - - .PHONY : dist-hook-local docs -- cgit v1.2.3