diff options
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad')
2 files changed, 105 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch new file mode 100644 index 0000000000..042a32c04d --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gl-do-not-check-for-GL-GLU-EGL-GLES2-libs-if-disable.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From deba0da45ec821209a7ed148a4521d562e6512cd Mon Sep 17 00:00:00 2001 | ||
2 | From: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
3 | Date: Wed, 27 Aug 2014 14:47:25 +0200 | ||
4 | Subject: [PATCH] gl: do not check for GL/GLU/EGL/GLES2 libs if disabled in | ||
5 | configuration | ||
6 | |||
7 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=735522] | ||
8 | |||
9 | Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org> | ||
10 | --- | ||
11 | configure.ac | 14 ++++++++++---- | ||
12 | 1 file changed, 10 insertions(+), 4 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 1a46afb..e85d4ba 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -661,10 +661,16 @@ case $host in | ||
19 | fi | ||
20 | ;; | ||
21 | *) | ||
22 | - AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h) | ||
23 | - AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h) | ||
24 | - AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h) | ||
25 | - AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h) | ||
26 | + if test "x$NEED_GL" != "xno"; then | ||
27 | + AG_GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, GL/gl.h) | ||
28 | + AG_GST_CHECK_LIBHEADER(GLU, GLU, gluSphere,, GL/glu.h) | ||
29 | + fi | ||
30 | + if test "x$NEED_GLES2" != "xno"; then | ||
31 | + AG_GST_CHECK_LIBHEADER(GLES2, GLESv2, glTexImage2D,, GLES2/gl2.h) | ||
32 | + fi | ||
33 | + if test "x$NEED_EGL" != "xno"; then | ||
34 | + AG_GST_CHECK_LIBHEADER(EGL, EGL, eglGetError,, EGL/egl.h) | ||
35 | + fi | ||
36 | |||
37 | old_LIBS=$LIBS | ||
38 | old_CFLAGS=$CFLAGS | ||
39 | -- | ||
40 | 1.8.3.2 | ||
41 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch new file mode 100644 index 0000000000..d52afd5d57 --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch | |||
@@ -0,0 +1,64 @@ | |||
1 | From f59c5269f92d59a5296cbfeeb682d42095cd88ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Wenzong Fan <wenzong.fan@windriver.com> | ||
3 | Date: Thu, 18 Sep 2014 02:24:07 -0400 | ||
4 | Subject: [PATCH] gstreamer1.0-plugins-bad: allow to disable libssh2 | ||
5 | |||
6 | libssh2 is automatically linked to if present, this undetermined | ||
7 | dependency may cause build errors like: | ||
8 | |||
9 | .../x86_64-poky-linux/4.9.0/ld: cannot find -lssh2 | ||
10 | |||
11 | libssh2 isn't an oe-core recipe, so allow to disable it from | ||
12 | configure. | ||
13 | |||
14 | Upstream-Status: Pending | ||
15 | |||
16 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> | ||
17 | --- | ||
18 | configure.ac | 23 +++++++++++++++++------ | ||
19 | 1 file changed, 17 insertions(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index 0e95c5c..12153b4 100644 | ||
23 | --- a/configure.ac | ||
24 | +++ b/configure.ac | ||
25 | @@ -1901,6 +1901,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chromaprint], chromaprint, [ | ||
26 | ]) | ||
27 | |||
28 | dnl *** Curl *** | ||
29 | +AC_ARG_ENABLE([libssh2], | ||
30 | + [ --enable-libssh2 enable LIBSSH2 support @<:@default=auto@:>@], | ||
31 | + [case "${enableval}" in | ||
32 | + yes) NEED_SSH2=yes ;; | ||
33 | + no) NEED_SSH2=no ;; | ||
34 | + auto) NEED_SSH2=auto ;; | ||
35 | + *) AC_MSG_ERROR([bad value ${enableval} for --enable-libssh2]) ;; | ||
36 | + esac],[NEED_SSH2=auto]) | ||
37 | + | ||
38 | translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) | ||
39 | AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ | ||
40 | PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, [ | ||
41 | @@ -1915,12 +1924,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ | ||
42 | ]) | ||
43 | AC_SUBST(CURL_CFLAGS) | ||
44 | AC_SUBST(CURL_LIBS) | ||
45 | - PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [ | ||
46 | - HAVE_SSH2="yes" | ||
47 | - AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available]) | ||
48 | - ], [ | ||
49 | - HAVE_SSH2="no" | ||
50 | - ]) | ||
51 | + if test "x$NEED_SSH2" != "xno"; then | ||
52 | + PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [ | ||
53 | + HAVE_SSH2="yes" | ||
54 | + AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available]) | ||
55 | + ], [ | ||
56 | + HAVE_SSH2="no" | ||
57 | + ]) | ||
58 | + fi | ||
59 | AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes") | ||
60 | AC_SUBST(SSH2_CFLAGS) | ||
61 | AC_SUBST(SSH2_LIBS) | ||
62 | -- | ||
63 | 1.7.9.5 | ||
64 | |||