gentoo auto-resync : 19:11:2022 - 19:01:00

3 files changed, 11 insertions, 17 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 9b4222e0dd7e..d5816ce01a87 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -3,10 +3,10 @@ AUX libplacebo-4.192.1-python-executable.patch 266 BLAKE2B 23146785355b86440974d
 AUX libplacebo-5.229.1-llvm-libunwind.patch 418 BLAKE2B 0042bc6404de57fbbb814ebc91bb51ee5a6bb279a960af81bd2bc71b9eb092c0ee183e31614a892d26508516dd550837a6d5c8038512e8f8e899cddf1236f600 SHA512 b6a40675f0ea5b6e36fb47b56e08dc1ec7425ff8193dfd92aeccd3830da91b77410b9f5792b233b630bdd7422993d6d0f22b82761e29d17336357bb47c89bc48
 AUX libplacebo-5.229.1-python-executable.patch 400 BLAKE2B 1de79b031d4aa7c55e058db788d2ba3ed6a66e58dac325a091b40be58b95e6cbacf852a0f1e84465d2834ecd07aa920390b90a81e03c3e21825eb0ed56c2b68f SHA512 5b8c1f5856b1e0cf67a306fc7b3fce552f26c4e8d785a2a0570b1ea983d487cd235fb9bed10f86747597f19d2b2d9a920b19a88acf3e48d44aeaa999849cff76
 AUX libplacebo-5.229.1-shared-glslang.patch 678 BLAKE2B ff1dff5e3009f165091cc17e1cfbd7fb3ed90763e96a437b791486c27b75b8d5c308ab9d9704777071fc0483c2b0f6e48cc9a91c22b6296a12a184f6f6e0e27c SHA512 ec345ac50603d1b77dcc939e87534eaec735bd3dae81579e92c90b8dafa20970b14a1afc2785fe8f7121398f6b81b34bfe0d4d5c1a1727a131e0442c4f9e2da1
-DIST libplacebo-glad-2.0.2.tar.gz 581059 BLAKE2B ce7f63ac1f9a6263d3de3f9c56f4a47b8bbdd1ac7eba875c7ad807ae923c8a82d7f323725af8b64adbbc30c2e014c6a5ed8b3325b7f15984222075874a68c0cf SHA512 c719bcd7a0aaa56d89158c9f347410b9e66466fb957a5a5f201b4cce21a0c1589d6d2a866e12134ed43435a5567d842fbfd134559dea1ca59a34b079ff6f5d37
+DIST libplacebo-glad-2.0.1.tar.gz 581028 BLAKE2B 9c1a6dfdec44b9d55af4f410172958d5630408cebbbc86d17e73d0aa042b2d9765b9be7875a21ec4870f5efde589b8112a8d9ed785b0e9847c38a7b85ff1b5c4 SHA512 c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262
 DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525
 DIST libplacebo-v5.229.1.tar.gz 673121 BLAKE2B 0a59e16b4565b10b222c5a5a8e607670bd4010a2be9b99ebdc15638827fcaf21bbf3c16a3cd2b902bcef43041dec56441494a0f618094e14db8f99a9d314c621 SHA512 45efb252d5d44e5429790f9024b1b2a153051d6d604b07fcf3e4de7d49a2e91d20457be76e08b3b9ab43248c4a2e7268c9f8dc69837783e572f9b8735c955334
 EBUILD libplacebo-4.192.1-r2.ebuild 2333 BLAKE2B e3c2735e64a54f34c83b14d425e8c99170e9d8048bd02ae1b4fc44e676b8fe1e03d92bcfbc7d353186a98387c0609d767bfe118d2e64e54baba577fe58b7071f SHA512 49008898a94dd60fd96a9489dca9421c2d3d6a34bcc3a9b8dd953707a4f7a6a7534112a4cd4bc339b637317590c8329b210eb8310924f3bb945a806f884536b7
