gentoo resync : 31.05.2021

3 files changed, 40 insertions, 2 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 844feceb2fc1..cd919822f719 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,11 +1,12 @@
 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
 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
 DIST libplacebo-v3.120.3.tar.gz 523749 BLAKE2B 6192570dba8de6e0bb98ccf3f0e4f13c01a27c5f97873ff0e5e3212d9b7cdebd98cce3d5ee5364ca8a585ec2a16d0bafc5a863ed35f6f225d86a4410b92edfd3 SHA512 6a2d3c6c053edc3a912a46f9c16d226d83c6f8880714f0b20a8b9417889616e4c1d4d41b8935b898cc580dc3b480ce974bb3921162165f0774ea91be1dfff520
 EBUILD libplacebo-2.43.0.ebuild 1564 BLAKE2B 6ad120ec3ff0fadb1619cfe39a9495e03c3dfce8b2aac9b06b18331355b16ff0a4f98708d337746fde1911947c1d61e55d5ff2358f8757be12c29eeee7607aa3 SHA512 b2ee3a9eaf533fe5d284ec3243d06c9871b526e8f82c11f58de412662703966e014cdeba3294b22a328355348fcac839a68f04c1d8da004a64b18c0af423487f
 EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
-EBUILD libplacebo-2.72.2.ebuild 1887 BLAKE2B 33b04aca370df443ea0be685beac68a201595685edb9298bc8f48540b966ad891485f11e3622d96d28c09e93dbb949aae2588d4763e820d67941e0e327041b42 SHA512 2c9fafa906884c9408a36cbd10e12ada226704431c795a2afdc0e1a122e8b2b273770e5d7181efc38beb0bec45d5e19457180e44b18242d28df2c311f0938fa7
+EBUILD libplacebo-2.72.2.ebuild 1956 BLAKE2B 6a0d3212b34738bd105298d61d85a914fbb823a02a5b83e6f3af3fd379f564d1e94b1744059880eb5011eaf34dbcabf06fff0900862952b0ef8ab7c2624e65fd SHA512 3e75fd49e50863a615e6b92c7ef0fe6212960ec4e9565eac5e95fa7223311a421582ab4d0e8f237dc6cbd57a12bb71603a66859838830c297ec1afdbb44535a9
 EBUILD libplacebo-3.120.3.ebuild 1887 BLAKE2B 918c0f6525ff7dbe46422e59f33f8d7339abb01668b7ea83f0aa0a366775a404c3b13704886de7aed923342b8bb974aa77c28ca8a3c26e3e0dda55292d8a3e09 SHA512 0afaf40e5e57d766d1aba53bfddd8affc48d064e56d82a0c27a6023a8111c1427b065452b6fe543fdec8f9c6eaefe85880b6bbf8ac8723ae7c07cc1ffecba689
 EBUILD libplacebo-9999.ebuild 1922 BLAKE2B 62d626bcc7f770dba9c265ccadcebae2bd4151985fcb3536c5926ef480efc9d9c414b22276cb0467149921eef0acc7ee42457de39c54acc17b520bf55306769f SHA512 9a372a4099483519cac4d63a4a9146fe201660ab11002242cd03e2499c7f219d726f2fff940c4096c9e5b7d61af6d9aebd64a322461ca7389d82fd0413990147
 MISC metadata.xml 599 BLAKE2B 1eaf6838d56d66603411785c54a4f7aad9152cc06e57152639bfb8cb0e29f55f68a0d6df01958cc67ecef9dd1ae84cbb33f83952820f8864f63e7e31975c8911 SHA512 ec68741bb3770de0166d12a3717d97a4ddce3b6cd811ed7b7074a78ee80b8984b5c59f4807c0f984d0d3fd6a5501b482c7c351b9a9541ff1e37fbf99c718ce6b
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..145c4fe558dc 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,10 @@ 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}]"
 }