1
0
forked from ports/opt

gst-libav: 1.22.0 -> 1.22.1

This commit is contained in:
Tim Biermann 2023-03-05 10:37:16 +01:00
parent 91c6eac309
commit 1aa808cd9b
Signed by untrusted user: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 6 additions and 56 deletions

View File

@ -1,6 +1,5 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/b8ldTo7oTTHHbA8xIN5lEQV9GlmCUonssTUYk+9BzJe0z8ql/VYKfL9K1it9HmOyCVRLdUhJsyZszBaExHREw4=
SHA256 (Pkgfile) = b46983920a18a725ce53895552d2764e89c4c278d522cb59208c3a24d3bbd4f8
RWSE3ohX2g5d/f1koU6AVf7HA3mLkRXDUXNu0mi1Lh1QGW69Js9Y5+mlrriG1spqWST+bA9ZhWDIpzerm2u24hJziONj+hdxbwM=
SHA256 (Pkgfile) = 586f09a1fbd1338bc37ec6b54b1c259ede61ed8bd262debf30eb7d4342b5b81e
SHA256 (.footprint) = 2b4603029b15032a74098cf497de9777c10b2c1d1fcca733daa90fdac79a1073
SHA256 (gst-libav-1.22.0.tar.xz) = 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1
SHA256 (233de05a98d7090092bbbc60d0c151acb22c6aa0.patch) = cd2902c48a3f08f132434ef2ff1b68c68dac2db28de55572a110c0cacbf025dc
SHA256 (gst-libav-1.22.1.tar.xz) = c958e825dc3ac3b7a481f8db5268131a1cd701312385c2d803dc63c8e460b5fb

View File

@ -1,47 +0,0 @@
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

View File

@ -4,13 +4,11 @@
# Depends on: ffmpeg gst-plugins-base
name=gst-libav
version=1.22.0
release=2
source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz
233de05a98d7090092bbbc60d0c151acb22c6aa0.patch)
version=1.22.1
release=1
source=(https://gstreamer.freedesktop.org/src/$name/$name-$version.tar.xz)
build() {
patch -Np3 -d $name-$version -i $SRC/233de05a98d7090092bbbc60d0c151acb22c6aa0.patch
meson build $name-$version \
--prefix /usr \
--libexecdir=/usr/lib \