diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch')
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch deleted file mode 100644 index ad8632989..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch +++ /dev/null | |||
| @@ -1,61 +0,0 @@ | |||
| 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 | Index: gst-plugins-bad-1.12.3/configure.ac | ||
| 22 | =================================================================== | ||
| 23 | --- gst-plugins-bad-1.12.3.orig/configure.ac | ||
| 24 | +++ gst-plugins-bad-1.12.3/configure.ac | ||
| 25 | @@ -2139,6 +2139,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom | ||
| 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.35.0, [ | ||
| 41 | @@ -2161,12 +2170,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin] | ||
| 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) | ||
