1 |
commit: e63fbde53d184b691cd879ab051b42c7e0841575 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Nov 6 10:17:13 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Nov 6 10:18:05 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e63fbde5 |
7 |
|
8 |
media-libs/libplacebo: drop unused patches |
9 |
|
10 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
11 |
|
12 |
...43.0-vulkan-headers-1.2.140-compatibility.patch | 59 ---------------------- |
13 |
.../libplacebo-2.72.0-fix-vulkan-undeclared.patch | 33 ------------ |
14 |
2 files changed, 92 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index 8fa64744fd05..000000000000 |
19 |
--- a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch |
20 |
+++ /dev/null |
21 |
@@ -1,59 +0,0 @@ |
22 |
-From 45e19e7bbbbfceb197d8826c775e16ef536a4565 Mon Sep 17 00:00:00 2001 |
23 |
-From: Niklas Haas <git@×××××.xyz> |
24 |
-Date: Tue, 5 May 2020 00:13:49 +0200 |
25 |
-Subject: [PATCH] vulkan: get rid of deprecated enum members |
26 |
- |
27 |
-Maybe we should just get rid of the switch coverage check altogether. I |
28 |
-wish we could somehow differentiate between enums defined in our code |
29 |
-and enums defined externally. |
30 |
- |
31 |
-Fixes #71. |
32 |
---- |
33 |
- src/vulkan/context.c | 4 +++- |
34 |
- src/vulkan/swapchain.c | 7 +------ |
35 |
- 2 files changed, 4 insertions(+), 7 deletions(-) |
36 |
- |
37 |
-diff --git a/src/vulkan/context.c b/src/vulkan/context.c |
38 |
-index 10928a9..14a57cf 100644 |
39 |
---- a/src/vulkan/context.c |
40 |
-+++ b/src/vulkan/context.c |
41 |
-@@ -685,7 +685,6 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx, |
42 |
- [VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU] = {"virtual", 3}, |
43 |
- [VK_PHYSICAL_DEVICE_TYPE_CPU] = {"software", 2}, |
44 |
- [VK_PHYSICAL_DEVICE_TYPE_OTHER] = {"other", 1}, |
45 |
-- [VK_PHYSICAL_DEVICE_TYPE_END_RANGE+1] = {0}, |
46 |
- }; |
47 |
- |
48 |
- int best = 0; |
49 |
-@@ -693,6 +692,9 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx, |
50 |
- VkPhysicalDeviceProperties props = {0}; |
51 |
- GetPhysicalDeviceProperties(devices[i], &props); |
52 |
- VkPhysicalDeviceType t = props.deviceType; |
53 |
-+ if (t > PL_ARRAY_SIZE(types)) |
54 |
-+ continue; |
55 |
-+ |
56 |
- PL_INFO(vk, " GPU %d: %s (%s)", i, props.deviceName, types[t].name); |
57 |
- |
58 |
- if (params->surface) { |
59 |
-diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c |
60 |
-index bf6fd54..6bf40dd 100644 |
61 |
---- a/src/vulkan/swapchain.c |
62 |
-+++ b/src/vulkan/swapchain.c |
63 |
-@@ -138,13 +138,8 @@ static bool vk_map_color_space(VkColorSpaceKHR space, struct pl_color_space *out |
64 |
- return false; |
65 |
- #endif |
66 |
- |
67 |
-- // Included to satisfy the switch coverage check |
68 |
-- case VK_COLOR_SPACE_RANGE_SIZE_KHR: |
69 |
-- case VK_COLOR_SPACE_MAX_ENUM_KHR: |
70 |
-- break; |
71 |
-+ default: return false; |
72 |
- } |
73 |
-- |
74 |
-- return false; |
75 |
- } |
76 |
- |
77 |
- static bool pick_surf_format(const struct pl_gpu *gpu, const struct vk_ctx *vk, |
78 |
--- |
79 |
-2.27.0 |
80 |
- |
81 |
|
82 |
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 |
83 |
deleted file mode 100644 |
84 |
index 15bac9718222..000000000000 |
85 |
--- a/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch |
86 |
+++ /dev/null |
87 |
@@ -1,33 +0,0 @@ |
88 |
-https://bugs.gentoo.org/789498 |
89 |
- |
90 |
-From ac44e8f14acbfd2810c46e07e38466673f0ad7e0 Mon Sep 17 00:00:00 2001 |
91 |
-From: Niklas Haas <git@×××××.xyz> |
92 |
-Date: Tue, 23 Mar 2021 11:57:13 +0100 |
93 |
-Subject: [PATCH] vulkan: blacklist FUCHSIA strings |
94 |
- |
95 |
-Maybe one day we'll actually figure out how to make this python script |
96 |
-exclude platform-specific stuff in a way that doesn't rely on hardcoding |
97 |
-a list of strings to blacklist. |
98 |
- |
99 |
-One day. |
100 |
- |
101 |
-Fixes https://code.videolan.org/videolan/libplacebo/-/issues/131 |
102 |
---- |
103 |
- src/vulkan/utils_gen.py | 2 +- |
104 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
105 |
- |
106 |
-diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py |
107 |
-index a4565f3..53195f2 100644 |
108 |
---- a/src/vulkan/utils_gen.py |
109 |
-+++ b/src/vulkan/utils_gen.py |
110 |
-@@ -155,7 +155,7 @@ def get_vkstructs(registry): |
111 |
- # Strings for platform-specific crap we want to blacklist as they will |
112 |
- # most likely cause build failures |
113 |
- blacklist_strs = [ |
114 |
-- 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP' |
115 |
-+ 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA', |
116 |
- ] |
117 |
- |
118 |
- if any([ str in e.attrib['name'] for str in blacklist_strs ]): |
119 |
--- |
120 |
-GitLab |