From 761b3c37d70f7af76b64fd6941cc359b773bbba0 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Wed, 14 Mar 2012 15:57:49 +0800 Subject: gst-plugins-base: upgrade to 0.10.36 (From OE-Core rev: 10c24f924f46784f91f1113aca6e18838aada0fd) Signed-off-by: Shane Wang Signed-off-by: Richard Purdie --- .../gst-plugins-base-tremor.patch | 19 ---------------- .../gst-plugins-base-tremor.patch | 20 +++++++++++++++++ .../gstreamer/gst-plugins-base_0.10.35.bb | 26 ---------------------- .../gstreamer/gst-plugins-base_0.10.36.bb | 26 ++++++++++++++++++++++ 4 files changed, 46 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.35/gst-plugins-base-tremor.patch create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.35/gst-plugins-base-tremor.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.35/gst-plugins-base-tremor.patch deleted file mode 100644 index 224bf1a41e..0000000000 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.35/gst-plugins-base-tremor.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove -DTREMOR option since Tremor has dropped its internal -libogg2, and gst-plugins-base has dependency on that. - -Upstream-Status: Inappropriate [configuration] - -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.36/gst-plugins-base-tremor.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch new file mode 100644 index 0000000000..99dbc9d52e --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/gst-plugins-base-tremor.patch @@ -0,0 +1,20 @@ +Remove -DTREMOR option since Tremor has dropped its internal +libogg2, and gst-plugins-base has dependency on that. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Dongxiao Xu +Signed-off-by: Shane Wang + +diff -r 70065fb4e085 ext/vorbis/Makefile.am +--- a/ext/vorbis/Makefile.am Tue Mar 13 16:36:56 2012 +0800 ++++ b/ext/vorbis/Makefile.am Tue Mar 13 16:38:53 2012 +0800 +@@ -30,7 +30,7 @@ + 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.35.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb deleted file mode 100644 index 93f8eb3c73..0000000000 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.35.bb +++ /dev/null @@ -1,26 +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 += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" -DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor" - -SRC_URI += " file://gst-plugins-base-tremor.patch" - -SRC_URI[md5sum] = "1d300983525f4f09030eb3ba47cb04b0" -SRC_URI[sha256sum] = "cd24f01bb5258a1f400bc4f2c212bb7cee9ee23c9ffb80d537a24ef366d17103" - -PR = "r1" - -inherit gettext - -EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs" - -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.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb new file mode 100644 index 0000000000..0f2bbeddad --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb @@ -0,0 +1,26 @@ +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 += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" +DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor" + +SRC_URI += " file://gst-plugins-base-tremor.patch" + +SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" +SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976" + +PR = "r0" + +inherit gettext + +EXTRA_OECONF += "--disable-freetypetest --disable-pango --disable-gnome_vfs" + +do_configure_prepend() { + # This m4 file contains nastiness which conflicts with libtool 2.2.2 + rm -f ${S}/m4/lib-link.m4 +} -- cgit v1.2.3-54-g00ecf