summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <ionen@gentoo.org>2022-11-06 05:17:13 -0500
committerIonen Wolkens <ionen@gentoo.org>2022-11-06 05:18:05 -0500
commite63fbde53d184b691cd879ab051b42c7e0841575 (patch)
tree328495b8f8b7b2774ac40d7f780d8639e3dc4700
parentdev-python/pythran: Stabilize 0.12.0-r2 ppc64, #879993 (diff)
downloadgentoo-e63fbde5.tar.gz
gentoo-e63fbde5.tar.bz2
gentoo-e63fbde5.zip
media-libs/libplacebo: drop unused patches
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
-rw-r--r--media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch59
-rw-r--r--media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch33
2 files changed, 0 insertions, 92 deletions
diff --git a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
deleted file mode 100644
index 8fa64744fd05..000000000000
--- a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 45e19e7bbbbfceb197d8826c775e16ef536a4565 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Tue, 5 May 2020 00:13:49 +0200
-Subject: [PATCH] vulkan: get rid of deprecated enum members
-
-Maybe we should just get rid of the switch coverage check altogether. I
-wish we could somehow differentiate between enums defined in our code
-and enums defined externally.
-
-Fixes #71.
----
- src/vulkan/context.c | 4 +++-
- src/vulkan/swapchain.c | 7 +------
- 2 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/vulkan/context.c b/src/vulkan/context.c
-index 10928a9..14a57cf 100644
---- a/src/vulkan/context.c
-+++ b/src/vulkan/context.c
-@@ -685,7 +685,6 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx,
- [VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU] = {"virtual", 3},
- [VK_PHYSICAL_DEVICE_TYPE_CPU] = {"software", 2},
- [VK_PHYSICAL_DEVICE_TYPE_OTHER] = {"other", 1},
-- [VK_PHYSICAL_DEVICE_TYPE_END_RANGE+1] = {0},
- };
-
- int best = 0;
-@@ -693,6 +692,9 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx,
- VkPhysicalDeviceProperties props = {0};
- GetPhysicalDeviceProperties(devices[i], &props);
- VkPhysicalDeviceType t = props.deviceType;
-+ if (t > PL_ARRAY_SIZE(types))
-+ continue;
-+
- PL_INFO(vk, " GPU %d: %s (%s)", i, props.deviceName, types[t].name);
-
- if (params->surface) {
-diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c
-index bf6fd54..6bf40dd 100644
---- a/src/vulkan/swapchain.c
-+++ b/src/vulkan/swapchain.c
-@@ -138,13 +138,8 @@ static bool vk_map_color_space(VkColorSpaceKHR space, struct pl_color_space *out
- return false;
- #endif
-
-- // Included to satisfy the switch coverage check
-- case VK_COLOR_SPACE_RANGE_SIZE_KHR:
-- case VK_COLOR_SPACE_MAX_ENUM_KHR:
-- break;
-+ default: return false;
- }
--
-- return false;
- }
-
- static bool pick_surf_format(const struct pl_gpu *gpu, const struct vk_ctx *vk,
---
-2.27.0
-
diff --git a/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
deleted file mode 100644
index 15bac9718222..000000000000
--- a/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://bugs.gentoo.org/789498
-
-From ac44e8f14acbfd2810c46e07e38466673f0ad7e0 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Tue, 23 Mar 2021 11:57:13 +0100
-Subject: [PATCH] vulkan: blacklist FUCHSIA strings
-
-Maybe one day we'll actually figure out how to make this python script
-exclude platform-specific stuff in a way that doesn't rely on hardcoding
-a list of strings to blacklist.
-
-One day.
-
-Fixes https://code.videolan.org/videolan/libplacebo/-/issues/131
----
- src/vulkan/utils_gen.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py
-index a4565f3..53195f2 100644
---- a/src/vulkan/utils_gen.py
-+++ b/src/vulkan/utils_gen.py
-@@ -155,7 +155,7 @@ def get_vkstructs(registry):
- # Strings for platform-specific crap we want to blacklist as they will
- # most likely cause build failures
- blacklist_strs = [
-- 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP'
-+ 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA',
- ]
-
- if any([ str in e.attrib['name'] for str in blacklist_strs ]):
---
-GitLab