diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-05-09 12:01:38 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-11 07:49:37 +0100 |
commit | 2f88de553e92ff8be6dd702b4441ada7987c734a (patch) | |
tree | 53479de0cec00eb7df934f35e4a4737b282512e4 /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch | |
parent | b01fd6106adf844afd3531aaffdec347013cc32b (diff) | |
download | poky-2f88de553e92ff8be6dd702b4441ada7987c734a.tar.gz |
gst-plugins-bad: upgrade 1.12.4 -> 1.14.0
* For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/
* gst-gl has moved to -good and direct dependencies aren't required.
* Remove vulkan patches that have been upstreamed.
* Remove obsolete PACKAGECONFIGs.
(From OE-Core rev: a8667b7f95d62bd09a1a9ed9575327a22e1c7f59)
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-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch deleted file mode 100644 index 0df145dd25..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From c23e1dc22deb495561cffb877edb2746b740a1fa Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Wed, 5 Jul 2017 11:07:05 +0300 | ||
4 | Subject: [PATCH 2/2] vulkan: Use the generated version of vkconfig.h | ||
5 | |||
6 | Build fails in ext/vulkan/xcb and ext/vulkan/wayland when: | ||
7 | * building from tarball | ||
8 | * building out-of-tree | ||
9 | * Only one WSI integration (xcb or wayland) is enabled by configure.ac | ||
10 | This is because vkconfig.h from source directory gets used instead | ||
11 | of the generated one. | ||
12 | |||
13 | Add the correct build directory to "-I". Use angle bracket | ||
14 | include in vkapi.h so that it actually looks in the include search | ||
15 | path instead of defaulting to the same (source tree) directory. | ||
16 | |||
17 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
18 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539] | ||
19 | --- | ||
20 | ext/vulkan/vkapi.h | 2 +- | ||
21 | ext/vulkan/wayland/Makefile.am | 1 + | ||
22 | ext/vulkan/xcb/Makefile.am | 1 + | ||
23 | 3 files changed, 3 insertions(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/ext/vulkan/vkapi.h b/ext/vulkan/vkapi.h | ||
26 | index e9c23aa92..a37c29d0f 100644 | ||
27 | --- a/ext/vulkan/vkapi.h | ||
28 | +++ b/ext/vulkan/vkapi.h | ||
29 | @@ -23,7 +23,7 @@ | ||
30 | |||
31 | #define VK_PROTOTYPES | ||
32 | |||
33 | -#include "vkconfig.h" | ||
34 | +#include <vkconfig.h> | ||
35 | #include "vk_fwd.h" | ||
36 | #include "vkmacros.h" | ||
37 | |||
38 | diff --git a/ext/vulkan/wayland/Makefile.am b/ext/vulkan/wayland/Makefile.am | ||
39 | index f92d85e2c..10cfb70e6 100644 | ||
40 | --- a/ext/vulkan/wayland/Makefile.am | ||
41 | +++ b/ext/vulkan/wayland/Makefile.am | ||
42 | @@ -14,6 +14,7 @@ noinst_HEADERS = \ | ||
43 | |||
44 | libgstvulkan_wayland_la_CFLAGS = \ | ||
45 | -I$(top_srcdir)/gst-libs \ | ||
46 | + -I$(top_builddir)/ext/vulkan \ | ||
47 | -I$(top_srcdir)/ext/vulkan \ | ||
48 | -I$(top_builddir)/gst-libs \ | ||
49 | $(GST_PLUGINS_BASE_CFLAGS) \ | ||
50 | diff --git a/ext/vulkan/xcb/Makefile.am b/ext/vulkan/xcb/Makefile.am | ||
51 | index 7debcff9e..b5103551b 100644 | ||
52 | --- a/ext/vulkan/xcb/Makefile.am | ||
53 | +++ b/ext/vulkan/xcb/Makefile.am | ||
54 | @@ -14,6 +14,7 @@ noinst_HEADERS = \ | ||
55 | |||
56 | libgstvulkan_xcb_la_CFLAGS = \ | ||
57 | -I$(top_srcdir)/gst-libs \ | ||
58 | + -I$(top_builddir)/ext/vulkan \ | ||
59 | -I$(top_srcdir)/ext/vulkan \ | ||
60 | -I$(top_builddir)/gst-libs \ | ||
61 | $(GST_PLUGINS_BASE_CFLAGS) \ | ||
62 | -- | ||
63 | 2.13.2 | ||
64 | |||