diff options
author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2016-04-28 21:06:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-06 10:31:11 +0100 |
commit | 32a315a1a1b4a0e0db20e5cfe042afc639bee192 (patch) | |
tree | 4a0b9a2573a6568b5e4362e97ff8b0c118859885 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base | |
parent | e9c85d5b99ec1841ff0d93f0812baa14d7c3d752 (diff) | |
download | poky-32a315a1a1b4a0e0db20e5cfe042afc639bee192.tar.gz |
gstreamer1.0-plugins-base: upgrade to version 1.8.1
Patches still apply and only needed their line numbers updated, with the
exception of one backport from 1.7.1, which is no longer needed.
(From OE-Core rev: b982c73d6837ddd737e90911f1b9fdd2830ca876)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base')
8 files changed, 35 insertions, 178 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch index 781e4d8012..094bdac846 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch | |||
@@ -24,7 +24,7 @@ diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makef | |||
24 | index 9361bf9..bc7f53a 100644 | 24 | index 9361bf9..bc7f53a 100644 |
25 | --- a/gst-libs/gst/allocators/Makefile.am | 25 | --- a/gst-libs/gst/allocators/Makefile.am |
26 | +++ b/gst-libs/gst/allocators/Makefile.am | 26 | +++ b/gst-libs/gst/allocators/Makefile.am |
27 | @@ -37,7 +37,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | 27 | @@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ |
28 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 28 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
29 | --library=libgstallocators-@GST_API_VERSION@.la \ | 29 | --library=libgstallocators-@GST_API_VERSION@.la \ |
30 | --include=Gst-@GST_API_VERSION@ \ | 30 | --include=Gst-@GST_API_VERSION@ \ |
@@ -37,7 +37,7 @@ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am | |||
37 | index 6d6de8d..dcc2fe0 100644 | 37 | index 6d6de8d..dcc2fe0 100644 |
38 | --- a/gst-libs/gst/app/Makefile.am | 38 | --- a/gst-libs/gst/app/Makefile.am |
39 | +++ b/gst-libs/gst/app/Makefile.am | 39 | +++ b/gst-libs/gst/app/Makefile.am |
40 | @@ -52,7 +52,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO | 40 | @@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO |
41 | --library=libgstapp-@GST_API_VERSION@.la \ | 41 | --library=libgstapp-@GST_API_VERSION@.la \ |
42 | --include=Gst-@GST_API_VERSION@ \ | 42 | --include=Gst-@GST_API_VERSION@ \ |
43 | --include=GstBase-@GST_API_VERSION@ \ | 43 | --include=GstBase-@GST_API_VERSION@ \ |
@@ -50,7 +50,7 @@ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am | |||
50 | index 275d222..2374196 100644 | 50 | index 275d222..2374196 100644 |
51 | --- a/gst-libs/gst/audio/Makefile.am | 51 | --- a/gst-libs/gst/audio/Makefile.am |
52 | +++ b/gst-libs/gst/audio/Makefile.am | 52 | +++ b/gst-libs/gst/audio/Makefile.am |
53 | @@ -106,7 +106,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE | 53 | @@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE |
54 | --include=Gst-@GST_API_VERSION@ \ | 54 | --include=Gst-@GST_API_VERSION@ \ |
55 | --include=GstBase-@GST_API_VERSION@ \ | 55 | --include=GstBase-@GST_API_VERSION@ \ |
56 | --include=GstTag-@GST_API_VERSION@ \ | 56 | --include=GstTag-@GST_API_VERSION@ \ |
@@ -63,7 +63,7 @@ diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am | |||
63 | index 09b3d68..f545354 100644 | 63 | index 09b3d68..f545354 100644 |
64 | --- a/gst-libs/gst/fft/Makefile.am | 64 | --- a/gst-libs/gst/fft/Makefile.am |
65 | +++ b/gst-libs/gst/fft/Makefile.am | 65 | +++ b/gst-libs/gst/fft/Makefile.am |
66 | @@ -64,7 +64,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO | 66 | @@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO |
67 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 67 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
68 | --library=libgstfft-@GST_API_VERSION@.la \ | 68 | --library=libgstfft-@GST_API_VERSION@.la \ |
69 | --include=Gst-@GST_API_VERSION@ \ | 69 | --include=Gst-@GST_API_VERSION@ \ |
@@ -76,7 +76,7 @@ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am | |||
76 | index 64d5eb0..91dc214 100644 | 76 | index 64d5eb0..91dc214 100644 |
77 | --- a/gst-libs/gst/pbutils/Makefile.am | 77 | --- a/gst-libs/gst/pbutils/Makefile.am |
78 | +++ b/gst-libs/gst/pbutils/Makefile.am | 78 | +++ b/gst-libs/gst/pbutils/Makefile.am |
79 | @@ -94,7 +94,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP | 79 | @@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP |
80 | --include=GstTag-@GST_API_VERSION@ \ | 80 | --include=GstTag-@GST_API_VERSION@ \ |
81 | --include=GstVideo-@GST_API_VERSION@ \ | 81 | --include=GstVideo-@GST_API_VERSION@ \ |
82 | --include=GstAudio-@GST_API_VERSION@ \ | 82 | --include=GstAudio-@GST_API_VERSION@ \ |
@@ -102,7 +102,7 @@ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | |||
102 | index fdd01c1..f5445c1 100644 | 102 | index fdd01c1..f5445c1 100644 |
103 | --- a/gst-libs/gst/rtp/Makefile.am | 103 | --- a/gst-libs/gst/rtp/Makefile.am |
104 | +++ b/gst-libs/gst/rtp/Makefile.am | 104 | +++ b/gst-libs/gst/rtp/Makefile.am |
105 | @@ -64,7 +64,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | 105 | @@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO |
106 | --library=libgstrtp-@GST_API_VERSION@.la \ | 106 | --library=libgstrtp-@GST_API_VERSION@.la \ |
107 | --include=Gst-@GST_API_VERSION@ \ | 107 | --include=Gst-@GST_API_VERSION@ \ |
108 | --include=GstBase-@GST_API_VERSION@ \ | 108 | --include=GstBase-@GST_API_VERSION@ \ |
@@ -115,7 +115,7 @@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | |||
115 | index ede5706..9b0b258 100644 | 115 | index ede5706..9b0b258 100644 |
116 | --- a/gst-libs/gst/rtsp/Makefile.am | 116 | --- a/gst-libs/gst/rtsp/Makefile.am |
117 | +++ b/gst-libs/gst/rtsp/Makefile.am | 117 | +++ b/gst-libs/gst/rtsp/Makefile.am |
118 | @@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | 118 | @@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS |
119 | --include=Gio-2.0 \ | 119 | --include=Gio-2.0 \ |
120 | --include=Gst-@GST_API_VERSION@ \ | 120 | --include=Gst-@GST_API_VERSION@ \ |
121 | --include=GstSdp-@GST_API_VERSION@ \ | 121 | --include=GstSdp-@GST_API_VERSION@ \ |
@@ -128,7 +128,7 @@ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | |||
128 | index a90f30b..0e149b8 100644 | 128 | index a90f30b..0e149b8 100644 |
129 | --- a/gst-libs/gst/sdp/Makefile.am | 129 | --- a/gst-libs/gst/sdp/Makefile.am |
130 | +++ b/gst-libs/gst/sdp/Makefile.am | 130 | +++ b/gst-libs/gst/sdp/Makefile.am |
131 | @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | 131 | @@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO |
132 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 132 | --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
133 | --library=libgstsdp-@GST_API_VERSION@.la \ | 133 | --library=libgstsdp-@GST_API_VERSION@.la \ |
134 | --include=Gst-@GST_API_VERSION@ \ | 134 | --include=Gst-@GST_API_VERSION@ \ |
@@ -141,7 +141,7 @@ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | |||
141 | index c534a4d..cafafd3 100644 | 141 | index c534a4d..cafafd3 100644 |
142 | --- a/gst-libs/gst/tag/Makefile.am | 142 | --- a/gst-libs/gst/tag/Makefile.am |
143 | +++ b/gst-libs/gst/tag/Makefile.am | 143 | +++ b/gst-libs/gst/tag/Makefile.am |
144 | @@ -44,7 +44,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | 144 | @@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO |
145 | --library=libgsttag-@GST_API_VERSION@.la \ | 145 | --library=libgsttag-@GST_API_VERSION@.la \ |
146 | --include=Gst-@GST_API_VERSION@ \ | 146 | --include=Gst-@GST_API_VERSION@ \ |
147 | --include=GstBase-@GST_API_VERSION@ \ | 147 | --include=GstBase-@GST_API_VERSION@ \ |
@@ -154,7 +154,7 @@ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | |||
154 | index 5d31fa1..ac64eb3 100644 | 154 | index 5d31fa1..ac64eb3 100644 |
155 | --- a/gst-libs/gst/video/Makefile.am | 155 | --- a/gst-libs/gst/video/Makefile.am |
156 | +++ b/gst-libs/gst/video/Makefile.am | 156 | +++ b/gst-libs/gst/video/Makefile.am |
157 | @@ -113,7 +113,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | 157 | @@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE |
158 | --library=libgstvideo-@GST_API_VERSION@.la \ | 158 | --library=libgstvideo-@GST_API_VERSION@.la \ |
159 | --include=Gst-@GST_API_VERSION@ \ | 159 | --include=Gst-@GST_API_VERSION@ \ |
160 | --include=GstBase-@GST_API_VERSION@ \ | 160 | --include=GstBase-@GST_API_VERSION@ \ |
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 85fcacb555..0a8bc9b076 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 | |||
@@ -24,7 +24,7 @@ diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makef | |||
24 | index bc7f53a..0ef5f86 100644 | 24 | index bc7f53a..0ef5f86 100644 |
25 | --- a/gst-libs/gst/allocators/Makefile.am | 25 | --- a/gst-libs/gst/allocators/Makefile.am |
26 | +++ b/gst-libs/gst/allocators/Makefile.am | 26 | +++ b/gst-libs/gst/allocators/Makefile.am |
27 | @@ -34,7 +34,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | 27 | @@ -35,7 +35,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ |
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 | @@ -58,7 +58,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 36 | @@ -59,7 +59,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
37 | $(INTROSPECTION_COMPILER) \ | 37 | $(INTROSPECTION_COMPILER) \ |
38 | --includedir=$(srcdir) \ | 38 | --includedir=$(srcdir) \ |
39 | --includedir=$(builddir) \ | 39 | --includedir=$(builddir) \ |
@@ -46,7 +46,7 @@ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am | |||
46 | index dcc2fe0..dc076cb 100644 | 46 | index dcc2fe0..dc076cb 100644 |
47 | --- a/gst-libs/gst/app/Makefile.am | 47 | --- a/gst-libs/gst/app/Makefile.am |
48 | +++ b/gst-libs/gst/app/Makefile.am | 48 | +++ b/gst-libs/gst/app/Makefile.am |
49 | @@ -47,8 +47,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO | 49 | @@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO |
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 \ |
@@ -61,7 +61,7 @@ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am | |||
61 | index 2374196..295eb42 100644 | 61 | index 2374196..295eb42 100644 |
62 | --- a/gst-libs/gst/audio/Makefile.am | 62 | --- a/gst-libs/gst/audio/Makefile.am |
63 | +++ b/gst-libs/gst/audio/Makefile.am | 63 | +++ b/gst-libs/gst/audio/Makefile.am |
64 | @@ -96,12 +96,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE | 64 | @@ -106,12 +106,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE |
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 | @@ -130,8 +130,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 81 | @@ -140,8 +140,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
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/" \ |
@@ -93,7 +93,7 @@ diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am | |||
93 | index f545354..1bb6243 100644 | 93 | index f545354..1bb6243 100644 |
94 | --- a/gst-libs/gst/fft/Makefile.am | 94 | --- a/gst-libs/gst/fft/Makefile.am |
95 | +++ b/gst-libs/gst/fft/Makefile.am | 95 | +++ b/gst-libs/gst/fft/Makefile.am |
96 | @@ -61,7 +61,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO | 96 | @@ -62,7 +62,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO |
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 | @@ -85,7 +85,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 105 | @@ -86,7 +86,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
106 | $(INTROSPECTION_COMPILER) \ | 106 | $(INTROSPECTION_COMPILER) \ |
107 | --includedir=$(srcdir) \ | 107 | --includedir=$(srcdir) \ |
108 | --includedir=$(builddir) \ | 108 | --includedir=$(builddir) \ |
@@ -115,7 +115,7 @@ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am | |||
115 | index 91dc214..dc8e1d3 100644 | 115 | index 91dc214..dc8e1d3 100644 |
116 | --- a/gst-libs/gst/pbutils/Makefile.am | 116 | --- a/gst-libs/gst/pbutils/Makefile.am |
117 | +++ b/gst-libs/gst/pbutils/Makefile.am | 117 | +++ b/gst-libs/gst/pbutils/Makefile.am |
118 | @@ -79,14 +79,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP | 118 | @@ -84,14 +84,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP |
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 | @@ -119,8 +119,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 137 | @@ -124,8 +124,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
138 | $(INTROSPECTION_COMPILER) \ | 138 | $(INTROSPECTION_COMPILER) \ |
139 | --includedir=$(srcdir) \ | 139 | --includedir=$(srcdir) \ |
140 | --includedir=$(builddir) \ | 140 | --includedir=$(builddir) \ |
@@ -175,7 +175,7 @@ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | |||
175 | index f5445c1..527c0b4 100644 | 175 | index f5445c1..527c0b4 100644 |
176 | --- a/gst-libs/gst/rtp/Makefile.am | 176 | --- a/gst-libs/gst/rtp/Makefile.am |
177 | +++ b/gst-libs/gst/rtp/Makefile.am | 177 | +++ b/gst-libs/gst/rtp/Makefile.am |
178 | @@ -59,8 +59,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | 178 | @@ -60,8 +60,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO |
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 | @@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 189 | @@ -88,8 +88,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
190 | $(INTROSPECTION_COMPILER) \ | 190 | $(INTROSPECTION_COMPILER) \ |
191 | --includedir=$(srcdir) \ | 191 | --includedir=$(srcdir) \ |
192 | --includedir=$(builddir) \ | 192 | --includedir=$(builddir) \ |
@@ -201,7 +201,7 @@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | |||
201 | index 9b0b258..4f6d9f8 100644 | 201 | index 9b0b258..4f6d9f8 100644 |
202 | --- a/gst-libs/gst/rtsp/Makefile.am | 202 | --- a/gst-libs/gst/rtsp/Makefile.am |
203 | +++ b/gst-libs/gst/rtsp/Makefile.am | 203 | +++ b/gst-libs/gst/rtsp/Makefile.am |
204 | @@ -66,7 +66,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | 204 | @@ -67,7 +67,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS |
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 | @@ -96,7 +96,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 213 | @@ -97,7 +97,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
214 | --includedir=$(srcdir) \ | 214 | --includedir=$(srcdir) \ |
215 | --includedir=$(builddir) \ | 215 | --includedir=$(builddir) \ |
216 | --includedir=$(builddir)/../sdp \ | 216 | --includedir=$(builddir)/../sdp \ |
@@ -223,7 +223,7 @@ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | |||
223 | index 0e149b8..9aa0512 100644 | 223 | index 0e149b8..9aa0512 100644 |
224 | --- a/gst-libs/gst/sdp/Makefile.am | 224 | --- a/gst-libs/gst/sdp/Makefile.am |
225 | +++ b/gst-libs/gst/sdp/Makefile.am | 225 | +++ b/gst-libs/gst/sdp/Makefile.am |
226 | @@ -28,7 +28,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | 226 | @@ -29,7 +29,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO |
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 | @@ -52,7 +52,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 235 | @@ -53,7 +53,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
236 | $(INTROSPECTION_COMPILER) \ | 236 | $(INTROSPECTION_COMPILER) \ |
237 | --includedir=$(srcdir) \ | 237 | --includedir=$(srcdir) \ |
238 | --includedir=$(builddir) \ | 238 | --includedir=$(builddir) \ |
@@ -245,7 +245,7 @@ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | |||
245 | index cafafd3..ba99279 100644 | 245 | index cafafd3..ba99279 100644 |
246 | --- a/gst-libs/gst/tag/Makefile.am | 246 | --- a/gst-libs/gst/tag/Makefile.am |
247 | +++ b/gst-libs/gst/tag/Makefile.am | 247 | +++ b/gst-libs/gst/tag/Makefile.am |
248 | @@ -39,8 +39,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | 248 | @@ -40,8 +40,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO |
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 | @@ -67,8 +67,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 259 | @@ -68,8 +68,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
260 | $(INTROSPECTION_COMPILER) \ | 260 | $(INTROSPECTION_COMPILER) \ |
261 | --includedir=$(srcdir) \ | 261 | --includedir=$(srcdir) \ |
262 | --includedir=$(builddir) \ | 262 | --includedir=$(builddir) \ |
@@ -271,7 +271,7 @@ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | |||
271 | index ac64eb3..342c8c6 100644 | 271 | index ac64eb3..342c8c6 100644 |
272 | --- a/gst-libs/gst/video/Makefile.am | 272 | --- a/gst-libs/gst/video/Makefile.am |
273 | +++ b/gst-libs/gst/video/Makefile.am | 273 | +++ b/gst-libs/gst/video/Makefile.am |
274 | @@ -108,8 +108,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | 274 | @@ -111,8 +111,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE |
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 | @@ -136,8 +136,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 285 | @@ -139,8 +139,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
286 | $(INTROSPECTION_COMPILER) \ | 286 | $(INTROSPECTION_COMPILER) \ |
287 | --includedir=$(srcdir) \ | 287 | --includedir=$(srcdir) \ |
288 | --includedir=$(builddir) \ | 288 | --includedir=$(builddir) \ |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch index 42d99c1db9..4adf605460 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch | |||
@@ -14,7 +14,7 @@ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | |||
14 | index 4f6d9f8..0afa370 100644 | 14 | index 4f6d9f8..0afa370 100644 |
15 | --- a/gst-libs/gst/rtsp/Makefile.am | 15 | --- a/gst-libs/gst/rtsp/Makefile.am |
16 | +++ b/gst-libs/gst/rtsp/Makefile.am | 16 | +++ b/gst-libs/gst/rtsp/Makefile.am |
17 | @@ -74,7 +74,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | 17 | @@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS |
18 | --libtool="$(LIBTOOL)" \ | 18 | --libtool="$(LIBTOOL)" \ |
19 | --pkg gio-2.0 \ | 19 | --pkg gio-2.0 \ |
20 | --pkg gstreamer-@GST_API_VERSION@ \ | 20 | --pkg gstreamer-@GST_API_VERSION@ \ |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch index 7813915d8d..b924e38824 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch | |||
@@ -51,7 +51,7 @@ index b565e93..7741ccc | |||
51 | GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); | 51 | GST_WARNING_OBJECT (self, "seek to 0 bytes failed"); |
52 | } | 52 | } |
53 | 53 | ||
54 | @@ -1632,8 +1630,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) | 54 | @@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event) |
55 | gst_event_parse_segment (event, &s); | 55 | gst_event_parse_segment (event, &s); |
56 | if (s->format == GST_FORMAT_TIME) | 56 | if (s->format == GST_FORMAT_TIME) |
57 | gst_event_copy_segment (event, &self->segment); | 57 | gst_event_copy_segment (event, &self->segment); |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-convertframe-Support-video-crop-when-convert-frame.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-convertframe-Support-video-crop-when-convert-frame.patch deleted file mode 100755 index 096a6f4cba..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0005-convertframe-Support-video-crop-when-convert-frame.patch +++ /dev/null | |||
@@ -1,143 +0,0 @@ | |||
1 | From 5be6ed00aad028d9cbb4e0c63af0be69d335c71e Mon Sep 17 00:00:00 2001 | ||
2 | From: Song Bing <b06498@freescale.com> | ||
3 | Date: Fri, 11 Dec 2015 21:42:00 +0800 | ||
4 | Subject: [PATCH] convertframe: Support video crop when convert frame | ||
5 | |||
6 | Get thumbnail will user convertframe to convert video frame to | ||
7 | desired video format and size. But haven't process crop meta on | ||
8 | the video buffer. Add support video crop. | ||
9 | |||
10 | https://bugzilla.gnome.org/show_bug.cgi?id=759329 | ||
11 | |||
12 | Upstream-Status: Backport [1.7.1] | ||
13 | |||
14 | --- | ||
15 | gst-libs/gst/video/convertframe.c | 65 +++++++++++++++++++++++++++++++++------ | ||
16 | 1 file changed, 56 insertions(+), 9 deletions(-) | ||
17 | |||
18 | diff --git a/gst-libs/gst/video/convertframe.c b/gst-libs/gst/video/convertframe.c | ||
19 | index aa9c3d3..942a51e 100644 | ||
20 | --- a/gst-libs/gst/video/convertframe.c | ||
21 | +++ b/gst-libs/gst/video/convertframe.c | ||
22 | @@ -110,12 +110,23 @@ fail: | ||
23 | static GstElement * | ||
24 | build_convert_frame_pipeline (GstElement ** src_element, | ||
25 | GstElement ** sink_element, const GstCaps * from_caps, | ||
26 | - const GstCaps * to_caps, GError ** err) | ||
27 | + GstVideoCropMeta * cmeta, const GstCaps * to_caps, GError ** err) | ||
28 | { | ||
29 | - GstElement *src = NULL, *csp = NULL, *vscale = NULL; | ||
30 | - GstElement *sink = NULL, *encoder = NULL, *pipeline; | ||
31 | + GstElement *vcrop = NULL, *csp = NULL, *csp2 = NULL, *vscale = NULL; | ||
32 | + GstElement *src = NULL, *sink = NULL, *encoder = NULL, *pipeline; | ||
33 | + GstVideoInfo info; | ||
34 | GError *error = NULL; | ||
35 | |||
36 | + if (cmeta) { | ||
37 | + if (!create_element ("videocrop", &vcrop, &error)) { | ||
38 | + g_warning | ||
39 | + ("build_convert_frame_pipeline: Buffer has crop metadata but videocrop element is not found. Cropping will be disabled"); | ||
40 | + } else { | ||
41 | + if (!create_element ("videoconvert", &csp2, &error)) | ||
42 | + goto no_elements; | ||
43 | + } | ||
44 | + } | ||
45 | + | ||
46 | /* videoscale is here to correct for the pixel-aspect-ratio for us */ | ||
47 | GST_DEBUG ("creating elements"); | ||
48 | if (!create_element ("appsrc", &src, &error) || | ||
49 | @@ -133,15 +144,42 @@ build_convert_frame_pipeline (GstElement ** src_element, | ||
50 | |||
51 | GST_DEBUG ("adding elements"); | ||
52 | gst_bin_add_many (GST_BIN (pipeline), src, csp, vscale, sink, NULL); | ||
53 | + if (vcrop) | ||
54 | + gst_bin_add_many (GST_BIN (pipeline), vcrop, csp2, NULL); | ||
55 | |||
56 | /* set caps */ | ||
57 | g_object_set (src, "caps", from_caps, NULL); | ||
58 | + if (vcrop) { | ||
59 | + gst_video_info_from_caps (&info, from_caps); | ||
60 | + g_object_set (vcrop, "left", cmeta->x, NULL); | ||
61 | + g_object_set (vcrop, "top", cmeta->y, NULL); | ||
62 | + g_object_set (vcrop, "right", GST_VIDEO_INFO_WIDTH (&info) - cmeta->width, | ||
63 | + NULL); | ||
64 | + g_object_set (vcrop, "bottom", | ||
65 | + GST_VIDEO_INFO_HEIGHT (&info) - cmeta->height, NULL); | ||
66 | + GST_DEBUG ("crop meta [x,y,width,height]: %d %d %d %d", cmeta->x, cmeta->y, | ||
67 | + cmeta->width, cmeta->height); | ||
68 | + } | ||
69 | g_object_set (sink, "caps", to_caps, NULL); | ||
70 | |||
71 | /* FIXME: linking is still way too expensive, profile this properly */ | ||
72 | - GST_DEBUG ("linking src->csp"); | ||
73 | - if (!gst_element_link_pads (src, "src", csp, "sink")) | ||
74 | - goto link_failed; | ||
75 | + if (vcrop) { | ||
76 | + GST_DEBUG ("linking src->csp2"); | ||
77 | + if (!gst_element_link_pads (src, "src", csp2, "sink")) | ||
78 | + goto link_failed; | ||
79 | + | ||
80 | + GST_DEBUG ("linking csp2->vcrop"); | ||
81 | + if (!gst_element_link_pads (csp2, "src", vcrop, "sink")) | ||
82 | + goto link_failed; | ||
83 | + | ||
84 | + GST_DEBUG ("linking vcrop->csp"); | ||
85 | + if (!gst_element_link_pads (vcrop, "src", csp, "sink")) | ||
86 | + goto link_failed; | ||
87 | + } else { | ||
88 | + GST_DEBUG ("linking src->csp"); | ||
89 | + if (!gst_element_link_pads (src, "src", csp, "sink")) | ||
90 | + goto link_failed; | ||
91 | + } | ||
92 | |||
93 | GST_DEBUG ("linking csp->vscale"); | ||
94 | if (!gst_element_link_pads_full (csp, "src", vscale, "sink", | ||
95 | @@ -193,8 +231,12 @@ no_elements: | ||
96 | { | ||
97 | if (src) | ||
98 | gst_object_unref (src); | ||
99 | + if (vcrop) | ||
100 | + gst_object_unref (vcrop); | ||
101 | if (csp) | ||
102 | gst_object_unref (csp); | ||
103 | + if (csp2) | ||
104 | + gst_object_unref (csp2); | ||
105 | if (vscale) | ||
106 | gst_object_unref (vscale); | ||
107 | if (sink) | ||
108 | @@ -209,7 +251,11 @@ no_elements: | ||
109 | no_pipeline: | ||
110 | { | ||
111 | gst_object_unref (src); | ||
112 | + if (vcrop) | ||
113 | + gst_object_unref (vcrop); | ||
114 | gst_object_unref (csp); | ||
115 | + if (csp2) | ||
116 | + gst_object_unref (csp2); | ||
117 | gst_object_unref (vscale); | ||
118 | gst_object_unref (sink); | ||
119 | |||
120 | @@ -282,7 +328,8 @@ gst_video_convert_sample (GstSample * sample, const GstCaps * to_caps, | ||
121 | } | ||
122 | |||
123 | pipeline = | ||
124 | - build_convert_frame_pipeline (&src, &sink, from_caps, to_caps_copy, &err); | ||
125 | + build_convert_frame_pipeline (&src, &sink, from_caps, | ||
126 | + gst_buffer_get_video_crop_meta (buf), to_caps_copy, &err); | ||
127 | if (!pipeline) | ||
128 | goto no_pipeline; | ||
129 | |||
130 | @@ -646,8 +693,8 @@ gst_video_convert_sample_async (GstSample * sample, | ||
131 | } | ||
132 | |||
133 | pipeline = | ||
134 | - build_convert_frame_pipeline (&src, &sink, from_caps, to_caps_copy, | ||
135 | - &error); | ||
136 | + build_convert_frame_pipeline (&src, &sink, from_caps, | ||
137 | + gst_buffer_get_video_crop_meta (buf), to_caps_copy, &error); | ||
138 | if (!pipeline) | ||
139 | goto no_pipeline; | ||
140 | |||
141 | -- | ||
142 | 2.5.0 | ||
143 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch index 325671721d..5341e3cfc6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/encodebin-Need-more-buffers-in-output-queue-for-bett.patch | |||
@@ -17,7 +17,7 @@ diff --git a/gst/encoding/gstencodebin.c b/gst/encoding/gstencodebin.c | |||
17 | index 6728e58..32daae4 100644 | 17 | index 6728e58..32daae4 100644 |
18 | --- a/gst/encoding/gstencodebin.c | 18 | --- a/gst/encoding/gstencodebin.c |
19 | +++ b/gst/encoding/gstencodebin.c | 19 | +++ b/gst/encoding/gstencodebin.c |
20 | @@ -1138,8 +1138,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof, | 20 | @@ -1228,8 +1228,7 @@ _create_stream_group (GstEncodeBin * ebin, GstEncodingProfile * sprof, |
21 | * We only use a 1buffer long queue here, the actual queueing will be done | 21 | * We only use a 1buffer long queue here, the actual queueing will be done |
22 | * in the input queue */ | 22 | * in the input queue */ |
23 | last = sgroup->outqueue = gst_element_factory_make ("queue", NULL); | 23 | last = sgroup->outqueue = gst_element_factory_make ("queue", NULL); |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch index 284abbe94b..c8e6287a55 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/get-caps-from-src-pad-when-query-caps.patch | |||
@@ -19,7 +19,7 @@ new mode 100755 | |||
19 | index 9b6c478..ae2294a | 19 | index 9b6c478..ae2294a |
20 | --- a/gst-libs/gst/tag/gsttagdemux.c | 20 | --- a/gst-libs/gst/tag/gsttagdemux.c |
21 | +++ b/gst-libs/gst/tag/gsttagdemux.c | 21 | +++ b/gst-libs/gst/tag/gsttagdemux.c |
22 | @@ -1708,6 +1708,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) | 22 | @@ -1769,6 +1769,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) |
23 | } | 23 | } |
24 | break; | 24 | break; |
25 | } | 25 | } |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch index 01e944ddd8..413eff0695 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch | |||
@@ -25,8 +25,8 @@ diff --git a/configure.ac b/configure.ac | |||
25 | index 9c52aeb..26cacd6 100644 | 25 | index 9c52aeb..26cacd6 100644 |
26 | --- a/configure.ac | 26 | --- a/configure.ac |
27 | +++ b/configure.ac | 27 | +++ b/configure.ac |
28 | @@ -747,9 +747,16 @@ AC_SUBST(FT2_CFLAGS) | 28 | @@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS) |
29 | AC_SUBST(FT2_LIBS) | 29 | fi dnl of EXT plugins |
30 | 30 | ||
31 | dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** | 31 | dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** |
32 | +AC_ARG_ENABLE([gio_unix_2_0], | 32 | +AC_ARG_ENABLE([gio_unix_2_0], |