gentoo auto-resync : 30:12:2022 - 02:16:21

8 files changed, 52 insertions, 5 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bfbb15c38505..141616edc868 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 24bbfbdc0e5a..83ee8b18e38c 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -7,6 +7,6 @@ DIST libplacebo-glad-2.0.1.tar.gz 581028 BLAKE2B 9c1a6dfdec44b9d55af4f410172958d
 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 2667 BLAKE2B 48d511cd4e1905faf951bf1fda557054f43f3a826af902375105f75cd5e6d2dadddb8660ba20acde89f5d2103a1630558ba35e2533cf010a2bd40994b291ac43 SHA512 59238d8264ecb34ab547ed284e15bec1cdd6e6489d06c9be7f7aa6ba2fa33a8f432fdcfe41b743fdc3aa0283b03d7999d92add40deb4f84b4c94e19590d888f2
-EBUILD libplacebo-9999.ebuild 2667 BLAKE2B 48d511cd4e1905faf951bf1fda557054f43f3a826af902375105f75cd5e6d2dadddb8660ba20acde89f5d2103a1630558ba35e2533cf010a2bd40994b291ac43 SHA512 59238d8264ecb34ab547ed284e15bec1cdd6e6489d06c9be7f7aa6ba2fa33a8f432fdcfe41b743fdc3aa0283b03d7999d92add40deb4f84b4c94e19590d888f2
+EBUILD libplacebo-5.229.1.ebuild 2905 BLAKE2B feffb8b5e033716fb45fd1c6e5212a41f965f2f565e7e11e27f57d504e06b047b349da7dd838c6767e6130a4c5f89be3c9309dd57dd6fbd94e54ed4310d71231 SHA512 3d56b0103e34f887450150317c8d8f431b92d4894d18f9fa5d9292c2e20070785efa7c86bf7f981362c1021c9bff937b676790e7f609bd139b5cecbd93790c21
+EBUILD libplacebo-9999.ebuild 2907 BLAKE2B 0354fbf3ff189b1600b74e5757fd4aa05c059cd297d30eb850e85c5e527a3e04bfba0a37f086450693ea77db892cbdd3620465457aa41b05d505099573d97c37 SHA512 b8c254f4ab88541ac64380e19bf3f75b8360caf570a0ef51da101f91a296385ea088af533ce03d0c0c711c3fe94d84748a22213ea11424e3c58e894da2398989
 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 153994a42c5d..6bb651d08422 100644
--- a/media-libs/libplacebo/libplacebo-5.229.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-5.229.1.ebuild
@@ -15,7 +15,7 @@ else
 		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 )"
 	S="${WORKDIR}/${PN}-v${PV}"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
@@ -69,6 +69,14 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	# typically auto-skipped, but may assume usable opengl/vulkan then hang
+	sed -i "/tests += 'opengl_surfaceless.c'/d" src/opengl/meson.build || die
+	sed -i "/tests += 'vulkan.c'/d" src/vulkan/meson.build || die
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddemos=false #851927
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 153994a42c5d..dc18093e0d60 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -69,6 +69,14 @@ src_unpack() {
 	fi
 }
 
