1 |
commit: 271f88948e1c76d54cb297f9904b904d44f40500 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 29 15:52:29 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 29 15:52:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=271f8894 |
7 |
|
8 |
media-libs/libplacebo: add Vulkan compile patch |
9 |
|
10 |
Closes: https://bugs.gentoo.org/789498 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../libplacebo-2.72.0-fix-vulkan-undeclared.patch | 33 ++++++++++++++++++++++ |
14 |
media-libs/libplacebo/libplacebo-2.72.2.ebuild | 7 ++++- |
15 |
2 files changed, 39 insertions(+), 1 deletion(-) |
16 |
|
17 |
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 |
18 |
new file mode 100644 |
19 |
index 00000000000..15bac971822 |
20 |
--- /dev/null |
21 |
+++ b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch |
22 |
@@ -0,0 +1,33 @@ |
23 |
+https://bugs.gentoo.org/789498 |
24 |
+ |
25 |
+From ac44e8f14acbfd2810c46e07e38466673f0ad7e0 Mon Sep 17 00:00:00 2001 |
26 |
+From: Niklas Haas <git@×××××.xyz> |
27 |
+Date: Tue, 23 Mar 2021 11:57:13 +0100 |
28 |
+Subject: [PATCH] vulkan: blacklist FUCHSIA strings |
29 |
+ |
30 |
+Maybe one day we'll actually figure out how to make this python script |
31 |
+exclude platform-specific stuff in a way that doesn't rely on hardcoding |
32 |
+a list of strings to blacklist. |
33 |
+ |
34 |
+One day. |
35 |
+ |
36 |
+Fixes https://code.videolan.org/videolan/libplacebo/-/issues/131 |
37 |
+--- |
38 |
+ src/vulkan/utils_gen.py | 2 +- |
39 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
40 |
+ |
41 |
+diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py |
42 |
+index a4565f3..53195f2 100644 |
43 |
+--- a/src/vulkan/utils_gen.py |
44 |
++++ b/src/vulkan/utils_gen.py |
45 |
+@@ -155,7 +155,7 @@ def get_vkstructs(registry): |
46 |
+ # Strings for platform-specific crap we want to blacklist as they will |
47 |
+ # most likely cause build failures |
48 |
+ blacklist_strs = [ |
49 |
+- 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP' |
50 |
++ 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA', |
51 |
+ ] |
52 |
+ |
53 |
+ if any([ str in e.attrib['name'] for str in blacklist_strs ]): |
54 |
+-- |
55 |
+GitLab |
56 |
|
57 |
diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-2.72.2.ebuild |
58 |
index 6dfc04687ed..a516eb79627 100644 |
59 |
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild |
60 |
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild |
61 |
@@ -1,4 +1,4 @@ |
62 |
-# Copyright 1999-2020 Gentoo Authors |
63 |
+# Copyright 1999-2021 Gentoo Authors |
64 |
# Distributed under the terms of the GNU General Public License v2 |
65 |
|
66 |
EAPI=7 |
67 |
@@ -42,6 +42,11 @@ BDEPEND="virtual/pkgconfig |
68 |
$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') |
69 |
)" |
70 |
|
71 |
+ |
72 |
+PATCHES=( |
73 |
+ "${FILESDIR}"/${PN}-2.72.0-fix-vulkan-undeclared.patch |
74 |
+) |
75 |
+ |
76 |
python_check_deps() { |
77 |
has_version -b "dev-python/mako[${PYTHON_USEDEP}]" |
78 |
} |