summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-05-29 15:52:29 +0000
committerSam James <sam@gentoo.org>2021-05-29 15:52:58 +0000
commit271f88948e1c76d54cb297f9904b904d44f40500 (patch)
treeb508936ede95bf9ce799950c37188e00d6763da4
parentsci-libs/cdf: add version 3.8.0 (diff)
downloadgentoo-271f88948e1c76d54cb297f9904b904d44f40500.tar.gz
gentoo-271f88948e1c76d54cb297f9904b904d44f40500.tar.bz2
gentoo-271f88948e1c76d54cb297f9904b904d44f40500.zip
media-libs/libplacebo: add Vulkan compile patch
Closes: https://bugs.gentoo.org/789498 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch33
-rw-r--r--media-libs/libplacebo/libplacebo-2.72.2.ebuild7
2 files changed, 39 insertions, 1 deletions
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
new file mode 100644
index 000000000000..15bac9718222
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-2.72.0-fix-vulkan-undeclared.patch
@@ -0,0 +1,33 @@
+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
diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
index 6dfc04687ed1..a516eb796277 100644
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,6 +42,11 @@ BDEPEND="virtual/pkgconfig
$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
)"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.72.0-fix-vulkan-undeclared.patch
+)
+
python_check_deps() {
has_version -b "dev-python/mako[${PYTHON_USEDEP}]"
}