gentoo auto-resync : 03:09:2022 - 22:19:54

5 files changed, 37 insertions, 5 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index ed2b6fc5ce94..cb134eb02937 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,5 +1,6 @@
 AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6
 AUX libplacebo-2.72.0-fix-vulkan-undeclared.patch 1143 BLAKE2B 54d69a48b1f1fe02c5f9ea5210cd0ee4016d4284c7995ec8b672ab932ddf9fc39e54870cc56ca9208521ce9ea6daa6d464161b2a3ea581506869dc38d94c1786 SHA512 1de6c8bb3eb4945eaa64a90f13aef8a0f069462a741f9f2656579a28ee80850639a94e03b2d4d1c6a045c9a12b74f52e8d6ba07e7634bef36b48ed34a516864b
+AUX libplacebo-2.72.2-fix-vulkan-undeclared.patch 963 BLAKE2B 3b6944af02eb6078dc5224309e3af4b65a4681e29701622e95166a4156d3eecd6e671fc2b4acec633340c0582afc96419b2a7a170de1b7976b04c880a1d4672a SHA512 4154e1ec3f06b08628444ba36fcdd4bac48b06ef8d0caf689a2fe3fb3e48ed7d1e4cc3f568401025174235e1ce1359eb4f010047aee99cfe7e0fa20c4cfa01c5
 DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
 DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb
 DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
@@ -7,8 +8,8 @@ DIST libplacebo-v3.120.3.tar.gz 523749 BLAKE2B 6192570dba8de6e0bb98ccf3f0e4f13c0
 DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525
 EBUILD libplacebo-2.43.0.ebuild 1462 BLAKE2B f040787c2e5848e5be23c77af1af76e68e2ac0e85bd178e00621e6c9fde8a69b01ba681e350d3d783a5812188ede1ea58e209be899b7a6b19c876fc7f5822118 SHA512 990a0551961a89f335e437ce984ffc0047816d655a7ba6be8202c6d791b840840aba63352ff6fd2af5d4cc41a36eb7ace63e51bb03019621768602154c5486b8
 EBUILD libplacebo-2.43.1.ebuild 1478 BLAKE2B 5184f42cdda1740d9b2fb33e05406517d076ad7d557da6c74b580200863fdc340cf208f716da38b172a4f06f9fb74fcc461afcd25ac886a10b398816f96f0689 SHA512 bddeac21c3635c87c7079477c02df39586e6a9604ac65a69b12714bbcf72373b1a9999a3b8bd1cdccff4f42a2c1c62757714162a97cc381419a481626834114d
-EBUILD libplacebo-2.72.2.ebuild 1854 BLAKE2B 707afa5008705ac6e26a4773b8af28e774ce1d43c3d5c6490d51ca01cec05b034dc0429dbb82a5bd14c7fad05e6633031bac645464afa29edf093d444368448f SHA512 3e2c29c2a24db7cdfa43c38c71e399774886359adfaa52ac8988334a3844c6ee519248a945ba9ebd39a93c045d4e3e8cd9e139b37fc299ca93ed3828587ad842
-EBUILD libplacebo-3.120.3.ebuild 2031 BLAKE2B 997411cc63ea1bf8b4b4b3885528f9c0a5ed8051bb544c2994d81c003c3bd75396d1232feebd7931e9fb46539f0fffcd6d00c8a7116f344ae2204eb816ae201e SHA512 dc07f76ded931f7c1052a0e334b0165d378af3d9355d325e37049ba2e5962ae1ae8874555fd3e5d15a3bbc8c1e272c81b45803a5ba870692506a62d014c39fbe
-EBUILD libplacebo-4.192.1.ebuild 1782 BLAKE2B 294ecde7ae4741a3fcc591ec4ab179eaa0d2dd8205b9f61548d2b8348c862788f163b1fc91076dcf46f4c7e62dc70f2bb343b00f938b8acba00ab14dcd658b59 SHA512 471d3582b501b46fa44627c3e92566b23fed5844801e8ca0893dec6d1811e5081a166eb53a50b08f2cccba951ae4f1c585e051c6d8024271f5044468af818f00
+EBUILD libplacebo-2.72.2.ebuild 1913 BLAKE2B 24ecd09da4413e47b0a66ffa2438db9a89730e3177e1ffc2a4c26ca857c01b8348d574f8d5ec29bcecba2e24fe90c2cb2c106cf2f78b6393643236da7208f1a3 SHA512 846510400238b4458948b72af3ab0200bb55fc5de80526e954556aade3662cb16678482784a79c01c0a92638bdcea96d88286869cba1895018c46d86b2bc743d
+EBUILD libplacebo-3.120.3.ebuild 2104 BLAKE2B a79fb7162b463ee5062d6c2c2f4da351f7d8ffca72d52a78af157b653c37fd0573eb9c5839aed1fdd3033cf6e70f6899e4e07b8b824b91c59db5b67ee039b972 SHA512 f758ecf3194ea201aae9e13671f04f018a09c032d0e17c4c534bbba952d947e5d7869a1a77d8a89c2edb42ca221cf44282c057a3c2016171b8a1fa5929585c6a
+EBUILD libplacebo-4.192.1.ebuild 1855 BLAKE2B 34d95e61360546e2ea02ea07fde6dd4456658a6028de801c19fef9ebf477a863db26001520534e09af0a88d0fde860cc7632df2aafe049709ca6632b91540ad1 SHA512 2773c52dbffeb4901e5c13bf4832311a7605d7103acbafb05b739c0f22c17610d107999f5d0806be46b7f869415a0cef284f6b087e56f8611482cf8212f3ea25
 EBUILD libplacebo-9999.ebuild 1825 BLAKE2B 5d9b974d7f2832a2572cf52e425c11965db0d921fb8d72549bd98fcbfcbbb69d8b52e2062961c736b4579eac4090d7c703b7bf45dcc70857bf79278cf85a814e SHA512 32d303d3505e725288afa53b814deb30bbc1a2a09270c7e07cb7201aa1b54304c4b381f1f0f5a249adf6a4c8fa736aa9653102061424a11c0e6bb1fe48a39024
 MISC metadata.xml 600 BLAKE2B 64be4c9fc7d6f967c7439d374ab5a8cb499066d9a6216ee14161db98359e69d6cfe4a57eafc18ac3f7e414234d4987ef0cb812e01552810ea4c6f29e06e42498 SHA512 2b62cdec3e8ca9ddc669cd0dad10888ec394dba889f4547b81e8a48603ae3657828f4d62a6aa45d3f8bf53c360b0870c76b259e93f0242c0d332e978091bd5b4
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 <git@haasn.dev>
+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}]"
 }