commit b2b9f8a46267c69a0b0844d6744acf6057128ffb Author: Tim Biermann <tbier@posteo.de> Date: Fri Mar 3 18:19:34 2023 +0100 gst-libav: fixed build with ffmpeg 6.0 diff --git a/gst-libav/.signature b/gst-libav/.signature index 2c5a38cc8..c36fcf2c4 100644 --- a/gst-libav/.signature +++ b/gst-libav/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/WQGIbhQsqTVP4sCbLCQAQcF6cMBW7N60CFqRJJLND6C2ATdF3BEKhHANObIL3vScwWZvQ+WmxUmKjLuqs8EWAY= -SHA256 (Pkgfile) = f39052153df31a76423b83feae456581e06bf464f0c8fd9b438989a01e9200df +RWSE3ohX2g5d/b8ldTo7oTTHHbA8xIN5lEQV9GlmCUonssTUYk+9BzJe0z8ql/VYKfL9K1it9HmOyCVRLdUhJsyZszBaExHREw4= +SHA256 (Pkgfile) = b46983920a18a725ce53895552d2764e89c4c278d522cb59208c3a24d3bbd4f8 SHA256 (.footprint) = 2b4603029b15032a74098cf497de9777c10b2c1d1fcca733daa90fdac79a1073 SHA256 (gst-libav-1.22.0.tar.xz) = 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 +SHA256 (233de05a98d7090092bbbc60d0c151acb22c6aa0.patch) = cd2902c48a3f08f132434ef2ff1b68c68dac2db28de55572a110c0cacbf025dc diff --git a/gst-libav/233de05a98d7090092bbbc60d0c151acb22c6aa0.patch b/gst-libav/233de05a98d7090092bbbc60d0c151acb22c6aa0.patch new file mode 100644 index 000000000..ee90fd50a --- /dev/null +++ b/gst-libav/233de05a98d7090092bbbc60d0c151acb22c6aa0.patch @@ -0,0 +1,47 @@ +From 233de05a98d7090092bbbc60d0c151acb22c6aa0 Mon Sep 17 00:00:00 2001 +From: "U. Artie Eoff" <ullysses.a.eoff@intel.com> +Date: Mon, 13 Feb 2023 17:02:01 -0500 +Subject: [PATCH] avviddec: change + AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS + +This fixes a compile error with recent upstream FFmpeg. + +The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to +AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit +7d09579190de (lavc 58.132.100). + +The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream +commit 10c9a0874cb3 (lavc 59.63.100). + +Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3951> +--- + subprojects/gst-libav/ext/libav/gstavviddec.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/subprojects/gst-libav/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c +index 85e34a0c353..c215ff02f5c 100644 +--- a/subprojects/gst-libav/ext/libav/gstavviddec.c ++++ b/subprojects/gst-libav/ext/libav/gstavviddec.c +@@ -35,6 +35,10 @@ + + GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); + ++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100) ++#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS ++#endif ++ + #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15) + + #define MAX_TS_MASK 0xff +@@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, + if (ffmpegdec->max_threads == 0) { + /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal + * to one frame per thread. We thus need to calculate the thread count ourselves */ +- if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) || ++ if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) || + (ffmpegdec->context->thread_type & FF_THREAD_FRAME)) + ffmpegdec->context->thread_count = + MIN (gst_ffmpeg_auto_max_threads (), 16); +-- +GitLab + diff --git a/gst-libav/Pkgfile b/gst-libav/Pkgfile index fecbe0436..f7714ae05 100644 --- a/gst-libav/Pkgfile +++ b/gst-libav/Pkgfile @@ -1,21 +1,23 @@ # Description: Gstreamer libav Plugin. # URL: https://gstreamer.freedesktop.org/modules/gst-libav.html -# Maintainer: Danny Rawlins, crux at romster dot me +# Maintainer: Tim Biermann, tbier at posteo dot de # Depends on: ffmpeg gst-plugins-base name=gst-libav version=1.22.0 -release=1 -source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz) +release=2 +source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz + 233de05a98d7090092bbbc60d0c151acb22c6aa0.patch) build() { - meson build $name-$version \ - --prefix /usr \ - --libexecdir=/usr/lib \ - -D buildtype=plain \ - -D package-name="GStreamer (CRUX Linux)" \ - -D package-origin="https://crux.nu/" + patch -Np3 -d $name-$version -i $SRC/233de05a98d7090092bbbc60d0c151acb22c6aa0.patch + meson build $name-$version \ + --prefix /usr \ + --libexecdir=/usr/lib \ + -D buildtype=plain \ + -D package-name="GStreamer (CRUX Linux)" \ + -D package-origin="https://crux.nu/" - meson compile -C build -j ${JOBS:-1} - DESTDIR=$PKG meson install -C build + meson compile -C build -j ${JOBS:-1} + DESTDIR=$PKG meson install -C build }