summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch158
1 files changed, 84 insertions, 74 deletions
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 6616e2cf0d..377c89a11d 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
@@ -1,16 +1,18 @@
1From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 1From 77b88eae845060d38cf788651f66a7ae98f9b199 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 26 Oct 2015 16:38:18 +0200 3Date: Thu, 5 Apr 2018 10:26:25 +0800
4Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with 4Subject: [PATCH] Makefile.am: prefix calls to pkg-config with
5 PKG_CONFIG_SYSROOT_DIR 5 PKG_CONFIG_SYSROOT_DIR
6 6
7Upstream-Status: Pending [review on oe-core maillist] 7Upstream-Status: Pending [review on oe-core maillist]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
10
9--- 11---
10 gst-libs/gst/allocators/Makefile.am | 4 ++-- 12 gst-libs/gst/allocators/Makefile.am | 4 ++--
11 gst-libs/gst/app/Makefile.am | 4 ++-- 13 gst-libs/gst/app/Makefile.am | 4 ++--
12 gst-libs/gst/audio/Makefile.am | 12 ++++++------ 14 gst-libs/gst/audio/Makefile.am | 12 ++++++------
13 gst-libs/gst/fft/Makefile.am | 4 ++-- 15 gst-libs/gst/gl/Makefile.am | 12 ++++++------
14 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ 16 gst-libs/gst/pbutils/Makefile.am | 12 ++++++------
15 gst-libs/gst/riff/Makefile.am | 8 ++++---- 17 gst-libs/gst/riff/Makefile.am | 8 ++++----
16 gst-libs/gst/rtp/Makefile.am | 8 ++++---- 18 gst-libs/gst/rtp/Makefile.am | 8 ++++----
@@ -18,13 +20,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
18 gst-libs/gst/sdp/Makefile.am | 4 ++-- 20 gst-libs/gst/sdp/Makefile.am | 4 ++--
19 gst-libs/gst/tag/Makefile.am | 8 ++++---- 21 gst-libs/gst/tag/Makefile.am | 8 ++++----
20 gst-libs/gst/video/Makefile.am | 8 ++++---- 22 gst-libs/gst/video/Makefile.am | 8 ++++----
21 11 files changed, 38 insertions(+), 38 deletions(-) 23 11 files changed, 42 insertions(+), 42 deletions(-)
22 24
23Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am 25diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
24=================================================================== 26index 1ecc950..d6417ac 100644
25--- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am 27--- a/gst-libs/gst/allocators/Makefile.am
26+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am 28+++ b/gst-libs/gst/allocators/Makefile.am
27@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I 29@@ -39,7 +39,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@
28 --c-include "gst/allocators/allocators.h" \ 30 --c-include "gst/allocators/allocators.h" \
29 -I$(top_srcdir)/gst-libs \ 31 -I$(top_srcdir)/gst-libs \
30 -I$(top_builddir)/gst-libs \ 32 -I$(top_builddir)/gst-libs \
@@ -33,7 +35,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
33 --library=libgstallocators-@GST_API_VERSION@.la \ 35 --library=libgstallocators-@GST_API_VERSION@.la \
34 --include=Gst-@GST_API_VERSION@ \ 36 --include=Gst-@GST_API_VERSION@ \
35 --libtool="$(LIBTOOL)" \ 37 --libtool="$(LIBTOOL)" \
36@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 38@@ -63,7 +63,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
37 $(INTROSPECTION_COMPILER) \ 39 $(INTROSPECTION_COMPILER) \
38 --includedir=$(srcdir) \ 40 --includedir=$(srcdir) \
39 --includedir=$(builddir) \ 41 --includedir=$(builddir) \
@@ -42,11 +44,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am
42 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 44 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
43 45
44 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 46 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
45Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am 47diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
46=================================================================== 48index 5bfd606..6441674 100644
47--- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am 49--- a/gst-libs/gst/app/Makefile.am
48+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am 50+++ b/gst-libs/gst/app/Makefile.am
49@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE 51@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO
50 --c-include "gst/app/app.h" \ 52 --c-include "gst/app/app.h" \
51 -I$(top_srcdir)/gst-libs \ 53 -I$(top_srcdir)/gst-libs \
52 -I$(top_builddir)/gst-libs \ 54 -I$(top_builddir)/gst-libs \
@@ -57,11 +59,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am
57 --library=libgstapp-@GST_API_VERSION@.la \ 59 --library=libgstapp-@GST_API_VERSION@.la \
58 --include=Gst-@GST_API_VERSION@ \ 60 --include=Gst-@GST_API_VERSION@ \
59 --include=GstBase-@GST_API_VERSION@ \ 61 --include=GstBase-@GST_API_VERSION@ \
60Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am 62diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
61=================================================================== 63index 7fb65f2..5379f79 100644
62--- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am 64--- a/gst-libs/gst/audio/Makefile.am
63+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am 65+++ b/gst-libs/gst/audio/Makefile.am
64@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS 66@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE
65 -I$(top_srcdir)/gst-libs \ 67 -I$(top_srcdir)/gst-libs \
66 -I$(top_builddir)/gst-libs \ 68 -I$(top_builddir)/gst-libs \
67 --c-include "gst/audio/audio.h" \ 69 --c-include "gst/audio/audio.h" \
@@ -78,7 +80,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
78 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 80 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
79 --include=Gst-@GST_API_VERSION@ \ 81 --include=Gst-@GST_API_VERSION@ \
80 --include=GstBase-@GST_API_VERSION@ \ 82 --include=GstBase-@GST_API_VERSION@ \
81@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 83@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
82 --includedir=$(srcdir) \ 84 --includedir=$(srcdir) \
83 --includedir=$(builddir) \ 85 --includedir=$(builddir) \
84 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 86 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
@@ -89,33 +91,41 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
89 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 91 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
90 92
91 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 93 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
92Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am 94diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
93=================================================================== 95index 16f829f..fc15a6d 100644
94--- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am 96--- a/gst-libs/gst/gl/Makefile.am
95+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am 97+++ b/gst-libs/gst/gl/Makefile.am
96@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE 98@@ -185,9 +185,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
97 --c-include "gst/fft/fft.h" \
98 -I$(top_srcdir)/gst-libs \
99 -I$(top_builddir)/gst-libs \ 99 -I$(top_builddir)/gst-libs \
100 $(GST_PLUGINS_BASE_CFLAGS) \
101 $(GL_CFLAGS) \
100- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 102- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
103- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
104- --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
101+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 105+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
102 --library=libgstfft-@GST_API_VERSION@.la \ 106+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
107+ --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
108 --library=libgstgl-@GST_API_VERSION@.la \
103 --include=Gst-@GST_API_VERSION@ \ 109 --include=Gst-@GST_API_VERSION@ \
104 --libtool="$(LIBTOOL)" \ 110 --include=GstBase-@GST_API_VERSION@ \
105@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 111@@ -216,9 +216,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
106 $(INTROSPECTION_COMPILER) \ 112 $(INTROSPECTION_COMPILER) \
107 --includedir=$(srcdir) \ 113 --includedir=$(srcdir) \
108 --includedir=$(builddir) \ 114 --includedir=$(builddir) \
109- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 115- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
116- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
117- --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
110+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ 118+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
119+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
120+ --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
111 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 121 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
112 122
113 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 123 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
114Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am 124diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
115=================================================================== 125index 35a6e44..49d6894 100644
116--- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am 126--- a/gst-libs/gst/pbutils/Makefile.am
117+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am 127+++ b/gst-libs/gst/pbutils/Makefile.am
118@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR 128@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP
119 --c-include "gst/pbutils/pbutils.h" \ 129 --c-include "gst/pbutils/pbutils.h" \
120 -I$(top_srcdir)/gst-libs \ 130 -I$(top_srcdir)/gst-libs \
121 -I$(top_builddir)/gst-libs \ 131 -I$(top_builddir)/gst-libs \
@@ -134,7 +144,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
134 --library-path="$(top_builddir)/gst-libs/gst/tag/" \ 144 --library-path="$(top_builddir)/gst-libs/gst/tag/" \
135 --library-path="$(top_builddir)/gst-libs/gst/video/" \ 145 --library-path="$(top_builddir)/gst-libs/gst/video/" \
136 --library-path="$(top_builddir)/gst-libs/gst/audio/" \ 146 --library-path="$(top_builddir)/gst-libs/gst/audio/" \
137@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 147@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
138 $(INTROSPECTION_COMPILER) \ 148 $(INTROSPECTION_COMPILER) \
139 --includedir=$(srcdir) \ 149 --includedir=$(srcdir) \
140 --includedir=$(builddir) \ 150 --includedir=$(builddir) \
@@ -145,11 +155,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
145 --includedir="$(top_builddir)/gst-libs/gst/tag/" \ 155 --includedir="$(top_builddir)/gst-libs/gst/tag/" \
146 --includedir="$(top_builddir)/gst-libs/gst/video/" \ 156 --includedir="$(top_builddir)/gst-libs/gst/video/" \
147 --includedir="$(top_builddir)/gst-libs/gst/audio/" \ 157 --includedir="$(top_builddir)/gst-libs/gst/audio/" \
148Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am 158diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am
149=================================================================== 159index e66ef4f..c8c588a 100644
150--- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am 160--- a/gst-libs/gst/riff/Makefile.am
151+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am 161+++ b/gst-libs/gst/riff/Makefile.am
152@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS 162@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
153 # --c-include "gst/riff/riff.h" \ 163 # --c-include "gst/riff/riff.h" \
154 # --add-include-path=$(builddir)/../tag \ 164 # --add-include-path=$(builddir)/../tag \
155 # --add-include-path=$(builddir)/../audio \ 165 # --add-include-path=$(builddir)/../audio \
@@ -160,7 +170,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
160 # --library=libgstriff-@GST_API_VERSION@.la \ 170 # --library=libgstriff-@GST_API_VERSION@.la \
161 # --include=GstAudio-@GST_API_VERSION@ \ 171 # --include=GstAudio-@GST_API_VERSION@ \
162 # --include=GstTag-@GST_API_VERSION@ \ 172 # --include=GstTag-@GST_API_VERSION@ \
163@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS 173@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS)
164 # --includedir=$(builddir) \ 174 # --includedir=$(builddir) \
165 # --includedir=$(builddir)/../tag \ 175 # --includedir=$(builddir)/../tag \
166 # --includedir=$(builddir)/../audio \ 176 # --includedir=$(builddir)/../audio \
@@ -171,11 +181,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am
171 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 181 # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
172 # 182 #
173 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 183 #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
174Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am 184diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am
175=================================================================== 185index 77ebeeb..9aee788 100644
176--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am 186--- a/gst-libs/gst/rtp/Makefile.am
177+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am 187+++ b/gst-libs/gst/rtp/Makefile.am
178@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE 188@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO
179 --c-include "gst/rtp/rtp.h" \ 189 --c-include "gst/rtp/rtp.h" \
180 -I$(top_builddir)/gst-libs \ 190 -I$(top_builddir)/gst-libs \
181 -I$(top_srcdir)/gst-libs \ 191 -I$(top_srcdir)/gst-libs \
@@ -186,7 +196,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
186 --library=libgstrtp-@GST_API_VERSION@.la \ 196 --library=libgstrtp-@GST_API_VERSION@.la \
187 --include=Gst-@GST_API_VERSION@ \ 197 --include=Gst-@GST_API_VERSION@ \
188 --include=GstBase-@GST_API_VERSION@ \ 198 --include=GstBase-@GST_API_VERSION@ \
189@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 199@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
190 $(INTROSPECTION_COMPILER) \ 200 $(INTROSPECTION_COMPILER) \
191 --includedir=$(srcdir) \ 201 --includedir=$(srcdir) \
192 --includedir=$(builddir) \ 202 --includedir=$(builddir) \
@@ -197,11 +207,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am
197 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 207 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
198 208
199 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 209 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
200Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am 210diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am
201=================================================================== 211index db9d0fd..79027cb 100644
202--- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am 212--- a/gst-libs/gst/rtsp/Makefile.am
203+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am 213+++ b/gst-libs/gst/rtsp/Makefile.am
204@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP 214@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS
205 -I$(top_builddir)/gst-libs \ 215 -I$(top_builddir)/gst-libs \
206 -I$(top_srcdir)/gst-libs \ 216 -I$(top_srcdir)/gst-libs \
207 --add-include-path=$(builddir)/../sdp \ 217 --add-include-path=$(builddir)/../sdp \
@@ -210,7 +220,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
210 --library=libgstrtsp-@GST_API_VERSION@.la \ 220 --library=libgstrtsp-@GST_API_VERSION@.la \
211 --include=Gio-2.0 \ 221 --include=Gio-2.0 \
212 --include=Gst-@GST_API_VERSION@ \ 222 --include=Gst-@GST_API_VERSION@ \
213@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 223@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
214 --includedir=$(srcdir) \ 224 --includedir=$(srcdir) \
215 --includedir=$(builddir) \ 225 --includedir=$(builddir) \
216 --includedir=$(builddir)/../sdp \ 226 --includedir=$(builddir)/../sdp \
@@ -219,11 +229,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am
219 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 229 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
220 230
221 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 231 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
222Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am 232diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am
223=================================================================== 233index 6e05cc7..c7cf514 100644
224--- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am 234--- a/gst-libs/gst/sdp/Makefile.am
225+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am 235+++ b/gst-libs/gst/sdp/Makefile.am
226@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE 236@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO
227 --warn-all \ 237 --warn-all \
228 --c-include "gst/sdp/sdp.h" \ 238 --c-include "gst/sdp/sdp.h" \
229 -I$(top_srcdir)/gst-libs \ 239 -I$(top_srcdir)/gst-libs \
@@ -232,7 +242,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
232 --library=libgstsdp-@GST_API_VERSION@.la \ 242 --library=libgstsdp-@GST_API_VERSION@.la \
233 --include=Gst-@GST_API_VERSION@ \ 243 --include=Gst-@GST_API_VERSION@ \
234 --libtool="$(LIBTOOL)" \ 244 --libtool="$(LIBTOOL)" \
235@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 245@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
236 $(INTROSPECTION_COMPILER) \ 246 $(INTROSPECTION_COMPILER) \
237 --includedir=$(srcdir) \ 247 --includedir=$(srcdir) \
238 --includedir=$(builddir) \ 248 --includedir=$(builddir) \
@@ -241,11 +251,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am
241 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 251 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
242 252
243 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) 253 CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
244Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am 254diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
245=================================================================== 255index c86515b..363e6d2 100644
246--- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am 256--- a/gst-libs/gst/tag/Makefile.am
247+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am 257+++ b/gst-libs/gst/tag/Makefile.am
248@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE 258@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO
249 --c-include "gst/tag/tag.h" \ 259 --c-include "gst/tag/tag.h" \
250 -I$(top_srcdir)/gst-libs \ 260 -I$(top_srcdir)/gst-libs \
251 -I$(top_builddir)/gst-libs \ 261 -I$(top_builddir)/gst-libs \
@@ -256,7 +266,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
256 --library=libgsttag-@GST_API_VERSION@.la \ 266 --library=libgsttag-@GST_API_VERSION@.la \
257 --include=Gst-@GST_API_VERSION@ \ 267 --include=Gst-@GST_API_VERSION@ \
258 --include=GstBase-@GST_API_VERSION@ \ 268 --include=GstBase-@GST_API_VERSION@ \
259@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 269@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
260 $(INTROSPECTION_COMPILER) \ 270 $(INTROSPECTION_COMPILER) \
261 --includedir=$(srcdir) \ 271 --includedir=$(srcdir) \
262 --includedir=$(builddir) \ 272 --includedir=$(builddir) \
@@ -267,11 +277,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am
267 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) 277 $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
268 278
269 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) 279 CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
270Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am 280diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
271=================================================================== 281index 0f8455f..8c9955c 100644
272--- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am 282--- a/gst-libs/gst/video/Makefile.am
273+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am 283+++ b/gst-libs/gst/video/Makefile.am
274@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS 284@@ -119,8 +119,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE
275 --c-include "gst/video/video.h" \ 285 --c-include "gst/video/video.h" \
276 -I$(top_srcdir)/gst-libs \ 286 -I$(top_srcdir)/gst-libs \
277 -I$(top_builddir)/gst-libs \ 287 -I$(top_builddir)/gst-libs \
@@ -282,7 +292,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am
282 --library=libgstvideo-@GST_API_VERSION@.la \ 292 --library=libgstvideo-@GST_API_VERSION@.la \
283 --include=Gst-@GST_API_VERSION@ \ 293 --include=Gst-@GST_API_VERSION@ \
284 --include=GstBase-@GST_API_VERSION@ \ 294 --include=GstBase-@GST_API_VERSION@ \
285@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= 295@@ -147,8 +147,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
286 $(INTROSPECTION_COMPILER) \ 296 $(INTROSPECTION_COMPILER) \
287 --includedir=$(srcdir) \ 297 --includedir=$(srcdir) \
288 --includedir=$(builddir) \ 298 --includedir=$(builddir) \