summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2014-09-18 04:01:16 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-22 13:04:23 +0100
commitcc58218be4f427e4cb8659ae0b4600342c376cc8 (patch)
treed262ecf0b850c1ce4bdf1e7a4d7598bb14ce2feb /meta/recipes-multimedia
parent13d1209731ec2ec028101bdbf8b4cf8342c5b56e (diff)
downloadpoky-cc58218be4f427e4cb8659ae0b4600342c376cc8.tar.gz
gstreamer1.0-plugins-bad: 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, 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>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc4
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch64
2 files changed, 68 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index d8aa6eedcb..dab0bf54a6 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -6,6 +6,9 @@ DEPENDS += "gstreamer1.0-plugins-base bzip2 libpng jpeg"
6 6
7S = "${WORKDIR}/gst-plugins-bad-${PV}" 7S = "${WORKDIR}/gst-plugins-bad-${PV}"
8 8
9SRC_URI += "file://configure-allow-to-disable-libssh2.patch \
10 "
11
9inherit gettext 12inherit gettext
10 13
11# opengl packageconfig factored out to make it easy for distros 14# opengl packageconfig factored out to make it easy for distros
@@ -51,6 +54,7 @@ PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
51PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1" 54PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
52PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" 55PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
53PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump" 56PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
57PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
54 58
55# these plugins have not been ported to 1.0 (yet): 59# these plugins have not been ported to 1.0 (yet):
56# directdraw vcd apexsink dc1394 lv2 linsys musepack mythtv 60# directdraw vcd apexsink dc1394 lv2 linsys musepack mythtv
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 @@
1From f59c5269f92d59a5296cbfeeb682d42095cd88ad Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Thu, 18 Sep 2014 02:24:07 -0400
4Subject: [PATCH] gstreamer1.0-plugins-bad: allow to disable libssh2
5
6libssh2 is automatically linked to if present, this undetermined
7dependency may cause build errors like:
8
9 .../x86_64-poky-linux/4.9.0/ld: cannot find -lssh2
10
11libssh2 isn't an oe-core recipe, so allow to disable it from
12configure.
13
14Upstream-Status: Pending
15
16Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
17---
18 configure.ac | 23 +++++++++++++++++------
19 1 file changed, 17 insertions(+), 6 deletions(-)
20
21diff --git a/configure.ac b/configure.ac
22index 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--
631.7.9.5
64