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>
This commit is contained in:
Andre McCurdy 2016-01-19 10:33:11 -08:00 committed by Richard Purdie
parent 3c7f2b8f35
commit 2ca9f202d2
2 changed files with 58 additions and 5 deletions

View File

@ -0,0 +1,47 @@
From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001
From: Andre McCurdy <armccurdy@gmail.com>
Date: Wed, 20 Jan 2016 13:00:00 -0800
Subject: [PATCH] make gio_unix_2_0 dependency configurable
Prior to 1.7.1, gst-plugins-base accepted a configure option to
disable gio_unix_2_0, however it was implemented incorrectly using
AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the
dependency unconditional.
http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70
To make builds deterministic, re-instate support for
--disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE
instead of AG_GST_CHECK_FEATURE.
Upstream-Status: Pending
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
configure.ac | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/configure.ac b/configure.ac
index 9c52aeb..26cacd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -747,9 +747,16 @@ AC_SUBST(FT2_CFLAGS)
AC_SUBST(FT2_LIBS)
dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
+AC_ARG_ENABLE([gio_unix_2_0],
+ [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])],
+ [],
+ [enable_gio_unix_2_0=yes])
+
+if test "x${enable_gio_unix_2_0}" != "xno"; then
PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24,
HAVE_GIO_UNIX_2_0="yes",
HAVE_GIO_UNIX_2_0="no")
+fi
AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes")
dnl *** finalize CFLAGS, LDFLAGS, LIBS
--
1.9.1

View File

@ -6,14 +6,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-base"
SRC_URI = " \
git://anongit.freedesktop.org/gstreamer/gst-plugins-base;name=base \
git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
file://make-gio_unix_2_0-dependency-configurable.patch \
"
SRCREV = "8d4cb64a4b9d84b10076bf350f80a0d6ea68ec2d"
PV = "1.7.1+git${SRCPV}"
SRCREV_base = "5f98203bd753c32666c8fa7a2fde6d186c2a4247"
SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
SRCREV_FORMAT = "base"
S = "${WORKDIR}/git"
do_configure_prepend() {
cd ${S}
./autogen.sh --noconfigure
cd ${B}
${S}/autogen.sh --noconfigure
}