-EBUILD libplacebo-5.229.1.ebuild 2646 BLAKE2B 72410323371e7f3c6e1b389262d1e0c6f5e06a5b07ee58909b4e7db5a3793d8f6590585a9a24c5db14ab989d7a73b414a0622e93c0e50214f0956e2375e05d13 SHA512 a3307baf16783b55a91aec207461f88bfdfeb25d05454456213e22b9cc74a1bd4263d000288c98b260c8929ecb7e7cd667f3583e38b8be275b86748677e57ea5
-EBUILD libplacebo-9999.ebuild 2646 BLAKE2B 72410323371e7f3c6e1b389262d1e0c6f5e06a5b07ee58909b4e7db5a3793d8f6590585a9a24c5db14ab989d7a73b414a0622e93c0e50214f0956e2375e05d13 SHA512 a3307baf16783b55a91aec207461f88bfdfeb25d05454456213e22b9cc74a1bd4263d000288c98b260c8929ecb7e7cd667f3583e38b8be275b86748677e57ea5
+EBUILD libplacebo-5.229.1.ebuild 2657 BLAKE2B f9cef9e79975f4e5a9981ef597e3b74f159d1c4d60ac2ab30281b47aa7667fbae2a7748ac80fea64c6ea8f83b49ad1bbb5b3c10e07d689346089ab64bcd15052 SHA512 9126ca37d24b7e7c9f939819b8c50838dc1093e7dd782a4ff1e30523c4bb9960e4a5083b969b09f6b04197ac165dfb06b625892336bb6438fd14aabe7de392b7
+EBUILD libplacebo-9999.ebuild 2657 BLAKE2B f9cef9e79975f4e5a9981ef597e3b74f159d1c4d60ac2ab30281b47aa7667fbae2a7748ac80fea64c6ea8f83b49ad1bbb5b3c10e07d689346089ab64bcd15052 SHA512 9126ca37d24b7e7c9f939819b8c50838dc1093e7dd782a4ff1e30523c4bb9960e4a5083b969b09f6b04197ac165dfb06b625892336bb6438fd14aabe7de392b7
 MISC metadata.xml 678 BLAKE2B 7b4c70ba3d89a81182905365354eaac312888c492a33e2d7b410c79139af9680aeac65c2dc6b692410e601c9bba13c4ff16f80c48c2d9accc3d5d1f82be5395f SHA512 64cd5d5d2231ed1bf6298f074d56471bf158ea29fdac3c4d7f1e54b7259e4ce294b6c1ed31b1397fad952224e9211778bdb59dd33c429870fd58ab9931ab0677
diff --git a/media-libs/libplacebo/libplacebo-5.229.1.ebuild b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
index 305607263956..f6b4f9f82688 100644
--- a/media-libs/libplacebo/libplacebo-5.229.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
 else
-	GLAD_PV=2.0.2
+	GLAD_PV=2.0.1 # verify bug #881999 before bumping
 	SRC_URI="
 		https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz
 		opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )"
@@ -42,8 +42,9 @@ DEPEND="
 	${RDEPEND}
 	vulkan? ( dev-util/vulkan-headers )"
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
-	vulkan? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )"
+	opengl? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
@@ -52,11 +53,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use vulkan && python-any-r1_pkg_setup
+	use !opengl || python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
 src_unpack() {
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 305607263956..f6b4f9f82688 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
 	inherit git-r3
 else
-	GLAD_PV=2.0.2
+	GLAD_PV=2.0.1 # verify bug #881999 before bumping
 	SRC_URI="
 		https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz
 		opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )"
@@ -42,8 +42,9 @@ DEPEND="
 	${RDEPEND}
 	vulkan? ( dev-util/vulkan-headers )"
 BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
-	vulkan? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )"
+	opengl? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
@@ -52,11 +53,7 @@ PATCHES=(
 )
 
 python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use vulkan && python-any-r1_pkg_setup
+	use !opengl || python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
 }
 
 src_unpack() {