From e9c85d5b99ec1841ff0d93f0812baa14d7c3d752 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Thu, 28 Apr 2016 21:06:27 +0200 Subject: gstreamer1.0: upgrade to version 1.8.1 The gst-inspect patch no longer applies, and according to upstream, is not needed. (From OE-Core rev: 78ae58c25f8084aab3cba66c9c50b34341f45c3c) Signed-off-by: Carlos Rafael Giani Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 2 ++ .../0001-Fix-crash-with-gst-inspect.patch | 28 ---------------------- .../gstreamer/gstreamer1.0_1.6.3.bb | 14 ----------- .../gstreamer/gstreamer1.0_1.8.1.bb | 13 ++++++++++ .../gstreamer/gstreamer1.0_git.bb | 5 ---- 5 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.1.bb (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc index 10b4668e5f..86ac10c84e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc @@ -24,6 +24,8 @@ PACKAGECONFIG[check] = "--enable-check,--disable-check" PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," +PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks," +PACKAGECONFIG[trace-historic] = "--enable-trace,--disable-trace," EXTRA_OECONF = " \ --disable-dependency-tracking \ diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch deleted file mode 100644 index 94f5cc56e8..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6b26f3dbf9bf577d71534ab7410de66d06e46ba2 Mon Sep 17 00:00:00 2001 -From: Carlos Rafael Giani -Date: Sat, 6 Apr 2013 23:52:11 +0200 -Subject: [PATCH] Fix crash with gst-inspect Chris Lord - -Upstream-Status: Pending - -Signed-off-by: Carlos Rafael Giani ---- - tools/gst-inspect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c -index 23b7c44..b79b02e 100644 ---- a/tools/gst-inspect.c -+++ b/tools/gst-inspect.c -@@ -1556,7 +1556,7 @@ main (int argc, char *argv[]) - g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); - g_option_context_add_group (ctx, gst_init_get_option_group ()); - if (!g_option_context_parse (ctx, &argc, &argv, &err)) { -- g_printerr ("Error initializing: %s\n", err->message); -+ g_printerr ("Error initializing: %s\n", err ? err->message : "(null)"); - return -1; - } - g_option_context_free (ctx); --- -1.8.2 - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb deleted file mode 100644 index ba1b83b08c..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -include gstreamer1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ - file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" - -SRC_URI = " \ - http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ - file://0001-Fix-crash-with-gst-inspect.patch \ -" - -SRC_URI[md5sum] = "b4cdeb2b9cb20dd6ac022a4f417eae0d" -SRC_URI[sha256sum] = "22f9568d67b87cf700a111f381144bd37cb93790a77e4e331db01fe854a37f24" - -S = "${WORKDIR}/gstreamer-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.1.bb new file mode 100644 index 0000000000..475ebf9d9e --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.1.bb @@ -0,0 +1,13 @@ +include gstreamer1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ + file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" + +SRC_URI = " \ + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ +" + +SRC_URI[md5sum] = "711ada79b63e47ac96adb4e5444dc908" +SRC_URI[sha256sum] = "5a3722fb9302dd977c17ced4240293dc777cb716dc98c8cca63d75c27e5e3107" + +S = "${WORKDIR}/gstreamer-${PV}" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb index 7715bb202e..f04fc6ebe4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb @@ -20,11 +20,6 @@ SRCREV_FORMAT = "base" S = "${WORKDIR}/git" -# The option to configure tracer hooks was added prior to the 1.7.2 release -# https://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=e5ca47236e4df4683707f0bcf99181a937d358d5 -PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks," -PACKAGECONFIG[trace-historic] = "--enable-trace,--disable-trace," - do_configure_prepend() { ${S}/autogen.sh --noconfigure } -- cgit 1.2.3-korg