gentoo auto-resync : 27:03:2025 - 00:31:42

4 files changed, 14 insertions, 1 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 541cdfbc7330..7d2736134909 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 987e9ce8ca83..54e4ecfb2e7c 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -5,11 +5,12 @@ AUX gpac-2.2.0-ffmpeg6-deux.patch 1720 BLAKE2B 3e3e8af384e63d169a87ae766b20f7490
 AUX gpac-2.2.0-ffmpeg6.patch 1162 BLAKE2B bed72ce7db91a5c25f74ae33561fa47c2951dbf454714ef912fd0a97fb5701d7beaaff48608f985b9824e00deea957d3bf7859b2ff3fa6cc6a41e7147b5f2f94 SHA512 6aac7c2a7f5f91d95f6908d798d253dab61cb234bda743df4d477e84be5ee77375e3ea3572fb3b8090e095c441756a2b97d65615853a4a584d0387eb4a32f532
 AUX gpac-2.2.1-fix-bigendian.patch 949 BLAKE2B edead7173ac45fa79e30211412090b40c9ce4e4992a4497dcd9334c1a9308699f2a418cd31715dac03a2882feddc27a42a42133cc23bad6d097cc936e0d20a5a SHA512 e8e23cc8753476297e9bc98d950dbdfc5741c2665ba634e5db43e1e9459374effc2d49bbf8e991fe90553e6820837024bea40d3f6e52d8fa2ece6e07e78a568b
 AUX gpac-2.4.0-configure-stddef.patch 940 BLAKE2B 9125c34dabd14bc73344c31e5690b9fe56c19165e8068146911ae3300e74c113550d43a418725be281661aae186b79511aa4bdfd4a9e3bab8fbcbfa76a4b252e SHA512 8f977a972f60fe117cc0647e5746570b5a584f27ae5a50c172b9b467baeec35f23429ae1009bebb9e3e9946724ded3321ff74404331d69ea95f8edcc9e8c5ea6
+AUX gpac-2.4.0-ffmpeg6.patch 342 BLAKE2B 5300323a666fe88552ce61051eabf093d8ac4bbaf0c3aa01bdedcc412f0beaacc767448f85c124f125401124df262c08dbb1da44c56b743fe102e7005b84b255 SHA512 dd636d0a190108246cc468e51732e1532de90a530c03535c95ee8097c1acd45ef61d3287c18d2752247b6198b1431d2d4cc89556a07428d138b4ac231b255873
 AUX gpac-2.4.0-ffmpeg7.patch 2091 BLAKE2B 0f1ba4dde8acdbdb66dfe282f1856a376593e526b40c2f0af083394d8ca4c3848c31b0591c310e6367cc22cba5f518347faf0746b60df9eb2de558d255a64311 SHA512 033298f602381586dd9d8dd103b274e8aef72637ff854fc01aaa211bbe5e398967cffcb169ae4600a16781e302c5fd77b275aa7ab9c53f4b85eb8d8d83d05ec1
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
 DIST gpac-2.2.1.tar.gz 11377184 BLAKE2B 44b47459da0f203d0e4c0eed5836a59f44fb508db4e601b46e9ffdb53d89bb49e22ccdfe7951b17581130f186c47ae8efc0d9002685d5cf9a3547159356d2d9e SHA512 873df4c2fdc3594a0f3bce66d511cee14669643042ab1ca8d7f370ad3f50636c32c31f79818051d00bf844de30a5533ae30c81ed168baf2626a152771b6a6845
 DIST gpac-2.4.0.tar.gz 9914579 BLAKE2B 09d7eeb390b4d10a6d144bf4046a7b53283fa05be01c663e0cd82e8b7b8d9dece30ef42747c12a7477f5b13ca7c7e18905f36d3f20396bb50937a249729fd3a8 SHA512 164d8a1ff235413852cc2077b5153c36b094862b61fdda12065bf6810926caabd1a1f6f30b7aac9a5b640f51fe92a6ca911518a424cab7220b635920d95da99f
 EBUILD gpac-2.0.0.ebuild 3354 BLAKE2B 5c55018a050f8dacee193372c0c97161e628613a50454e325aae39dcac11fecdd0b1d2f816ba21295a9b493467b4542dbc4264f1b34e796fff493a798bd7151b SHA512 02e8e64a69d731ace0e0846b322aa3fa310b278f874d3d4505bd391887c74dc585e5fc338d9e8400509de8d57ef7e751b2c9725f4d35e43ff1a4269a3bd268ca
 EBUILD gpac-2.2.1-r1.ebuild 3371 BLAKE2B dc00a44a677961fe9597b00015c3bf94a9277fa2bc1a0324c2ce044a0bb9c8695a02813ec8f22e9aba08092a957bc8a4ec22fa2fa1dc42aacd16c27ca4008eb8 SHA512 eae9159c5150348200ade19830f2353078797b93e7d5468c4a000fcbb224f137c079488f3192365a229eed7e88f5e87f90049426e06cfd26ba83207e66429ab8
