diff options
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch | 47 |
1 files changed, 47 insertions, 0 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 @@ | |||
1 | From 10d2a977ee1d469f0bf9059bb2d0b55fd2eecbac Mon Sep 17 00:00:00 2001 | ||
2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
3 | Date: Wed, 20 Jan 2016 13:00:00 -0800 | ||
4 | Subject: [PATCH] make gio_unix_2_0 dependency configurable | ||
5 | |||
6 | Prior to 1.7.1, gst-plugins-base accepted a configure option to | ||
7 | disable gio_unix_2_0, however it was implemented incorrectly using | ||
8 | AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the | ||
9 | dependency unconditional. | ||
10 | |||
11 | http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70 | ||
12 | |||
13 | To make builds deterministic, re-instate support for | ||
14 | --disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE | ||
15 | instead of AG_GST_CHECK_FEATURE. | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
20 | --- | ||
21 | configure.ac | 7 +++++++ | ||
22 | 1 file changed, 7 insertions(+) | ||
23 | |||
24 | diff --git a/configure.ac b/configure.ac | ||
25 | index 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 | -- | ||
46 | 1.9.1 | ||
47 | |||