From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/
Date: Mon, 10 Apr 2023 09:25:24 +0000 (UTC) [thread overview]
Message-ID: <1681118653.b489b1a671b51c3def4b4cdfdd419155caad4b73.sam@gentoo> (raw)
commit: b489b1a671b51c3def4b4cdfdd419155caad4b73
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 09:24:13 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 09:24:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b489b1a6
media-video/gpac: fix build w/ >=ffmpeg-5
Closes: https://bugs.gentoo.org/903550
Thanks-to: Andrew Udvare <audvare <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gpac/files/gpac-2.2.0-ffmpeg6-deux.patch | 46 ++++++++++++++++++++++
media-video/gpac/gpac-2.2.0.ebuild | 1 +
2 files changed, 47 insertions(+)
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=(
next reply other threads:[~2023-04-10 9:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-10 9:25 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-04-09 21:56 [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/ Ionen Wolkens
2025-03-13 4:24 Ionen Wolkens
2024-11-10 10:08 Andreas Sturmlechner
2023-03-29 16:16 Alexis Ballier
2020-09-12 21:42 Sam James
2020-09-08 22:42 Sam James
2018-05-08 18:33 Lars Wendler
2017-07-25 16:50 Steve Dibb
2017-02-24 9:00 Alexis Ballier
2015-09-16 11:47 Alexis Ballier
2015-08-22 9:20 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1681118653.b489b1a671b51c3def4b4cdfdd419155caad4b73.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox