summaryrefslogtreecommitdiffstats
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
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
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/configure-allow-to-disable-libssh2.patch17
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch135
2 files changed, 73 insertions, 79 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
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
index 0a8bc9b076..6616e2cf0d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -20,11 +20,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
20 gst-libs/gst/video/Makefile.am | 8 ++++---- 20 gst-libs/gst/video/Makefile.am | 8 ++++----
21 11 files changed, 38 insertions(+), 38 deletions(-) 21 11 files changed, 38 insertions(+), 38 deletions(-)
22 22
23diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am 23Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
24index bc7f53a..0ef5f86 100644 24===================================================================
25--- a/gst-libs/gst/allocators/Makefile.am 25--- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am
26+++ b/gst-libs/gst/allocators/Makefile.am 26+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
27@@ -35,7 +35,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ 27@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I
28 --c-include "gst/allocators/allocators.h" \ 28 --c-include "gst/allocators/allocators.h" \
29 -I$(top_srcdir)/gst-libs \ 29 -I$(top_srcdir)/gst-libs \
30 -I$(top_builddir)/gst-libs \ 30 -I$(top_builddir)/gst-libs \
@@ -33,7 +33,7 @@ index bc7f53a..0ef5f86 100644
33 --library=libgstallocators-@GST_API_VERSION@.la \ 33 --library=libgstallocators-@GST_API_VERSION@.la \
34 --include=Gst-@GST_API_VERSION@ \ 34 --include=Gst-@GST_API_VERSION@ \
35 --libtool="$(LIBTOOL)" \ 35 --libtool="$(LIBTOOL)" \
36@@ -59,7 +59,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 36@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
37 $(INTROSPECTION_COMPILER) \ 37 $(INTROSPECTION_COMPILER) \
38 --includedir=$(srcdir) \ 38 --includedir=$(srcdir) \
39 --includedir=$(builddir) \ 39 --includedir=$(builddir) \
@@ -42,11 +42,11 @@ index bc7f53a..0ef5f86 100644
42 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 42 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
43 43
44 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 44 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
45diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am 45Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am
46index dcc2fe0..dc076cb 100644 46===================================================================
47--- a/gst-libs/gst/app/Makefile.am 47--- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am
48+++ b/gst-libs/gst/app/Makefile.am 48+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am
49@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO 49@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE
50 --c-include "gst/app/app.h" \ 50 --c-include "gst/app/app.h" \
51 -I$(top_srcdir)/gst-libs \ 51 -I$(top_srcdir)/gst-libs \
52 -I$(top_builddir)/gst-libs \ 52 -I$(top_builddir)/gst-libs \
@@ -57,11 +57,11 @@ index dcc2fe0..dc076cb 100644
57 --library=libgstapp-@GST_API_VERSION@.la \ 57 --library=libgstapp-@GST_API_VERSION@.la \
58 --include=Gst-@GST_API_VERSION@ \ 58 --include=Gst-@GST_API_VERSION@ \
59 --include=GstBase-@GST_API_VERSION@ \ 59 --include=GstBase-@GST_API_VERSION@ \
60diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am 60Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
61index 2374196..295eb42 100644 61===================================================================
62--- a/gst-libs/gst/audio/Makefile.am 62--- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am
63+++ b/gst-libs/gst/audio/Makefile.am 63+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
64@@ -106,12 +106,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE 64@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS
65 -I$(top_srcdir)/gst-libs \ 65 -I$(top_srcdir)/gst-libs \
66 -I$(top_builddir)/gst-libs \ 66 -I$(top_builddir)/gst-libs \
67 --c-include "gst/audio/audio.h" \ 67 --c-include "gst/audio/audio.h" \
@@ -78,7 +78,7 @@ index 2374196..295eb42 100644
78 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 78 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
79 --include=Gst-@GST_API_VERSION@ \ 79 --include=Gst-@GST_API_VERSION@ \
80 --include=GstBase-@GST_API_VERSION@ \ 80 --include=GstBase-@GST_API_VERSION@ \
81@@ -140,8 +140,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 81@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
82 --includedir=$(srcdir) \ 82 --includedir=$(srcdir) \
83 --includedir=$(builddir) \ 83 --includedir=$(builddir) \
84 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 84 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
@@ -89,11 +89,11 @@ index 2374196..295eb42 100644
89 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 89 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
90 90
91 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 91 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
92diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am 92Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am
93index f545354..1bb6243 100644 93===================================================================
94--- a/gst-libs/gst/fft/Makefile.am 94--- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am
95+++ b/gst-libs/gst/fft/Makefile.am 95+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am
96@@ -62,7 +62,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO 96@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE
97 --c-include "gst/fft/fft.h" \ 97 --c-include "gst/fft/fft.h" \
98 -I$(top_srcdir)/gst-libs \ 98 -I$(top_srcdir)/gst-libs \
99 -I$(top_builddir)/gst-libs \ 99 -I$(top_builddir)/gst-libs \
@@ -102,7 +102,7 @@ index f545354..1bb6243 100644
102 --library=libgstfft-@GST_API_VERSION@.la \ 102 --library=libgstfft-@GST_API_VERSION@.la \
103 --include=Gst-@GST_API_VERSION@ \ 103 --include=Gst-@GST_API_VERSION@ \
104 --libtool="$(LIBTOOL)" \ 104 --libtool="$(LIBTOOL)" \
105@@ -86,7 +86,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 105@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
106 $(INTROSPECTION_COMPILER) \ 106 $(INTROSPECTION_COMPILER) \
107 --includedir=$(srcdir) \ 107 --includedir=$(srcdir) \
108 --includedir=$(builddir) \ 108 --includedir=$(builddir) \
@@ -111,11 +111,11 @@ index f545354..1bb6243 100644
111 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 111 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
112 112
113 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 113 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
114diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am 114Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
115index 91dc214..dc8e1d3 100644 115===================================================================
116--- a/gst-libs/gst/pbutils/Makefile.am 116--- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am
117+++ b/gst-libs/gst/pbutils/Makefile.am 117+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
118@@ -84,14 +84,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP 118@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR
119 --c-include "gst/pbutils/pbutils.h" \ 119 --c-include "gst/pbutils/pbutils.h" \
120 -I$(top_srcdir)/gst-libs \ 120 -I$(top_srcdir)/gst-libs \
121 -I$(top_builddir)/gst-libs \ 121 -I$(top_builddir)/gst-libs \
@@ -134,7 +134,7 @@ index 91dc214..dc8e1d3 100644
134 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 134 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
135 --library-path="$(top_builddir)/gst-libs/gst/video/" \ 135 --library-path="$(top_builddir)/gst-libs/gst/video/" \
136 --library-path="$(top_builddir)/gst-libs/gst/audio/" \ 136 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
137@@ -124,8 +124,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 137@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
138 $(INTROSPECTION_COMPILER) \ 138 $(INTROSPECTION_COMPILER) \
139 --includedir=$(srcdir) \ 139 --includedir=$(srcdir) \
140 --includedir=$(builddir) \ 140 --includedir=$(builddir) \
@@ -145,11 +145,11 @@ index 91dc214..dc8e1d3 100644
145 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 145 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
146 --includedir="$(top_builddir)/gst-libs/gst/video/" \ 146 --includedir="$(top_builddir)/gst-libs/gst/video/" \
147 --includedir="$(top_builddir)/gst-libs/gst/audio/" \ 147 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
148diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am 148Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
149index 3bd8fc0..0a115cc 100644 149===================================================================
150--- a/gst-libs/gst/riff/Makefile.am 150--- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am
151+++ b/gst-libs/gst/riff/Makefile.am 151+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
152@@ -41,8 +41,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) 152@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS
153 # --c-include "gst/riff/riff.h" \ 153 # --c-include "gst/riff/riff.h" \
154 # --add-include-path=$(builddir)/../tag \ 154 # --add-include-path=$(builddir)/../tag \
155 # --add-include-path=$(builddir)/../audio \ 155 # --add-include-path=$(builddir)/../audio \
@@ -160,7 +160,7 @@ index 3bd8fc0..0a115cc 100644
160 # --library=libgstriff-@GST_API_VERSION@.la \ 160 # --library=libgstriff-@GST_API_VERSION@.la \
161 # --include=GstAudio-@GST_API_VERSION@ \ 161 # --include=GstAudio-@GST_API_VERSION@ \
162 # --include=GstTag-@GST_API_VERSION@ \ 162 # --include=GstTag-@GST_API_VERSION@ \
163@@ -73,8 +73,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) 163@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS
164 # --includedir=$(builddir) \ 164 # --includedir=$(builddir) \
165 # --includedir=$(builddir)/../tag \ 165 # --includedir=$(builddir)/../tag \
166 # --includedir=$(builddir)/../audio \ 166 # --includedir=$(builddir)/../audio \
@@ -171,11 +171,11 @@ index 3bd8fc0..0a115cc 100644
171 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 171 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
172 # 172 #
173 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 173 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
174diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am 174Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
175index f5445c1..527c0b4 100644 175===================================================================
176--- a/gst-libs/gst/rtp/Makefile.am 176--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am
177+++ b/gst-libs/gst/rtp/Makefile.am 177+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
178@@ -60,8 +60,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO 178@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE
179 --c-include "gst/rtp/rtp.h" \ 179 --c-include "gst/rtp/rtp.h" \
180 -I$(top_builddir)/gst-libs \ 180 -I$(top_builddir)/gst-libs \
181 -I$(top_srcdir)/gst-libs \ 181 -I$(top_srcdir)/gst-libs \
@@ -186,7 +186,7 @@ index f5445c1..527c0b4 100644
186 --library=libgstrtp-@GST_API_VERSION@.la \ 186 --library=libgstrtp-@GST_API_VERSION@.la \
187 --include=Gst-@GST_API_VERSION@ \ 187 --include=Gst-@GST_API_VERSION@ \
188 --include=GstBase-@GST_API_VERSION@ \ 188 --include=GstBase-@GST_API_VERSION@ \
189@@ -88,8 +88,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 189@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
190 $(INTROSPECTION_COMPILER) \ 190 $(INTROSPECTION_COMPILER) \
191 --includedir=$(srcdir) \ 191 --includedir=$(srcdir) \
192 --includedir=$(builddir) \ 192 --includedir=$(builddir) \
@@ -197,11 +197,11 @@ index f5445c1..527c0b4 100644
197 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 197 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
198 198
199 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 199 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
200diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am 200Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
201index 9b0b258..4f6d9f8 100644 201===================================================================
202--- a/gst-libs/gst/rtsp/Makefile.am 202--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am
203+++ b/gst-libs/gst/rtsp/Makefile.am 203+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
204@@ -67,7 +67,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS 204@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP
205 -I$(top_builddir)/gst-libs \ 205 -I$(top_builddir)/gst-libs \
206 -I$(top_srcdir)/gst-libs \ 206 -I$(top_srcdir)/gst-libs \
207 --add-include-path=$(builddir)/../sdp \ 207 --add-include-path=$(builddir)/../sdp \
@@ -210,7 +210,7 @@ index 9b0b258..4f6d9f8 100644
210 --library=libgstrtsp-@GST_API_VERSION@.la \ 210 --library=libgstrtsp-@GST_API_VERSION@.la \
211 --include=Gio-2.0 \ 211 --include=Gio-2.0 \
212 --include=Gst-@GST_API_VERSION@ \ 212 --include=Gst-@GST_API_VERSION@ \
213@@ -97,7 +97,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 213@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
214 --includedir=$(srcdir) \ 214 --includedir=$(srcdir) \
215 --includedir=$(builddir) \ 215 --includedir=$(builddir) \
216 --includedir=$(builddir)/../sdp \ 216 --includedir=$(builddir)/../sdp \
@@ -219,11 +219,11 @@ index 9b0b258..4f6d9f8 100644
219 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 219 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
220 220
221 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 221 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
222diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am 222Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
223index 0e149b8..9aa0512 100644 223===================================================================
224--- a/gst-libs/gst/sdp/Makefile.am 224--- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am
225+++ b/gst-libs/gst/sdp/Makefile.am 225+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
226@@ -29,7 +29,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO 226@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE
227 --warn-all \ 227 --warn-all \
228 --c-include "gst/sdp/sdp.h" \ 228 --c-include "gst/sdp/sdp.h" \
229 -I$(top_srcdir)/gst-libs \ 229 -I$(top_srcdir)/gst-libs \
@@ -232,7 +232,7 @@ index 0e149b8..9aa0512 100644
232 --library=libgstsdp-@GST_API_VERSION@.la \ 232 --library=libgstsdp-@GST_API_VERSION@.la \
233 --include=Gst-@GST_API_VERSION@ \ 233 --include=Gst-@GST_API_VERSION@ \
234 --libtool="$(LIBTOOL)" \ 234 --libtool="$(LIBTOOL)" \
235@@ -53,7 +53,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 235@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
236 $(INTROSPECTION_COMPILER) \ 236 $(INTROSPECTION_COMPILER) \
237 --includedir=$(srcdir) \ 237 --includedir=$(srcdir) \
238 --includedir=$(builddir) \ 238 --includedir=$(builddir) \
@@ -241,11 +241,11 @@ index 0e149b8..9aa0512 100644
241 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 241 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
242 242
243 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 243 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
244diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am 244Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
245index cafafd3..ba99279 100644 245===================================================================
246--- a/gst-libs/gst/tag/Makefile.am 246--- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am
247+++ b/gst-libs/gst/tag/Makefile.am 247+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
248@@ -40,8 +40,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO 248@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE
249 --c-include "gst/tag/tag.h" \ 249 --c-include "gst/tag/tag.h" \
250 -I$(top_srcdir)/gst-libs \ 250 -I$(top_srcdir)/gst-libs \
251 -I$(top_builddir)/gst-libs \ 251 -I$(top_builddir)/gst-libs \
@@ -256,7 +256,7 @@ index cafafd3..ba99279 100644
256 --library=libgsttag-@GST_API_VERSION@.la \ 256 --library=libgsttag-@GST_API_VERSION@.la \
257 --include=Gst-@GST_API_VERSION@ \ 257 --include=Gst-@GST_API_VERSION@ \
258 --include=GstBase-@GST_API_VERSION@ \ 258 --include=GstBase-@GST_API_VERSION@ \
259@@ -68,8 +68,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 259@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
260 $(INTROSPECTION_COMPILER) \ 260 $(INTROSPECTION_COMPILER) \
261 --includedir=$(srcdir) \ 261 --includedir=$(srcdir) \
262 --includedir=$(builddir) \ 262 --includedir=$(builddir) \
@@ -266,12 +266,12 @@ index cafafd3..ba99279 100644
266+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ 266+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
267 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 267 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
268 268
269 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 269 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
270diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am 270Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am
271index ac64eb3..342c8c6 100644 271===================================================================
272--- a/gst-libs/gst/video/Makefile.am 272--- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am
273+++ b/gst-libs/gst/video/Makefile.am 273+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am
274@@ -111,8 +111,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE 274@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS
275 --c-include "gst/video/video.h" \ 275 --c-include "gst/video/video.h" \
276 -I$(top_srcdir)/gst-libs \ 276 -I$(top_srcdir)/gst-libs \
277 -I$(top_builddir)/gst-libs \ 277 -I$(top_builddir)/gst-libs \
@@ -282,7 +282,7 @@ index ac64eb3..342c8c6 100644
282 --library=libgstvideo-@GST_API_VERSION@.la \ 282 --library=libgstvideo-@GST_API_VERSION@.la \
283 --include=Gst-@GST_API_VERSION@ \ 283 --include=Gst-@GST_API_VERSION@ \
284 --include=GstBase-@GST_API_VERSION@ \ 284 --include=GstBase-@GST_API_VERSION@ \
285@@ -139,8 +139,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) 285@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
286 $(INTROSPECTION_COMPILER) \ 286 $(INTROSPECTION_COMPILER) \
287 --includedir=$(srcdir) \ 287 --includedir=$(srcdir) \
288 --includedir=$(builddir) \ 288 --includedir=$(builddir) \
@@ -293,6 +293,3 @@ index ac64eb3..342c8c6 100644
293 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 293 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
294 294
295 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 295 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
296--
2972.6.2
298
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 04:04:45 +0000