gentoo auto-resync : 23:10:2024 - 04:04:36

4 files changed, 21 insertions, 2 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 01648d1e8005..a02e04d0725f 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,8 +1,9 @@
 AUX libplacebo-5.229.1-llvm-libunwind.patch 418 BLAKE2B 0042bc6404de57fbbb814ebc91bb51ee5a6bb279a960af81bd2bc71b9eb092c0ee183e31614a892d26508516dd550837a6d5c8038512e8f8e899cddf1236f600 SHA512 b6a40675f0ea5b6e36fb47b56e08dc1ec7425ff8193dfd92aeccd3830da91b77410b9f5792b233b630bdd7422993d6d0f22b82761e29d17336357bb47c89bc48
 AUX libplacebo-5.229.1-python-executable.patch 699 BLAKE2B 5c3f1afb2e8a8992bd411cd73e600254e76722788049a9c1eb44a5677f19214f3066685a16d30e679f38ddbb929f60721d38cfb679d3d803d46585153f3ef2ba SHA512 0f7e169fcb261a3229c24c6cc4a2bdc59a68c3dd97327f5b34495b801c43f4ae34d4f48f9456c07b1e444b4b74f06796534fbe450fa421fe6cf260842928ec1e
+AUX libplacebo-7.349.0-glslang-1.3.296.patch 506 BLAKE2B 42db4aa183b53599605840c3ea1b8920b4b7d7f2593226664cbcdb7f2939d82c02e86c8d33d9107555166fc68d9f94122bb35ea0f8c49c8a3fdca1cf6e352986 SHA512 16c2cbd9517905be4b1ed5de31473aa247f06a73577b08af2d046dbdc57a4d01f11020d5b3bb386e12352254df702292dddf46153014d798e2cdb0c47f907982
 DIST fast_float-5.2.0.tar.gz 84800 BLAKE2B 39133eda20acd5f1f049e8040815a67aee588ab93be4953bde3b9227fb691e099581ef79b12b740437b78a9b4c9007762b44d9726ca07505ad5cb51394d8e3fd SHA512 c703c7cba3c69775317c66a62ce145646fd7d3d063124501e3d6a7deebb8c62c14a2ccdffed18de2d73d9d3a8ba2061ef1d34cc780ee0b6d607935d5f1b1de81
 DIST libplacebo-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7
 DIST libplacebo-v7.349.0.tar.bz2 701309 BLAKE2B 6d0b546776c0326ab8305e7e12341b13e560e1ef53600913ece82341c762cdd466fd2d172781c769e59a57058769d5c0e48ca408ba0c2c7f936459bba6fb4212 SHA512 2e8cec7928aaafaaf9825cbacfb4758024ff04e40b98061fc6f178225647c90344e5aad23b02d82483062dbccf966a7d0178075151cefc6abaef1890f2b0c128
-EBUILD libplacebo-7.349.0.ebuild 3371 BLAKE2B f84a8328836f14c5aaf4a1afa7cc1a32a062e90436f48b43213437e5015f5c3fc4d9d082d62fae3cb7f6286ac6c1622938d2d16f60aca2b215c9f8220404f45c SHA512 031e0452b3851dc51df1e58f2cb8c98cc4103bc25e1f2394a15bc912fc1aa53363775f3fe999d5ccd5df24186468293d4886159ad8d4832ec8280ca3b9071c75
-EBUILD libplacebo-9999.ebuild 3376 BLAKE2B 85147a110104e6eb7f64124593727debe32601b8a2b332ee245285613ef998251de0b14e2bb980b011c59c9c5576ed752f154c0c1934bedb850ee34381081c2f SHA512 56f6898e8bce6c7fee264e3632e6dca609730eab51ed0ca2a6089520729741664765e81ad35fc999994d6b6a86fcddbf238d965864348a7c49e30cf6811432c5
+EBUILD libplacebo-7.349.0.ebuild 3422 BLAKE2B 72d17b3aa2b2a18eacfcbfebdef8dc008c06daafb3697af4e07643f1a335d462d3a2f8e4d2d47012ae6ecb7bcafc22ed0fd280dc636fadd0c03233f1a241765c SHA512 3454a2d4566d2767561140c16f81b0f4ef4b3859b0f34abde6614317ef59b9f6de8ad62d0f407b3b61cefe7a3bda7228d60c1b45c1a5b46569bb1d2cd750e2bb
+EBUILD libplacebo-9999.ebuild 3427 BLAKE2B 00512ed5649f77d3544f0a9a12f0ef777d48da36d9d00cc612589d9a90748df20102cad4a451de7e3894705ee162b320be14a33b6f2d25bce8f5b5d0db7b514c SHA512 ee4f0e8359449c94821484084d9b69e9c055abbd42a8bbddfa4698799caa2d2e5b6beafe37f111fc5162636b24c20ebfbaa54cfb533e958130038a8466c6ad9c
 MISC metadata.xml 794 BLAKE2B 7611ec1c500c2aeff415b9bda5b7a8f64df1e005972902eacc6fe25f84c8c68089041c0015e6ee82062eab9ae0127f502068a116ac01b6f9bbf4269ff8bf1987 SHA512 a8173a71e13137f432bef3b490b05c2e2899a935ed33259b21c488976deb78a860d09a81c8778e23f0b5eb42d02bcfe8a1867da98f4f29713864c21d463c0667
diff --git a/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch b/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch
new file mode 100644
index 000000000000..81af061634b5
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-7.349.0-glslang-1.3.296.patch
@@ -0,0 +1,16 @@
+Quick workaround for libSPIRV seemingly having became a stub in glslang-1.3.296
+
+https://bugs.gentoo.org/941968
+
+TODO?: rather than worry with the constant issues with glslang, should likely
+always force shaderc -- it's also what upstream prefers by default and so the
+glslang paths are hardly tested.
+--- a/src/glsl/meson.build
++++ b/src/glsl/meson.build
+@@ -39,4 +39,5 @@
+ 
+     glslang_deps += spirv
++    glslang_deps += cxx.find_library('glslang', required: required, static: static)
+ 
+     if static
+
diff --git a/media-libs/libplacebo/libplacebo-7.349.0.ebuild b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
index 9d16436f4759..7899dff069c5 100644
--- a/media-libs/libplacebo/libplacebo-7.349.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-7.349.0.ebuild
@@ -71,6 +71,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
 	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
+	"${FILESDIR}"/${PN}-7.349.0-glslang-1.3.296.patch
 )
 
 python_check_deps() {
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 1831a83708b6..ecef342f645d 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -71,6 +71,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch
 	"${FILESDIR}"/${PN}-5.229.1-python-executable.patch
+	"${FILESDIR}"/${PN}-7.349.0-glslang-1.3.296.patch
 )
 
 python_check_deps() {