mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
gst-plugins-bad1: rebuild rebuild against x265-3.4
also, fix FTBS with latest vulkan
This commit is contained in:
parent
b2af2baec9
commit
b09fde66f2
2 changed files with 49 additions and 1 deletions
|
@ -0,0 +1,48 @@
|
||||||
|
uptream: yes (master)
|
||||||
|
|
||||||
|
From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001
|
||||||
|
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
|
||||||
|
---
|
||||||
|
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 3fec27e4d..c91589d9b 100644
|
||||||
|
--- ext/vulkan/vkerror.c
|
||||||
|
+++ 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)
|
||||||
|
--
|
||||||
|
2.26.2
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'gst-plugins-bad1'
|
# Template file for 'gst-plugins-bad1'
|
||||||
pkgname=gst-plugins-bad1
|
pkgname=gst-plugins-bad1
|
||||||
version=1.16.2
|
version=1.16.2
|
||||||
revision=7
|
revision=8
|
||||||
wrksrc="${pkgname/1/}-${version}"
|
wrksrc="${pkgname/1/}-${version}"
|
||||||
build_helper="gir"
|
build_helper="gir"
|
||||||
build_style=meson
|
build_style=meson
|
||||||
|
|
Loading…
Add table
Reference in a new issue