summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2016-01-19 10:33:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-24 09:40:25 +0000
commit2ca9f202d29c10332430544862793f9e211ad2df (patch)
tree24eda5bacce2148e7fb36f77845e207256c1bd21 /meta
parent3c7f2b8f35de3ed227695ecea737abea0d5e6097 (diff)
downloadpoky-2ca9f202d29c10332430544862793f9e211ad2df.tar.gz
gstreamer1.0-plugins-base: update git recipe to 1.7.1
The autogen.sh script takes care of cd'ing to the correct directory before it does anything, so we don't need to cd on its behalf any more in do_configure_prepend(). http://cgit.freedesktop.org/gstreamer/gst-plugins-base/tree/autogen.sh?id=1.7.1 (From OE-Core rev: 98110dd08a44ceacc3adb4fd72ceaedf93f3781b) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch47
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb16
2 files changed, 58 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
new file mode 100644
index 0000000000..01e944ddd8
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
@@ -0,0 +1,47 @@
1From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 20 Jan 2016 13:00:00 -0800
4Subject: [PATCH] make gio_unix_2_0 dependency configurable
5
6Prior to 1.7.1, gst-plugins-base accepted a configure option to
7disable gio_unix_2_0, however it was implemented incorrectly using
8AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the
9dependency unconditional.
10
11 http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70
12
13To make builds deterministic, re-instate support for
14--disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE
15instead of AG_GST_CHECK_FEATURE.
16
17Upstream-Status: Pending
18
19Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
20---
21 configure.ac | 7 +++++++
22 1 file changed, 7 insertions(+)
23
24diff --git a/configure.ac b/configure.ac
25index 9c52aeb..26cacd6 100644
26--- a/configure.ac
27+++ b/configure.ac
28@@ -747,9 +747,16 @@ AC_SUBST(FT2_CFLAGS)
29 AC_SUBST(FT2_LIBS)
30
31 dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
32+AC_ARG_ENABLE([gio_unix_2_0],
33+ [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])],
34+ [],
35+ [enable_gio_unix_2_0=yes])
36+
37+if test "x${enable_gio_unix_2_0}" != "xno"; then
38 PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24,
39 HAVE_GIO_UNIX_2_0="yes",
40 HAVE_GIO_UNIX_2_0="no")
41+fi
42 AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes")
43
44 dnl *** finalize CFLAGS, LDFLAGS, LIBS
45--
461.9.1
47
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
index 3d74e853e2..8ac3a7bed9 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
@@ -6,14 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
6 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ 6 file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
7 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" 7 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
8 8
9SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-base" 9SRC_URI = " \
10 git://anongit.freedesktop.org/gstreamer/gst-plugins-base;name=base \
11 git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
12 file://make-gio_unix_2_0-dependency-configurable.patch \
13"
10 14
11SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d" 15PV = "1.7.1+git${SRCPV}"
16
17SRCREV_base = "5f98203bd753c32666c8fa7a2fde6d186c2a4247"
18SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
19SRCREV_FORMAT = "base"
12 20
13S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
14 22
15do_configure_prepend() { 23do_configure_prepend() {
16 cd ${S} 24 ${S}/autogen.sh --noconfigure
17 ./autogen.sh --noconfigure
18 cd ${B}
19} 25}