[mplayer] Use compat-ffmpeg4 as mplayer doesn't support ffmpeg-6.0 (rfbz#6692)
commit dca036052d2f9c7d16ce6ffdb58ccf8ec6d4f986
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue May 30 15:59:18 2023 +0100
Use compat-ffmpeg4 as mplayer doesn't support ffmpeg-6.0 (rfbz#6692)
.gitignore | 1 +
mplayer.spec | 20 ++++++++++++--------
sources | 2 +-
3 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ade46c4..77d381c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ MPlayer-1.3.0.tar.xz
/MPlayer-1.5.tar.xz
/mplayer-export-2022-07-26.tar.xz
/mplayer-export-2023-02-28.tar.xz
+/mplayer-export-2023-05-30.tar.xz
diff --git a/mplayer.spec b/mplayer.spec
index bf44876..f6ce134 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -3,16 +3,16 @@
%endif
%global codecdir %{_libdir}/codecs
-%global pre 20230228svn
+%global pre 20230530svn
%global svn 1
-%global svnbuild 2023-02-28
+%global svnbuild 2023-05-30
Name: mplayer
Version: 1.5.1
%if 0%{?svn}
-Release: 0.4%{?pre:.%{pre}}%{?dist}
+Release: 0.5%{?pre:.%{pre}}%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -44,7 +44,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: bzip2-devel
BuildRequires: desktop-file-utils
BuildRequires: enca-devel
-BuildRequires: ffmpeg-devel >= 0.10
+BuildRequires: compat-ffmpeg4-devel
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.9
BuildRequires: fribidi-devel
@@ -228,9 +228,9 @@ This package contains various scripts from MPlayer TOOLS directory.
%setup -q -n MPlayer-%{version}%{?pre}
rm -rf ffmpeg
%endif
-%patch0 -p1 -b .config
-%patch1 -p1 -b .manlinks
-%patch2 -p1 -b .ffmpeg
+%patch -P 0 -p1 -b .config
+%patch -P 1 -p1 -b .manlinks
+%patch -P 2 -p1 -b .ffmpeg
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -241,6 +241,7 @@ sed -i '1s=^#! */usr/bin/\(python\|env
python\)[23]\?=#!%{__python3}=' TOOLS/{mp
pushd GUI
export CC=gcc
export CXX=g++
+export PKG_CONFIG_PATH="%{_libdir}/compat-ffmpeg4/pkgconfig/"
%{mp_configure}--enable-gui --disable-mencoder
%make_build V=1
@@ -381,6 +382,9 @@ fi
%{_datadir}/mplayer/*.fp
%changelog
+* Tue May 30 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1.5.1-0.5.20230530svn
+- Use compat-ffmpeg4 as mplayer doesn't support ffmpeg-6.0 (rfbz#6692)
+
* Tue Feb 28 2023 Leigh Scott <leigh123linux(a)gmail.com> - 1.5.1-0.4.20230228svn
- Rebuild for new ffmpeg
diff --git a/sources b/sources
index fcd520a..258c4a5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (mplayer-export-2023-02-28.tar.xz) =
5e4380f0e5e6a3167978ada45811fbd685f87cdf715ab34eacaaa32f08941e686dbf35608d4757fa92945e0db6caf82f3fdedb021c217fcfafc8167397de626c
+SHA512 (mplayer-export-2023-05-30.tar.xz) =
25b7932975365484fb1e7a3c50f52d0adf7da5572f8a6dcdde4f27f2fa961e6a0310b696fc92a24ae65a5508193b7cf3cda46b46cc4d4968314c6dcf08e9238f
SHA512 (Blue-1.11.tar.bz2) =
88fbe7af71acaff50a6fab61c6d52095e155ab9842543bda3505c8c14ac95985748f67c2753e249e4aea35eb6deda568cf8b831a75bcfd1394dd029ff32a9267