[moc] Bugfix for building against ffmpeg 5+

commit 83c828edf8339fec935cf588dcd51907d26fc837 Author: Antonio Trande <sagitter(a)fedoraproject.org&gt; Date: Thu Jan 6 14:59:17 2022 +0100 Bugfix for building against ffmpeg 5+ moc-bugfix-ffmpeg45.patch | 10 ++++++++++ moc.spec | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) --- diff --git a/moc-bugfix-ffmpeg45.patch b/moc-bugfix-ffmpeg45.patch new file mode 100644 index 0000000..4765485 --- /dev/null +++ b/moc-bugfix-ffmpeg45.patch @@ -0,0 +1,10 @@ +--- a/decoder_plugins/ffmpeg/ffmpeg.orig.c 2020-02-19 22:47:44.000000000 +0100 ++++ b/decoder_plugins/ffmpeg/ffmpeg.c 2022-01-05 22:14:24.095941842 +0100 +@@ -39,6 +39,7 @@ + #else + # include <libavutil/audioconvert.h> + #endif ++#include <libavcodec/avcodec.h> + + /* FFmpeg also likes common names, without that, our common.h and log.h + * would not be included. */ diff --git a/moc.spec b/moc.spec index 8ef0c58..34c6f6c 100644 --- a/moc.spec +++ b/moc.spec @@ -14,7 +14,7 @@ Name: moc Summary: Music on Console - Console audio player for Linux/UNIX Version: 2.6 -Release: 0.43.svn%{checkout}%{?dist} +Release: 0.44.svn%{checkout}%{?dist} License: GPLv3+ URL: http://moc.daper.net @@ -28,6 +28,8 @@ Patch0: %{name}-r2961+lt_init-1.patch # RHBZ #1963427 Patch1: %{name}-change_private_libdir.patch +Patch2: %{name}-bugfix-ffmpeg45.patch + BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(jack) @@ -111,6 +113,9 @@ patchelf --set-rpath %{_libdir}/mocp/decoder_plugins %{buildroot}%{_bindir}/* %{_libdir}/mocp/decoder_plugins/*.so %changelog +* Wed Jan 05 2022 Antonio Trande <sagitter(a)fedoraproject.org&gt; - 2.6-0.44.svn3005 +- Bugfix for building against ffmpeg 5+ + * Fri Nov 12 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.6-0.43.svn3005 - Rebuilt for new ffmpeg snapshot