gentoo auto-resync : 10:03:2024 - 00:44:50

3 files changed, 28 insertions, 1 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6b6d644accc9..4919c8cc24aa 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,6 +5,7 @@ AUX chromium.c 215 BLAKE2B 2b5149d401433a362149cd4ff020cdc2217388e3ecac4aef86e7a
 AUX ffmpeg-4.4.3-clang-14-ff_seek_frame_binary-crash.patch 1813 BLAKE2B 3fdb56fade5c723fcf387dfe5e31aefbd88e8256fb2ae24a3a90b91902ff18f9ffa9b1e464c0b0b40fad04c7230be7bec78f043b7ce52d70ee94f2a2313dc2b2 SHA512 fb11cb1047d8f44ab9f9f66e52af136b7fea27589929e45afb770e53837954fb03854ea9d839ecee80d3c3d5a493f32bbdbc74e8efc9600d5b53a7d91136abca
 AUX ffmpeg-4.4.3-get_cabac_inline_x86-32-bit.patch 1068 BLAKE2B b547cd925bfd506e08d44395c67916fe20b30f397a36adf53fcf277660c45aef9d3d8c014b2bbfcf038539618affb9dd8ff5d93f2fe622e4282c61c4d1b26861 SHA512 779e921e783b800e6bf9bc95af73d44a170287676d17bc22f2b7cd91e393f410ec3f6c7bfa173497443a65496047f39f37cac1d56507271411893c5bdcb37d8b
 AUX ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch 1882 BLAKE2B e60bb09566cf61018a0e910f32ccc9e9d94695877dccdbeedc0c27996c356c397b59889f5d3997b6cea85acf4228f41bdb8086dfa2dc4b0852f4a8031a6d2c14 SHA512 d29410a1119853c7a7c1762fb557be26b7c38e1787a9ebea744a71438cd701d658d55e4c27350bf2d4ff31a8cdc88e0844fa37b5ade3ef706b3ba1cd1462916e
+AUX ffmpeg-4.4.4-glslang.patch 1526 BLAKE2B d64d95f089c3d3aeafb7cc3fb08700641b6252c3cdbfac2e9b16431819007a8fa7b52ae156a1c9727671f00c9281024596183b85f7f74864ef997f660aa47296 SHA512 2bca3ca62bece6696dd6bd30c8cf57e31b9da551ee1f698a09d0a00ecdc96da51b519a8a42c85d1f572d26db92bec72a717d75c1a6e3c8f59a4a0066e6a332b8
 AUX ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch 463 BLAKE2B 44b8f8dd9048379a287a2afd59eb97d7d346de666a057daa7fbd6e43b19e55081b41598fe205f759bf39cabd924c09a63894fbfced3dba19c4325b6736960a9c SHA512 ce7af0d47c6861514ffae1641347b60fcee8db44592f14e725ceee725b49a1ae5f65fc9206c79047f0544f70c62646693895f1b054fdf9207d95ed21a66a22ec
 AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e
 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb
@@ -31,7 +32,7 @@ DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370f
 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5
 DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158
 DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f
-EBUILD ffmpeg-4.4.4-r8.ebuild 20269 BLAKE2B 2d42f92ce34afbd49b4764e59bd3ac4e05e2e052d88000c6b0f0cdeae09b7170998cd52b951145fede6db9a18d480d0eb6e0f87a498bc34f1b61e4aa656d00b4 SHA512 d6a81f4ce5be09ea5ec7e8480c9fd5f4ad9417020f0607de8356fa87f47fe4237d734270ea3224402720451ef123b3354ccc472e011963e2cb1528028b74c229
+EBUILD ffmpeg-4.4.4-r8.ebuild 20310 BLAKE2B be7e7b32d8dfcff4f5284de55d32a3b62db19ab8659088aa9a32ba622de979471d068b38e1f4bae929ff58edb85f9f8c8733909cf4c8f34d65e17d4c1d3d5426 SHA512 b3c89eaa9d558ae23e15f35f499fd33d099a623ccd741763e231a3ece2eef1bbb0184c58a66c77ce3d6253d57f00262fc6206a4264af1045676ecd6a76a5c4db
 EBUILD ffmpeg-6.0-r11.ebuild 20020 BLAKE2B 18db116982c97ec2fe3df67f92910ff3b8b6eedbb28dc8163d887138ad02e0527b93b6fd63d606cef6c6d24b09004a2f8df415cdc405dad754e6258b3216eb94 SHA512 5dae2a52047347d43d53283c52a220d1d5dab4a6c1fbee384a1a99aeb2f48b48710a40c341e64719611d08eb7350944641bbf4101dbd9fe73b1a9aa4aac7a5d1
 EBUILD ffmpeg-6.0.1-r2.ebuild 19931 BLAKE2B a8529c94233d66e59ff909d46067d3ff8f49f178d4afe4c8852d78df7ed86fb761832fd034f4e85cdf67ca45bb99321c045aef70ac38e028187c841b277b6c59 SHA512 e61c48f3cb4b88322de648a36a72a663d630ad0d535903429220d7c9d63b9324e412ced37124ecec17825ee63033ca025115a86575148c9ac8958e5a59cfcfc2
 EBUILD ffmpeg-6.0.1-r3.ebuild 19978 BLAKE2B 4fa3dcf0e437524ebd81518d67ee65d799bc7075fcbbdf9b813fb195a5e3013374a56f78738649d374286b9e3c51f74efbd2be4f1365eb92b954ffe6e4f8736a SHA512 3944e17e8abe62473400b37abe15c3110938a664c802792234973dcc209acab94befdb99b2f6b9ca2435a5f7c34286f6fd7d9b1e9d5061853bb07200b141dc4a
diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
index 00d867dd517c..748acd8d7375 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.4-r8.ebuild
@@ -349,6 +349,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-build-svt-av1-1.5.0.patch
 	"${FILESDIR}"/${PN}-5.1.3-binutils-2.41.patch
 	"${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch
+	"${FILESDIR}"/${PN}-4.4.4-glslang.patch
 	"${WORKDIR}"/${PN}-4.4.4-texinfo.patch
 )
 
diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.4-glslang.patch b/media-video/ffmpeg/files/ffmpeg-4.4.4-glslang.patch
new file mode 100644
index 000000000000..f19bf8e47a42
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.4.4-glslang.patch
@@ -0,0 +1,25 @@
+Bug: https://bugs.gentoo.org/926551
+
+diff -Naur a/configure b/configure
+--- a/configure	2024-03-09 22:07:52.005888104 +0000
++++ b/configure	2024-03-09 22:08:18.634656978 +0000
+@@ -6374,7 +6374,7 @@
+ enabled libfontconfig     && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
+ enabled libfreetype       && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
+ enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
+-enabled libglslang        && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
++enabled libglslang        && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
+ enabled libgme            && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
+                                require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
+ enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+diff -Naur a/libavfilter/glslang.cpp b/libavfilter/glslang.cpp
+--- a/libavfilter/glslang.cpp	2023-04-12 19:01:50.000000000 +0100
++++ b/libavfilter/glslang.cpp	2024-03-09 22:08:36.210161783 +0000
+@@ -17,6 +17,7 @@
+  */
+ 
+ #include <pthread.h>
++#include <cassert>
+ 
+ extern "C" {
+ #include "libavutil/mem.h"