[packages/ffmpeg] Rel 2. Fix build with openapv >= 1.1 (upstream c54710db21).

[arekm]

commit a94c803e4701a0eefec965675a8c7e34da206f70
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Oct 19 10:53:47 2026 +0200

    Rel 2. Fix build with openapv >= 1.1 (upstream c54710db21).

 ffmpeg-openapv-1.1.patch | 39 +++++++++++++++++++++++++++++++++++++++
 ffmpeg.spec              |  4 +++-
 2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index fd940fd..8cc525c 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -141,7 +141,7 @@ Summary:	FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
 Version:	9.0.2
-Release:	1
+Release:	2
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # GPL: frei0r libcdio libdavs2 rubberband vidstab x264 x265 xavs xavs2 xvid
 # v3 (allows *GPLv3 or Apache-licensed libs): gmp lensfun opencore-amr vmaf vo-*enc rkmpp
@@ -152,6 +152,7 @@ Source0:	https://ffmpeg.org/releases/%{name}-%{version}.tar.xz
 # Source0-md5:	4c47fa111bd791da246ec07748ba5e04
 Patch0:		%{name}-atadenoise.patch
 Patch1:		v4l2-request-hwdec.patch
+Patch2:		%{name}-openapv-1.1.patch
 URL:		https://ffmpeg.org/
 %{?with_avisynth:BuildRequires:	AviSynthPlus-devel >= 3.7.3}
 %{?with_amf:BuildRequires:	amf-headers >= 1.5.2}
@@ -605,6 +606,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %if %{with v4l2_request}
 %patch -P1 -p1
 %endif
+%patch -P2 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
diff --git a/ffmpeg-openapv-1.1.patch b/ffmpeg-openapv-1.1.patch
new file mode 100644
index 0000000..f677de8
--- /dev/null
+++ b/ffmpeg-openapv-1.1.patch
@@ -0,0 +1,39 @@
+# upstream c54710db21c1: oapvm_create() takes a descriptor since openapv 1.1
+From c54710db21c1827dbc3e47658a562525af0fe528 Mon Sep 17 00:00:00 2001
+From: Werner Robitza <werner.robitza at gmail.com>
+Date: Thu, 24 Sep 2026 15:02:42 +0200
+Subject: [PATCH] avcodec/liboapvenc: fix build with openapv >= 1.1
+
+openapv 1.1 changed oapvm_create() to take a descriptor argument.
+This was first raised here:
+https://github.com/homebrew-ffmpeg/homebrew-ffmpeg/issues/235
+---
+ libavcodec/liboapvenc.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/libavcodec/liboapvenc.c b/libavcodec/liboapvenc.c
+index 22a8ac4890a8e..32a8cd5f1c9ac 100644
+--- a/libavcodec/liboapvenc.c
++++ b/libavcodec/liboapvenc.c
+@@ -477,6 +477,9 @@ static av_cold int liboapve_init(AVCodecContext *avctx)
+ {
+     ApvEncContext *apv = avctx->priv_data;
+     oapve_cdesc_t *cdsc = &apv->cdsc;
++#if OAPV_VER_APISET >= 1
++    oapvm_cdesc_t mcdsc = { 0 };
++#endif
+     unsigned char *bs_buf;
+     int ret;
+ 
+@@ -509,7 +512,11 @@ static av_cold int liboapve_init(AVCodecContext *avctx)
+     }
+ 
+     /* create metadata handler */
++#if OAPV_VER_APISET >= 1
++    apv->mid = oapvm_create(&mcdsc, &ret);
++#else
+     apv->mid = oapvm_create(&ret);
++#endif
+     if (apv->mid == NULL || OAPV_FAILED(ret)) {
+         av_log(avctx, AV_LOG_ERROR, "cannot create OAPV metadata handler\n");
+         return AVERROR_EXTERNAL;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/a94c803e4701a0eefec965675a8c7e34da206f70