summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2017-08-11 23:36:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-16 00:03:13 +0100
commit4f64854dff25de2331b54324729e966a9db1f1da (patch)
treed000bb8ecd2db0dcf2b0ba6011de3fa7027980dc /meta
parent5813f1f764f0c18ee2d00af9491f897bcc4089ab (diff)
downloadpoky-4f64854dff25de2331b54324729e966a9db1f1da.tar.gz
gstreamer1.0: upgrade to version 1.12.2
* Version 1.12 introduces support for libdw (provided by elfutils). libdw adds source lines & numbers to backtraces. A new "dw" packageconfig added for enabling/disabling this feature. In addition, the old patch for deterministic unwind configuration was replaced with one that also allows the same for the dw configuration. This new patch was also submitted to bugzilla. * Leftover docbook cruft was removed, meaning that the "--disable-docbook" configure switch is gone. (From OE-Core rev: a6c12ff35c97f4225a6b2f226ae4483d7bacdfb9) Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-configure-Add-switches-for-enabling-disabling-libdw-.patch70
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch24
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.4.bb)6
4 files changed, 74 insertions, 28 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index 72d7ce68d0..329193486d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -25,10 +25,10 @@ PACKAGECONFIG[tests] = "--enable-tests,--disable-tests"
25PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," 25PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind,"
26PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks," 26PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks,"
27PACKAGECONFIG[unwind] = "--with-unwind,--without-unwind,libunwind" 27PACKAGECONFIG[unwind] = "--with-unwind,--without-unwind,libunwind"
28PACKAGECONFIG[dw] = "--with-dw,--without-dw,elfutils"
28 29
29EXTRA_OECONF = " \ 30EXTRA_OECONF = " \
30 --disable-dependency-tracking \ 31 --disable-dependency-tracking \
31 --disable-docbook \
32 --disable-examples \ 32 --disable-examples \
33" 33"
34 34
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-configure-Add-switches-for-enabling-disabling-libdw-.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-configure-Add-switches-for-enabling-disabling-libdw-.patch
new file mode 100644
index 0000000000..1132fd5a48
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-configure-Add-switches-for-enabling-disabling-libdw-.patch
@@ -0,0 +1,70 @@
1From a0cb41ba72913eda06049d266ec43ea8f52b5bee Mon Sep 17 00:00:00 2001
2From: Carlos Rafael Giani <dv@pseudoterminal.org>
3Date: Fri, 11 Aug 2017 21:21:36 +0200
4Subject: [PATCH] configure: Add switches for enabling/disabling libdw and
5 libunwind
6
7[Original patch modified to be applicable to 1.12.2]
8
9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=778193]
10
11Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
12---
13 configure.ac | 38 ++++++++++++++++++++++++++++++++------
14 1 file changed, 32 insertions(+), 6 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index b6b2923..32dd827 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -821,15 +821,41 @@ fi
21 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
22
23 dnl libunwind is optionally used by the leaks tracer
24-PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no)
25-if test "x$HAVE_UNWIND" = "xyes"; then
26- AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
27+AC_ARG_WITH([unwind],[AS_HELP_STRING([--with-unwind=yes|no|auto],[use libunwind])],
28+ [], [with_unwind=auto])
29+if [ test "x${with_unwind}" != "xno" ]; then
30+ PKG_CHECK_MODULES(UNWIND, [libunwind],
31+ [
32+ HAVE_UNWIND=yes
33+ AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
34+ ],
35+ [
36+ HAVE_UNWIND=no
37+ if [ test "x${with_unwind}" = "xyes" ]; then
38+ AC_MSG_ERROR([could not find libunwind])
39+ fi
40+ ])
41+else
42+ HAVE_UNWIND=no
43 fi
44
45 dnl libdw is optionally used to add source lines and numbers to backtraces
46-PKG_CHECK_MODULES(DW, libdw, HAVE_DW=yes, HAVE_DW=no)
47-if test "x$HAVE_DW" = "xyes"; then
48- AC_DEFINE(HAVE_DW, 1, [libdw available])
49+AC_ARG_WITH([dw],[AS_HELP_STRING([--with-dw=yes|no|auto],[use libdw])],
50+ [], [with_dw=auto])
51+if [ test "x${with_dw}" != "xno" ]; then
52+ PKG_CHECK_MODULES(DW, [libdw],
53+ [
54+ HAVE_DW=yes
55+ AC_DEFINE(HAVE_DW, 1, [libdw available])
56+ ],
57+ [
58+ HAVE_DW=no
59+ if [ test "x${with_dw}" = "xyes" ]; then
60+ AC_MSG_ERROR([could not find libdw])
61+ fi
62+ ])
63+else
64+ HAVE_DW=no
65 fi
66
67 dnl Check for backtrace() from libc
68--
692.7.4
70
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch
deleted file mode 100644
index e39e6cad09..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Make the detection of libunwind deterministic.
2
3Upstream-Status: Pending
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6diff --git a/configure.ac b/configure.ac
7index ac88fb2..182c19a 100644
8--- a/configure.ac
9+++ b/configure.ac
10@@ -829,3 +828,0 @@ AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")
11-dnl libunwind is optionally used by the leaks tracer
12-PKG_CHECK_MODULES(UNWIND, libunwind, HAVE_UNWIND=yes, HAVE_UNWIND=no)
13-
14@@ -839,3 +836,7 @@ AC_CHECK_FUNC(backtrace, [
15-if test "x$HAVE_UNWIND" = "xyes"; then
16- AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])
17-fi
18+dnl libunwind is optionally used by the leaks tracer
19+AC_ARG_WITH([unwind],[AS_HELP_STRING([--with-unwind],[use libunwind])],
20+ [], [with_unwind=yes])
21+AS_IF([test "$with_unwind" = yes],
22+ [PKG_CHECK_MODULES(UNWIND, libunwind)
23+ AC_DEFINE(HAVE_UNWIND, 1, [libunwind available])]
24+)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.2.bb
index 2a6799345f..8d41a59d91 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.2.bb
@@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
5 5
6SRC_URI = " \ 6SRC_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://deterministic-unwind.patch \ 8 file://0001-configure-Add-switches-for-enabling-disabling-libdw-.patch \
9" 9"
10SRC_URI[md5sum] = "7c91a97e4a2dc81eafd59d0a2f8b0d6e" 10SRC_URI[md5sum] = "4748860621607ffd96244fb79c86c238"
11SRC_URI[sha256sum] = "50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218" 11SRC_URI[sha256sum] = "9fde3f39a2ea984f9e07ce09250285ce91f6e3619d186889f75b5154ecf994ba"
12 12
13S = "${WORKDIR}/gstreamer-${PV}" 13S = "${WORKDIR}/gstreamer-${PV}"