diff options
author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2016-04-28 21:06:27 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-06 10:31:11 +0100 |
commit | e9c85d5b99ec1841ff0d93f0812baa14d7c3d752 (patch) | |
tree | fdbcf09d90c0ec0c8c543093658353fc3a5a2bff /meta/recipes-multimedia | |
parent | c6394a56f71028982006a821190c538c095a12f5 (diff) | |
download | poky-e9c85d5b99ec1841ff0d93f0812baa14d7c3d752.tar.gz |
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 <dv@pseudoterminal.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 2 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-Fix-crash-with-gst-inspect.patch | 28 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 5 |
4 files changed, 4 insertions, 36 deletions
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" | |||
24 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | 24 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" |
25 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" | 25 | PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" |
26 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," | 26 | PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," |
27 | PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks," | ||
28 | PACKAGECONFIG[trace-historic] = "--enable-trace,--disable-trace," | ||
27 | 29 | ||
28 | EXTRA_OECONF = " \ | 30 | EXTRA_OECONF = " \ |
29 | --disable-dependency-tracking \ | 31 | --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 @@ | |||
1 | From 6b26f3dbf9bf577d71534ab7410de66d06e46ba2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
3 | Date: Sat, 6 Apr 2013 23:52:11 +0200 | ||
4 | Subject: [PATCH] Fix crash with gst-inspect Chris Lord <chris@openedhand.com> | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
9 | --- | ||
10 | tools/gst-inspect.c | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c | ||
14 | index 23b7c44..b79b02e 100644 | ||
15 | --- a/tools/gst-inspect.c | ||
16 | +++ b/tools/gst-inspect.c | ||
17 | @@ -1556,7 +1556,7 @@ main (int argc, char *argv[]) | ||
18 | g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE); | ||
19 | g_option_context_add_group (ctx, gst_init_get_option_group ()); | ||
20 | if (!g_option_context_parse (ctx, &argc, &argv, &err)) { | ||
21 | - g_printerr ("Error initializing: %s\n", err->message); | ||
22 | + g_printerr ("Error initializing: %s\n", err ? err->message : "(null)"); | ||
23 | return -1; | ||
24 | } | ||
25 | g_option_context_free (ctx); | ||
26 | -- | ||
27 | 1.8.2 | ||
28 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.1.bb index ba1b83b08c..475ebf9d9e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.6.3.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.8.1.bb | |||
@@ -5,10 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ | |||
5 | 5 | ||
6 | SRC_URI = " \ | 6 | SRC_URI = " \ |
7 | http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ | 7 | http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ |
8 | file://0001-Fix-crash-with-gst-inspect.patch \ | ||
9 | " | 8 | " |
10 | 9 | ||
11 | SRC_URI[md5sum] = "b4cdeb2b9cb20dd6ac022a4f417eae0d" | 10 | SRC_URI[md5sum] = "711ada79b63e47ac96adb4e5444dc908" |
12 | SRC_URI[sha256sum] = "22f9568d67b87cf700a111f381144bd37cb93790a77e4e331db01fe854a37f24" | 11 | SRC_URI[sha256sum] = "5a3722fb9302dd977c17ced4240293dc777cb716dc98c8cca63d75c27e5e3107" |
13 | 12 | ||
14 | S = "${WORKDIR}/gstreamer-${PV}" | 13 | 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" | |||
20 | 20 | ||
21 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |
22 | 22 | ||
23 | # The option to configure tracer hooks was added prior to the 1.7.2 release | ||
24 | # https://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=e5ca47236e4df4683707f0bcf99181a937d358d5 | ||
25 | PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks," | ||
26 | PACKAGECONFIG[trace-historic] = "--enable-trace,--disable-trace," | ||
27 | |||
28 | do_configure_prepend() { | 23 | do_configure_prepend() { |
29 | ${S}/autogen.sh --noconfigure | 24 | ${S}/autogen.sh --noconfigure |
30 | } | 25 | } |