gentoo auto-resync : 10:04:2023 - 11:36:36

3 files changed, 49 insertions, 1 deletions

diff --git a/media-video/gpac/Manifest b/media-video/gpac/Manifest
index 2374684f5d87..36e4df300f4c 100644
--- a/media-video/gpac/Manifest
+++ b/media-video/gpac/Manifest
@@ -1,10 +1,11 @@
 AUX gpac-1.0.0-zlib-compile.patch 1498 BLAKE2B 84c5b0e8bf35e6c6a0b1655e2995e0a71a7b707dc922a4bf011c3b0ce00b64a6eba976dd7c1a45a5e8e208b608762e9bef6a38be9937714b573c7c907614d8d9 SHA512 8a066d2c2fbf185ed131792c48bbc5fe5414bcdbb77df6377a98a58f9bdd017b3260ea0d6e9130791589e64e351369f25f3849d4b635196e1c022ce6720ced1c
 AUX gpac-2.0.0-configure.patch 3674 BLAKE2B 423016315ac7e7ac6959813dada7cfa97a415c62200fb6e9dce74a89b28124a042f5e9736ac815827ee30001cf7c973495dd3577b8963e1bcab3b8d54a50f41f SHA512 b1f620a9c5be2a889805976a985e7ecf89e736f2b11a5a4c07f6d5fe39e511a603f048760cb6b0d6e9cb0e217acad2897839ef5289c2b4de088b95f75577c4f0
 AUX gpac-2.2.0-configure.patch 3504 BLAKE2B a32633e3b3384e48341ea011119191b0bbe44c3b433ddf413bbf64829e7a642653e1c78c240690df2cc12e6c5f88376275ecbc5a5951dc83d81ba90135ea9bdb SHA512 634236a1a5f14fe5fe5138b16fdf95da1c30aece41525a6ab183b845dd0d37313241319fd305e457623c8b30c600ac9263c4e2b5989cb75e77b3624542fe2c3b
+AUX gpac-2.2.0-ffmpeg6-deux.patch 1720 BLAKE2B 3e3e8af384e63d169a87ae766b20f7490250c0eb428a4c1538cf94293506b0f110a910d0c1d5419c0d71de847a9ba0cdf59d2f6c0ea3c5e5ca4c2c3acc5e304a SHA512 2570e61adf12430825ea5baa6695c8dff0f1abc77dcb464fab279326299758245b2eecf967184c3308a6d24865891dd9622f0c15ae136cc31a77954c3d864206
 AUX gpac-2.2.0-ffmpeg6.patch 1162 BLAKE2B bed72ce7db91a5c25f74ae33561fa47c2951dbf454714ef912fd0a97fb5701d7beaaff48608f985b9824e00deea957d3bf7859b2ff3fa6cc6a41e7147b5f2f94 SHA512 6aac7c2a7f5f91d95f6908d798d253dab61cb234bda743df4d477e84be5ee77375e3ea3572fb3b8090e095c441756a2b97d65615853a4a584d0387eb4a32f532
 DIST gpac-2.0.0.tar.gz 11362932 BLAKE2B a8489831efb77c374d13e2edb3951e60a94907c4cd8601919e1390aee0e9002249e97a9200fd006c2aa783c516f701f7695aa84b5f3596a3bc90290916ff4086 SHA512 e95e6d78167fc306917b3ac89e56ba511bbcb0c825da118f5ba374504499352104b5c1f3ee71e7ec018015b8e302f9b07162d22287ddb21c8564b097d900913f
 DIST gpac-2.2.0.tar.gz 11376708 BLAKE2B f50c131912787c274a5b2d37e242e37ddd07f2c6eab3a932ec243f0fc36aeb06d4f16fd861eb3534f93534c291c55fddc2bcd1f573d2ed186e17464512a1f089 SHA512 4ac63a79a5d1057aadb59429af84ca9e4e0c0b863b19beafb60bd1c30425357dec45b5d6d48d452eb94002b059c9eb0c7bb0cc14222194f641604f964b3207c2
 EBUILD gpac-2.0.0.ebuild 3259 BLAKE2B 6abca7a4e0f0ef384e5b81fc24a511effc6925610ddf079f8934e20ea4b227831aad72b11deb5cf547d87eca5c57c4cea84dac2403ed4e0d9394d5298bd6b3a1 SHA512 930f88012e50dba329040c7ccce94eadeb4e63b7ae9dd6c6797c894c052d0f28944b7d65f7fea42bd1889f46bfa3c0b061eecfc59019155d674ccdb958aece3e
