commit: cbe8cf7aba85fe8124c9b118b5198888e602ede9 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Sat Sep 3 20:27:27 2022 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Sat Sep 3 20:27:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbe8cf7a
media-libs/libplacebo: fix build with vulkan-headers-1.3.217 Closes: https://bugs.gentoo.org/868297 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> .../libplacebo-2.72.2-fix-vulkan-undeclared.patch | 26 ++++++++++++++++++++++ media-libs/libplacebo/libplacebo-2.72.2.ebuild | 5 +++-- media-libs/libplacebo/libplacebo-3.120.3.ebuild | 2 ++ media-libs/libplacebo/libplacebo-4.192.1.ebuild | 2 ++ 4 files changed, 33 insertions(+), 2 deletions(-) diff --git a/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch b/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch new file mode 100644 index 000000000000..beb40dcf7895 --- /dev/null +++ b/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch @@ -0,0 +1,26 @@ +From db794a2fcc8214624c950752b04f6c23f8fc567d Mon Sep 17 00:00:00 2001 +From: Niklas Haas <[email protected]> +Date: Thu, 9 Jun 2022 21:32:36 +0200 +Subject: [PATCH] vulkan: blacklist metal structs from utils_gen.py + +Fixes https://code.videolan.org/videolan/libplacebo/-/issues/201 +--- + 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 da565d45..7c0dad37 100644 +--- a/src/vulkan/utils_gen.py ++++ b/src/vulkan/utils_gen.py +@@ -158,7 +158,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', 'FUCHSIA', ++ 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA', 'Metal', + ] + + 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 3aee3073d9fc..12deb1498de2 100644 --- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild +++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 PYTHON_REQ_USE="xml" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"; @@ -44,6 +44,7 @@ BDEPEND="virtual/pkgconfig PATCHES=( "${FILESDIR}"/${PN}-2.72.0-fix-vulkan-undeclared.patch + "${FILESDIR}"/${PN}-2.72.2-fix-vulkan-undeclared.patch ) python_check_deps() { diff --git a/media-libs/libplacebo/libplacebo-3.120.3.ebuild b/media-libs/libplacebo/libplacebo-3.120.3.ebuild index dad6f376d93f..2480715bf384 100644 --- a/media-libs/libplacebo/libplacebo-3.120.3.ebuild +++ b/media-libs/libplacebo/libplacebo-3.120.3.ebuild @@ -42,6 +42,8 @@ BDEPEND="virtual/pkgconfig $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') )" +PATCHES=( "${FILESDIR}"/libplacebo-2.72.2-fix-vulkan-undeclared.patch ) + python_check_deps() { has_version -b "dev-python/mako[${PYTHON_USEDEP}]" } diff --git a/media-libs/libplacebo/libplacebo-4.192.1.ebuild b/media-libs/libplacebo/libplacebo-4.192.1.ebuild index b147ffadfcbb..1f996e6c78c2 100644 --- a/media-libs/libplacebo/libplacebo-4.192.1.ebuild +++ b/media-libs/libplacebo/libplacebo-4.192.1.ebuild @@ -42,6 +42,8 @@ BDEPEND="virtual/pkgconfig $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') )" +PATCHES=( "${FILESDIR}"/libplacebo-2.72.2-fix-vulkan-undeclared.patch ) + python_check_deps() { has_version -b "dev-python/mako[${PYTHON_USEDEP}]" }
