summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-08 20:17:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-09 09:17:02 -0800
commit27cb6b554342929c78b40189afdc4a62340a2cf2 (patch)
tree2c7bdc63e42518d4b4e7c8a6fbd7fe058ff014ac /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch
parente53eebb49d45ecdedac404f3b72db28ee80b3c74 (diff)
downloadpoky-27cb6b554342929c78b40189afdc4a62340a2cf2.tar.gz
gstreamer: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 923a55e5e3aaab7f11122751e1344b0d535569c0) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> 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.patch17
1 files changed, 7 insertions, 10 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
index d52afd5d57..ad86329893 100644
--- 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
@@ -18,11 +18,11 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
18 configure.ac | 23 +++++++++++++++++------ 18 configure.ac | 23 +++++++++++++++++------
19 1 file changed, 17 insertions(+), 6 deletions(-) 19 1 file changed, 17 insertions(+), 6 deletions(-)
20 20
21diff --git a/configure.ac b/configure.ac 21Index: gst-plugins-bad-1.12.3/configure.ac
22index 0e95c5c..12153b4 100644 22===================================================================
23--- a/configure.ac 23--- gst-plugins-bad-1.12.3.orig/configure.ac
24+++ b/configure.ac 24+++ gst-plugins-bad-1.12.3/configure.ac
25@@ -1901,6 +1901,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chromaprint], chromaprint, [ 25@@ -2139,6 +2139,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom
26 ]) 26 ])
27 27
28 dnl *** Curl *** 28 dnl *** Curl ***
@@ -37,8 +37,8 @@ index 0e95c5c..12153b4 100644
37+ 37+
38 translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) 38 translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true)
39 AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ 39 AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [
40 PKG_CHECK_MODULES(CURL, libcurl >= 7.21.0, [ 40 PKG_CHECK_MODULES(CURL, libcurl >= 7.35.0, [
41@@ -1915,12 +1924,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ 41@@ -2161,12 +2170,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin]
42 ]) 42 ])
43 AC_SUBST(CURL_CFLAGS) 43 AC_SUBST(CURL_CFLAGS)
44 AC_SUBST(CURL_LIBS) 44 AC_SUBST(CURL_LIBS)
@@ -59,6 +59,3 @@ index 0e95c5c..12153b4 100644
59 AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes") 59 AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes")
60 AC_SUBST(SSH2_CFLAGS) 60 AC_SUBST(SSH2_CFLAGS)
61 AC_SUBST(SSH2_LIBS) 61 AC_SUBST(SSH2_LIBS)
62--
631.7.9.5
64