-EBUILD gpac-2.2.0.ebuild 3156 BLAKE2B 2c07b67cc8c71ef5d07a76c118ef4e1d2f586af3aade8f2f5452e50df53cfb3078848d930b4badb5c67f330f0c3c3f2f3dde8f02591d56ce844b4a99b0c680a8 SHA512 f70726c988e766c9c728f3ca67caf54fcd4a36e8523900c2419e4444def8aad9b56c15b1a8b7da50a1b5959857f493c1120f7c9f6bedd8f7789c2346c74f818c
+EBUILD gpac-2.2.0.ebuild 3202 BLAKE2B a9fe35ab16ee97853c5f9b7d6641983a73faad717219318ace5b8edd653b304c05cb0ab081a52d929c4a04d25993a6cc0b2d85cc765c3afe76c7504d8f43ebfd SHA512 1e37f715e1c9f9d37e82346dcd53552c6dec795f5130a0dc881b7b8fa54f66cd0be6bd131351f354720904d6765e047d445dc50a7b1d631707b0d8ea4da35899
 EBUILD gpac-9999.ebuild 3156 BLAKE2B 2c07b67cc8c71ef5d07a76c118ef4e1d2f586af3aade8f2f5452e50df53cfb3078848d930b4badb5c67f330f0c3c3f2f3dde8f02591d56ce844b4a99b0c680a8 SHA512 f70726c988e766c9c728f3ca67caf54fcd4a36e8523900c2419e4444def8aad9b56c15b1a8b7da50a1b5959857f493c1120f7c9f6bedd8f7789c2346c74f818c
 MISC metadata.xml 357 BLAKE2B d08714f001a00d250eaffef3818ed1cf0ea1dfd907799ac7f87c13d32f34106a3dc3982c24729d09c9eaec20143b68b2e966db97a061ee8a4592a8a5d20b8ab2 SHA512 7417738d0c891a1544fa25a9fe4785025e83ed7e5d498335215f70e61b3b599b17cbd9114e660fc5db4315dfeddee99a351b76ff0b801657f990827187f416c5
diff --git a/media-video/gpac/files/gpac-2.2.0-ffmpeg6-deux.patch b/media-video/gpac/files/gpac-2.2.0-ffmpeg6-deux.patch
new file mode 100644
index 000000000000..695852847395
--- /dev/null
+++ b/media-video/gpac/files/gpac-2.2.0-ffmpeg6-deux.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/903550
+
+From ba14e34dd7a3c4cef5a56962898e9f863dd4b4f3 Mon Sep 17 00:00:00 2001
+From: jeanlf <jeanlf@gpac.io>
+Date: Mon, 13 Mar 2023 09:43:52 +0100
+Subject: [PATCH] fixed compil with ffmpeg 6 - cf #2406
+
+--- a/src/filters/ff_mx.c
++++ b/src/filters/ff_mx.c
+@@ -503,7 +503,11 @@ static GF_Err ffmx_close_seg(GF_Filter *filter, GF_FFMuxCtx *ctx, Bool send_evt_
+ 		evt.seg_size.is_init = 0;
+ 	}
+ 	evt.seg_size.media_range_start = ctx->offset_at_seg_start;
++#if LIBAVFORMAT_VERSION_MAJOR >= 60
+ 	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->bytes_written-1) : 0;
++#else
++	evt.seg_size.media_range_end = ctx->muxer->pb ? (ctx->muxer->pb->written-1) : 0;
++#endif
+ 	ctx->offset_at_seg_start = evt.seg_size.media_range_end;
+
+ 	gf_filter_pid_send_event(pid, &evt);
+@@ -1013,13 +1017,21 @@ static GF_Err ffmx_configure_pid(GF_Filter *filter, GF_FilterPid *pid, Bool is_r
+ 		ff_codec_id = ffmpeg_codecid_from_gpac(codec_id, &ff_codec_tag);
+ 	}
+
++
++	res = 1;
++#if LIBAVFORMAT_VERSION_MAJOR < 60
+ 	if (ctx->muxer->oformat) {
+ 		res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, 1);
+-		if (!res) {
+-			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
+-			return GF_NOT_SUPPORTED;
+-		}
+ 	}
++#else
++	res = avformat_query_codec(ctx->muxer->oformat, ff_codec_id, FF_COMPLIANCE_NORMAL);
++#endif
++
++	if (!res) {
++		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMux] Codec %s not supported in container %s\n", gf_codecid_name(codec_id), ctx->muxer->oformat->name));
++		return GF_NOT_SUPPORTED;
++	}
++
+ 	const AVCodec *c = avcodec_find_decoder(ff_codec_id);
+ 	if (!c) return GF_NOT_SUPPORTED;
diff --git a/media-video/gpac/gpac-2.2.0.ebuild b/media-video/gpac/gpac-2.2.0.ebuild
index d8ee67521cd8..d6a91321cd56 100644
--- a/media-video/gpac/gpac-2.2.0.ebuild
+++ b/media-video/gpac/gpac-2.2.0.ebuild
@@ -66,6 +66,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.2.0-configure.patch"
 	"${FILESDIR}/${PN}-1.0.0-zlib-compile.patch"
 	"${FILESDIR}/${PN}-2.2.0-ffmpeg6.patch"
+	"${FILESDIR}/${PN}-2.2.0-ffmpeg6-deux.patch"
 )
 
 DOCS=(