-EBUILD gpac-2.4.0.ebuild 3249 BLAKE2B 69a81dd530335cfef29682991e2cf7609364d85faeaa82de566fc02c24cec6eccf953ee8c17c375ffc84c2b7a8f42987f1703eece88a0d81fc36f7272abfa9b9 SHA512 498593b4d7df9020cfe2e612ecabc8c07f1cff0f85deae7c4819e98cc82e5bc489da13e856975b0a31adde4190b537a94522dc477c5f38b2cd7d738100431163
+EBUILD gpac-2.4.0.ebuild 3283 BLAKE2B 4e2c7115bb490510167e8259528264e16f1bd9b5cb506213e3bb4075786629d45daeea2fd9d24037b9fef89117733a28957bfd09811939b13a85ecbcfe07ac48 SHA512 b2d3bce80661fe6e73cbbc8484d63a27dd5a53ce10890ea9718171037138a147c2c5ef04022852b78e0cc3ca4f6af07c40d27ef3c7b7a307d2123f95847db7c4
 MISC metadata.xml 306 BLAKE2B 18a131089d9a3672627375f2e92b3ea7ea6f56ac69f969f4d7c1373f83561e3849a8923a69e6f076f2ba4cc9fe59d22a42ee9a4d3a0cb73ccd3430b3a4bf397e SHA512 eb782df8c2adc47e419b7f055860508be67288730c4efc0563648347fc261f7c42100746fcde9552ec4be0482ffb40e41dc4e48961df1f876d9b250e47a9e737
diff --git a/media-video/gpac/files/gpac-2.4.0-ffmpeg6.patch b/media-video/gpac/files/gpac-2.4.0-ffmpeg6.patch
new file mode 100644
index 000000000000..5fdcc0d30e6e
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.4.0-ffmpeg6.patch
@@ -0,0 +1,11 @@
+https://bugs.gentoo.org/951622
+https://github.com/gpac/gpac/commit/8d7cac0bf9f9775cae1d43de7138206758f28b0c
+--- a/src/filters/ff_mx.c
++++ b/src/filters/ff_mx.c
+@@ -248,5 +248,5 @@
+ 
+ 
+-#if (LIBAVFORMAT_VERSION_MAJOR <= 59)
++#if (LIBAVFORMAT_VERSION_MAJOR < 61)
+ static int ffavio_write_packet(void *opaque, uint8_t *buf, int buf_size)
+ #else
diff --git a/media-video/gpac/gpac-2.4.0.ebuild b/media-video/gpac/gpac-2.4.0.ebuild
index 68d3e1977978..409a607d607e 100644
--- a/media-video/gpac/gpac-2.4.0.ebuild
+++ b/media-video/gpac/gpac-2.4.0.ebuild
@@ -63,6 +63,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${P}-configure-stddef.patch
+	"${FILESDIR}"/${P}-ffmpeg6.patch
 	"${FILESDIR}"/${P}-ffmpeg7.patch
 )