[rpms/alsa-plugins] f45: Use upstream FFmpeg 9 build fix

[rpms/alsa-plugins] f45: Use upstream FFmpeg 9 build fix

[Jaroslav Kysela]

A new commit has been pushed.

Repo   : rpms/alsa-plugins
Branch : f45
Commit : 85c32a08a7c75536011536f7d3b36995c4129e90
Author : Jaroslav Kysela <perex@perex.cz>
Date   : 2026-09-03T14:53:54+02:00
Stats  : +45/-18 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/alsa-plugins/c/85c32a08a7c75536011536f7d3b36995c4129e90?branch=f45

Log:
Use upstream FFmpeg 9 build fix

---
diff --git a/alsa-git.patch b/alsa-git.patch
index e69de29..edfc702 100644
--- a/alsa-git.patch
+++ b/alsa-git.patch
@@ -0,0 +1,41 @@
+From eef274dbc890a21c2400c8bffdcbda243782627d Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Thu, 3 Sep 2026 14:38:05 +0200
+Subject: [PATCH] a52 plugin: AVSampleFormat fix for FFMPEG 9
+
+Fixes: https://github.com/alsa-project/alsa-plugins/issues/64
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ a52/pcm_a52.c | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
+index cd56abb..bbd4f54 100644
+--- a/a52/pcm_a52.c
++++ b/a52/pcm_a52.c
+@@ -1202,7 +1202,22 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52)
+ 	rec->io.flags = SND_PCM_IOPLUG_FLAG_BOUNDARY_WA;
+ #endif
+ #ifdef USE_AVCODEC_FRAME
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 13, 100)
++	{
++		const enum AVSampleFormat *sample_fmts = NULL;
++		err = avcodec_get_supported_config(NULL, rec->codec,
++						   AV_CODEC_CONFIG_SAMPLE_FORMAT,
++						   0, (const void **)&sample_fmts,
++						   NULL);
++		if (err < 0 || !sample_fmts) {
++			err = -EINVAL;
++			goto error;
++		}
++		rec->av_format = sample_fmts[0];
++	}
++#else
+ 	rec->av_format = rec->codec->sample_fmts[0];
++#endif
+ 	rec->is_planar = av_sample_fmt_is_planar(rec->av_format);
+ #else
+ 	rec->av_format = AV_SAMPLE_FMT_S16;
+-- 
+2.55.0
+

diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index deabbbc..e668a1b 100644
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -10,7 +10,7 @@
 
 Name:           alsa-plugins
 Version:        1.2.12
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPL-2.1-or-later with the exception of samplerate
 # which is GPL-2.0-or-later, pph plugin is BSD-3-Clause licensed
@@ -18,9 +18,6 @@ License:        GPL-2.0-or-later and LGPL-2.1-or-later and BSD-3-Clause
 URL:            http://www.alsa-project.org/
 Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
 Patch0:         alsa-git.patch
-# Fix build with FFmpeg 9
-# https://github.com/alsa-project/alsa-plugins/issues/64
-Patch1:         https://gitlab.archlinux.org/archlinux/packaging/packages/alsa-plugins/-/raw/7f250af93b76e9b3d552af509beb8ea1356114d1/ffmpeg9.patch
 
 BuildRequires:  autoconf automake libtool
 BuildRequires:  make
@@ -347,6 +344,9 @@ find %{buildroot} -name "*.la" -delete
 %endif
 
 %changelog
+* Thu Sep  3 2026 Jaroslav Kysela <perex@perex.cz> - 1.2.12-10
+- Move to upstream FFmpeg 9 compilation fix
+
 * Tue Aug 18 2026 Dominik Mierzejewski <dominik@greysector.net> - 1.2.12-9
 - Fixed build with FFmpeg 9
 

diff --git a/ffmpeg9.patch b/ffmpeg9.patch
deleted file mode 100644
index 664f7f0..0000000
--- a/ffmpeg9.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru alsa-plugins-1.2.12.orig/a52/pcm_a52.c alsa-plugins-1.2.12/a52/pcm_a52.c
---- alsa-plugins-1.2.12.orig/a52/pcm_a52.c	2026-08-05 11:55:24.343137446 +0200
-+++ alsa-plugins-1.2.12/a52/pcm_a52.c	2026-08-05 11:57:53.916162117 +0200
-@@ -1202,7 +1202,9 @@
- 	rec->io.flags = SND_PCM_IOPLUG_FLAG_BOUNDARY_WA;
- #endif
- #ifdef USE_AVCODEC_FRAME
--	rec->av_format = rec->codec->sample_fmts[0];
-+	const enum AVSampleFormat *codec_sample_fmts = NULL;
-+	avcodec_get_supported_config(NULL, rec->codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, (const void**)&codec_sample_fmts, NULL);
-+	rec->av_format = codec_sample_fmts[0];
- 	rec->is_planar = av_sample_fmt_is_planar(rec->av_format);
- #else
- 	rec->av_format = AV_SAMPLE_FMT_S16;