summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-01-16 16:16:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 22:47:21 +0000
commita04bb6803b59d5e802520208a9532be7a13352c3 (patch)
tree85e9766ed5d70604a49fb0afa966534fa67db21e /meta/recipes-multimedia/gstreamer
parentbc14d82c0e5fb20b4967023152a9af1683fb2f2e (diff)
downloadpoky-a04bb6803b59d5e802520208a9532be7a13352c3.tar.gz
gstreamer1.0: make libunwind detection deterministic
Otherwise libunwind support will be based on the contents of the sysroot, which can cause problems. (From OE-Core rev: 14cb8fe36fcb2dc20830fb4ba63ed1302255b61b) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0.inc1
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch24
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb1
3 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
index 86c6f66a2f..72d7ce68d0 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -24,6 +24,7 @@ PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
24PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" 24PACKAGECONFIG[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"
27 28
28EXTRA_OECONF = " \ 29EXTRA_OECONF = " \
29 --disable-dependency-tracking \ 30 --disable-dependency-tracking \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch
new file mode 100644
index 0000000000..e39e6cad09
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/deterministic-unwind.patch
@@ -0,0 +1,24 @@
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.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb
index cc5c57f70b..4a01e8c731 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.10.2.bb
@@ -5,6 +5,7 @@ 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" 9"
9SRC_URI[md5sum] = "0d289e5bcec6353e6540ddb75b7d371b" 10SRC_URI[md5sum] = "0d289e5bcec6353e6540ddb75b7d371b"
10SRC_URI[sha256sum] = "150e8e81febac94c161d8141cde78a38038a8f56e8ec549f353da54994278d65" 11SRC_URI[sha256sum] = "150e8e81febac94c161d8141cde78a38038a8f56e8ec549f353da54994278d65"