[ptxdist] [PATCH] gst-plugins-bad1: fix build against vulkan >= 1.2.140

[ptxdist] [PATCH] gst-plugins-bad1: fix build against vulkan >= 1.2.140

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...an-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch | 44 +++++++++++++++++++
 patches/gst-plugins-bad-1.16.2/series         |  3 +-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 patches/gst-plugins-bad-1.16.2/0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch

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
new file mode 100644
index 000000000000..a2ba1bffb708
--- /dev/null
+++ b/patches/gst-plugins-bad-1.16.2/0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
@@ -0,0 +1,44 @@
+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
index c1929a0c87f8..07302aeaecd3 100644
--- a/patches/gst-plugins-bad-1.16.2/series
+++ b/patches/gst-plugins-bad-1.16.2/series
@@ -1,4 +1,5 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
-# c50daa57270463847718e2263e04d262  - git-ptx-patches magic
+0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
+# 47a4b84583f06fb864549e205e25171d  - git-ptx-patches magic
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] gst-plugins-bad1: fix build against vulkan >= 1.2.140

[Michael Olbrich]

Thanks, applied as 9c99fa48f6676ba2fcd3f51a098fc22797ffc965.

Michael

[sent from post-receive hook]

On Sat, 20 Jun 2020 00:04:04 +0200, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20200616083419.12703-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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
> new file mode 100644
> index 000000000000..a2ba1bffb708
> --- /dev/null
> +++ b/patches/gst-plugins-bad-1.16.2/0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
> @@ -0,0 +1,44 @@
> +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
> index c1929a0c87f8..07302aeaecd3 100644
> --- a/patches/gst-plugins-bad-1.16.2/series
> +++ b/patches/gst-plugins-bad-1.16.2/series
> @@ -1,4 +1,5 @@
>  # generated by git-ptx-patches
>  #tag:base --start-number 1
>  0001-meson-build-gir-even-when-cross-compiling-if-introsp.patch
> -# c50daa57270463847718e2263e04d262  - git-ptx-patches magic
> +0002-vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch
> +# 47a4b84583f06fb864549e205e25171d  - git-ptx-patches magic

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de