diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-05-25 14:20:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-18 11:07:58 +0100 |
commit | ae6734b1f42cbbb61988dd0318c340bc0b050920 (patch) | |
tree | c3c7230a0daba8c03ab589496d42cbf19b370347 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch | |
parent | c9bd85d50385cfa9a18714829a1ed32ed0cf97e4 (diff) | |
download | poky-ae6734b1f42cbbb61988dd0318c340bc0b050920.tar.gz |
gstreamer1.0-plugins-base: upgrade 1.14.0 -> 1.14.1
Bugfixes only. Please see:
https://gstreamer.freedesktop.org/releases/1.14/#1.14.1
Remove a backport patch and rebase one other patch.
(From OE-Core rev: aea86b875ebf9fbc767d231f87bd33aa9ab18efa)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch deleted file mode 100644 index eba72db96b..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From 1a7c457cf209e853148865f196edc12ba8d5c10c Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> | ||
3 | Date: Tue, 27 Mar 2018 10:43:16 +0100 | ||
4 | Subject: [PATCH] gl: pick up GstVideo-1.0.gir from local build dir | ||
5 | |||
6 | https://bugzilla.gnome.org/show_bug.cgi?id=794708 | ||
7 | |||
8 | Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21] | ||
9 | |||
10 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
11 | |||
12 | --- | ||
13 | gst-libs/gst/gl/Makefile.am | 5 +++-- | ||
14 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am | ||
17 | index fc15a6d..ab6cc55 100644 | ||
18 | --- a/gst-libs/gst/gl/Makefile.am | ||
19 | +++ b/gst-libs/gst/gl/Makefile.am | ||
20 | @@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ | ||
21 | -I$(top_builddir)/gst-libs \ | ||
22 | $(GST_PLUGINS_BASE_CFLAGS) \ | ||
23 | $(GL_CFLAGS) \ | ||
24 | + --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ | ||
25 | --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
26 | --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
27 | - --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ | ||
28 | + --library-path="$(top_builddir)/gst-libs/gst/video/" \ | ||
29 | --library=libgstgl-@GST_API_VERSION@.la \ | ||
30 | --include=Gst-@GST_API_VERSION@ \ | ||
31 | --include=GstBase-@GST_API_VERSION@ \ | ||
32 | @@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
33 | $(INTROSPECTION_COMPILER) \ | ||
34 | --includedir=$(srcdir) \ | ||
35 | --includedir=$(builddir) \ | ||
36 | + --includedir="$(top_builddir)/gst-libs/gst/video/" \ | ||
37 | --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
38 | --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
39 | - --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ | ||
40 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
41 | |||
42 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||