diff options
author | Carlos Rafael Giani <crg7475@mailbox.org> | 2020-01-12 14:59:47 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-16 22:33:08 +0000 |
commit | 427eb30f9b59972b38ae3f25094470bb7034547d (patch) | |
tree | e470dff2575a5dd5c424a989257c720f627464d8 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch | |
parent | 41c498bded82d3c9216dd3c862e70890f67f2914 (diff) | |
download | poky-427eb30f9b59972b38ae3f25094470bb7034547d.tar.gz |
gstreamer1.0-plugins-bad: Transition to meson based builds
* Removed autotools/M4 related patch
0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch.
* configure-allow-to-disable-libssh2.patch got replaced by the
-Dcurl-ssh2 option.
* 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch is a
fix for GIR support in the meson.build file.
* New "closedcaption" packageconfigs added.
* Removed "flite" packageconfig since flite-alsa was removed from
meta-openembedded due it being old and abandoned.
* gettext handling now part of gstreamer1.0-plugins-common.inc.
(From OE-Core rev: fec739c764aed866b073f240086ca193dfe2f495)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch | 61 |
1 files changed, 0 insertions, 61 deletions
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 deleted file mode 100644 index 25861b6b9d..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/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 | @@ -1202,6 +1202,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 | @@ -1224,12 +1233,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) | ||