mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 06:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

gstreamer1.0-plugins-bad: disable libssh2

Browse Source 
libssh2 is automatically linked to if present, this undetermined
dependency may cause build errors like:

  .../x86_64-poky-linux/4.9.0/ld: cannot find -lssh2

libssh2 isn't an oe-core recipe, disable it for now.

(From OE-Core rev: 0cc59247ece1ea134d060d3ff064b5561972a92b)

Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wenzong Fan
2014-09-18 04:01:16 -04:00
committed by Richard Purdie
parent 13d1209731
commit cc58218be4
2 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
View File

@@ -6,6 +6,9 @@ DEPENDS += "gstreamer1.0-plugins-base bzip2 libpng jpeg"
S = "${WORKDIR}/gst-plugins-bad-${PV}"
SRC_URI += "file://configure-allow-to-disable-libssh2.patch \
"
inherit gettext
# opengl packageconfig factored out to make it easy for distros
@@ -51,6 +54,7 @@ PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
# these plugins have not been ported to 1.0 (yet):
# directdraw vcd apexsink dc1394 lv2 linsys musepack mythtv

64
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch Normal file
View File

@@ -0,0 +1,64 @@
From f59c5269f92d59a5296cbfeeb682d42095cd88ad Mon Sep 17 00:00:00 2001
From: Wenzong Fan <wenzong.fan@windriver.com>
Date: Thu, 18 Sep 2014 02:24:07 -0400
Subject: [PATCH] gstreamer1.0-plugins-bad: allow to disable libssh2
libssh2 is automatically linked to if present, this undetermined
dependency may cause build errors like:
.../x86_64-poky-linux/4.9.0/ld: cannot find -lssh2
libssh2 isn't an oe-core recipe, so allow to disable it from
configure.
Upstream-Status: Pending
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
configure.ac | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0e95c5c..12153b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1901,6 +1901,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chromaprint], chromaprint, [
])
dnl *** Curl ***
+AC_ARG_ENABLE([libssh2],
+ [ --enable-libssh2 enable LIBSSH2 support @<:@default=auto@:>@],
+ [case "${enableval}" in
+ yes) NEED_SSH2=yes ;;
+ no) NEED_SSH2=no ;;
+ auto) NEED_SSH2=auto ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-libssh2]) ;;
+ esac],[NEED_SSH2=auto])
+
translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true)
AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, [
@@ -1915,12 +1924,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
])
AC_SUBST(CURL_CFLAGS)
AC_SUBST(CURL_LIBS)
- PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [
- HAVE_SSH2="yes"
- AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available])
- ], [
- HAVE_SSH2="no"
- ])
+ if test "x$NEED_SSH2" != "xno"; then
+ PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [
+ HAVE_SSH2="yes"
+ AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available])
+ ], [
+ HAVE_SSH2="no"
+ ])
+ fi
AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes")
AC_SUBST(SSH2_CFLAGS)
AC_SUBST(SSH2_LIBS)
--
1.7.9.5