+src_prepare() {
+	default
+
+	# typically auto-skipped, but may assume usable opengl/vulkan then hang
+	sed -i "/tests += 'opengl_surfaceless.c'/d" src/opengl/meson.build || die
+	sed -i "/tests += 'vulkan.c'/d" src/vulkan/meson.build || die
+}
+
 multilib_src_configure() {
 	local emesonargs=(
 		-Ddemos=false #851927
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 135dcb54f67c..cdb5242dd65b 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,8 +1,9 @@
 AUX vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch 879 BLAKE2B c9468c7ebada19d1a252b6dc6f8dcc6edd2f5497e86cba815a4da900ad933f619ea8589071d86a387810b07d3cb58fcabcb4a86c15742e539f7333d55679abc3 SHA512 c8f86399a58cd2454c11e2e240def31b4dade136d1546da0b23c77d89de767dc9c126ac3e77a585cd56d82f5557a0316e439f1f724f4ab8e615d28520e66497a
 AUX vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch 5089 BLAKE2B e76b6fdedf175c246e227e1317243ceb1842b19ad7f64cc0d7ffa4935f554dbdf5664ee8907b47ac22e7308110ea0faced11aa40f3870f059a9679b4ef1db6f1 SHA512 28cad48b59458e21e8a46d3e7ea915a8d7358962e2c0a7f99db1db99ed9d6090a129be874cce7fc528991476ccc41acccc1f1627b449dfdb8555ce8173dbb179
+AUX vulkan-layers-1.3.236-Build-shared-libs.patch 770 BLAKE2B 2d1993ac077cab2b7de5509bf82ae57ec8783e0a9759718fb38884740eb609cfa5f8509bf45f4bc9a81d92cf8f377c3455cc293fe3c0ba75d3388028e041a598 SHA512 e59d13680f53b51755954f68c7389d873e205aafe16ae6ca11a2c3137cce39ecfecf37be1aa66fb6e5bd122dfaafc6eea507bc958dd68e569274576fbdd83999
 DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606
 DIST vulkan-layers-1.3.236.tar.gz 4519779 BLAKE2B 087ecbfc4e460dbdd65009262d3ddedbed72258742ec902ac6e6e89d779aa350f819d4aa2aad4a30d365bdfb079c25ccaec265b9c5b56066e082db4701300095 SHA512 0ebb9d44b1a465a28702e12c80c6accb55dbd6a53ce2f1eb8e8cd627583a217544e21e8eb7e1619620458d756c0cde244bcde331710ab8244e113e302839f479
 EBUILD vulkan-layers-1.3.231.ebuild 1658 BLAKE2B 290cb1394b931cdc45350f5173b1bf2cdd8311af02143e9a15101ddabb7da469b5dc0853596614c64f4236ba1e865e5a7b4314857be0a431b6e856a38dea4636 SHA512 0986e8a61ca261985ddcc584838b899c52bb1f1ce7fbf0a09e5534e209539b05bb136ee23d37fc4ac276fcc3868d980976063859d244d5b610c3e91b0075442d
-EBUILD vulkan-layers-1.3.236.ebuild 1530 BLAKE2B 1f35deb8626817ae6db0ea115f2138a6a025c7fba787e045ba9e849ab4a9f9635b895e132eef8b2b0fc4c87aeba6a6b75043ba7970322c88fef3797ee4226430 SHA512 a587392d6c95a8ca022b27ae96b27accf9937effa95a3a26af8d7960f4e16c758d6910c0d558199afb78b5819f36b40a8a686acdf0e9577ebd33600e1d4f0f92
-EBUILD vulkan-layers-9999.ebuild 1533 BLAKE2B 9e2705767f971e0e640e0d2ca94835d1ab35fa33125ef7994b262840dfc9c08d01a9009b5880f313246d951f9a69a56175e1b2852bcb2a7d3c4df16851ebf8a8 SHA512 548e1b678c893d772e3c18401da553081e7f7248d5d5f6b3ac72d5924817c3203b17dec7142d47ed2453c2648c6003471c71ccb0c8808050ee77509a42693d85
+EBUILD vulkan-layers-1.3.236-r1.ebuild 1582 BLAKE2B dcb8c46277360dda1fbe1b98f1d6f8929ab22927277b7546a7f4896c5054445f912b69263fbdbb09c7e727ee5b03e7390f0d01f6cf02bac14ea94a828c78d01a SHA512 38ab812747aaf39e95fbd5dd001e3024118ced1584b409b5dd2b83298aa3e6be20b8176119fadfc5ded90746712e53907629941e6f4e42d04d227bd1310af6ad
+EBUILD vulkan-layers-9999.ebuild 1594 BLAKE2B 836f6cedebf217c158c2dc1a7a8f9f803fcfc9556e9119ebfdb89df10c7a7e952ac4ab52a07985cd90ff769272a44181f741f11333841c139bfb79b3626d1a3b SHA512 3d7b7e1ca089e1eff1b8ccd53c7908b55f2b8dc422b7f4bab5a628fe9fb65c617c673e85798533233d9e9ab02149f7a04b4cd8f531be8aa950ddd949ae0a00c7
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
new file mode 100644
index 000000000000..18cedb517b09
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.236-Build-shared-libs.patch
@@ -0,0 +1,26 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f29022f96..cf34d8e21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -255,7 +255,7 @@ endif()
+ # files directly in layers.
+ 
+ add_library(VkLayer_utils
+-            STATIC
++            SHARED
+             layers/vk_layer_config.cpp
+             layers/vk_layer_extension_utils.cpp
+             layers/vk_layer_utils.cpp
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 96d52b5f8..3f75aa3a8 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -226,7 +226,7 @@ if (NOT BUILD_LAYERS)
+     return()
+ endif()
+ 
+-add_library(VkLayer_khronos_validation MODULE)
++add_library(VkLayer_khronos_validation SHARED)
+ 
+ target_sources(VkLayer_khronos_validation PRIVATE
+     ${CHASSIS_LIBRARY_FILES}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
index 4651b8594c3a..03f4800769a6 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.236-r1.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES="${FILESDIR}/${P}-Build-shared-libs.patch"
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 6496c1088d7c..7d5abc1f9f75 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES="${FILESDIR}/${PN}-1.3.236-Build-shared-libs.patch"
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"