diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2020-09-10 11:50:27 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-09-11 12:18:18 +0200 |
commit | 20b636a6ec95b2f7cee7df7c9cbc6529af6e352c (patch) | |
tree | 0258ca260c09aa39da44a9349bf22d487bd367a9 /patches | |
parent | 49254b41f397b66c2540c35f376e4679aba5695d (diff) | |
download | ptxdist-20b636a6ec95b2f7cee7df7c9cbc6529af6e352c.tar.gz ptxdist-20b636a6ec95b2f7cee7df7c9cbc6529af6e352c.tar.xz |
gst-plugins-bad1: version bump 1.16.2 -> 1.18.0
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Message-Id: <20200910095034.655-4-p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
3 files changed, 0 insertions, 77 deletions
diff --git a/patches/gst-plugins-bad-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch b/patches/gst-plugins-bad-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch deleted file mode 100644 index 37f9b4b04..000000000 --- a/patches/gst-plugins-bad-1.16.2/0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Fri, 18 Oct 2019 00:39:12 +0100 -Subject: [PATCH] meson: build gir even when cross-compiling if introspection - was enabled explicitly - -This can be made to work in certain circumstances when -cross-compiling, so default to not building g-i stuff -when cross-compiling, but allow it if introspection was -enabled explicitly via -Dintrospection=enabled. - -See gstreamer/gstreamer#454 and gstreamer/gstreamer#381. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 8421811ccf81..aa79794680c7 100644 ---- a/meson.build -+++ b/meson.build -@@ -405,7 +405,7 @@ python3 = import('python').find_installation() - - gir = find_program('g-ir-scanner', required : get_option('introspection')) - gnome = import('gnome') --build_gir = gir.found() and not meson.is_cross_build() -+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) - gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ - 'g_setenv("GST_REGISTRY_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ - 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ diff --git a/patches/gst-plugins-bad-1.16.2/0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch b/patches/gst-plugins-bad-1.16.2/0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch deleted file mode 100644 index a2ba1bffb..000000000 --- a/patches/gst-plugins-bad-1.16.2/0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: "Jan Alexander Steffens (heftig)" <jan.steffens@ltnglobal.com> -Date: Sat, 9 May 2020 19:59:46 +0200 -Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE - -This was removed in Vulkan 1.2.140. - -> Shortly after 2020-04-24, we will be removing the automatically -> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE` -> tokens from the Vulkan headers. These tokens are currently defined for -> some enumerated types, but are explicitly not part of the Vulkan API. -> They existed only to support some Vulkan implementation internals, -> which no longer require them. We will be accepting comments on this -> topic in [#1230], but we strongly suggest any external projects using -> these tokens immediately migrate away from them. - -[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230 - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1255> ---- - ext/vulkan/vkerror.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c -index 3fec27e4d866..c91589d9b4a2 100644 ---- a/ext/vulkan/vkerror.c -+++ b/ext/vulkan/vkerror.c -@@ -27,7 +27,7 @@ - #include "vkerror.h" - - /* *INDENT-OFF* */ --static const struct -+static const struct - { - VkResult result; - const char *str; -@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result) - - if (result >= 0) - return NULL; -- if (result < VK_RESULT_BEGIN_RANGE) -- return "Unknown Error"; - - for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) { - if (result == vk_result_string_map[i].result) diff --git a/patches/gst-plugins-bad-1.16.2/series b/patches/gst-plugins-bad-1.16.2/series deleted file mode 100644 index 07302aeae..000000000 --- a/patches/gst-plugins-bad-1.16.2/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch -0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch -# 47a4b84583f06fb864549e205e25171d - git-ptx-patches magic |