12:40 p.m.
commit 08c92d47d24873dcdde6ece962f678dfa2e48e65
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Mar 13 12:40:16 2021 +0000
Update to latest svn
.gitignore | 1 +
...ecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch | 46 ----------------------
...odecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch | 34 ----------------
0003-codecs.conf-Bump-version.patch | 38 ------------------
mplayer-ffmpeg.patch | 2 +-
mplayer-manlinks.patch | 13 +++---
mplayer-snapshot.sh | 4 +-
...-7ba6fc7408b5fb46c698e17471d12dd53d5685ec.patch | 37 -----------------
mplayer.spec | 30 ++++++--------
sources | 3 +-
10 files changed, 24 insertions(+), 184 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fcb93d8..579eb64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ MPlayer-1.3.0.tar.xz
/mplayer-export-2018-06-20.tar.bz2
/mplayer-export-2019-04-16.tar.bz2
/MPlayer-1.4.tar.xz
+/mplayer-export-2021-03-13.tar.xz
diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch
index 947339e..c1c1754 100644
--- a/mplayer-ffmpeg.patch
+++ b/mplayer-ffmpeg.patch
@@ -6,7 +6,7 @@ diff -up mplayer-export-2015-05-05/Makefile.ffmpeg
mplayer-export-2015-05-05/Mak
codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML
codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h
help_mp.h
- $(HOST_CC) $(HOSTCFLAGS) -o $@ $<
-+ $(HOST_CC) $(HOSTCFLAGS) $(CFLAGS)-o $@ $<
++ $(HOST_CC) $(HOSTCFLAGS) $(CFLAGS) -o $@ $<
codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
./$^ > $@
diff --git a/mplayer-manlinks.patch b/mplayer-manlinks.patch
index c7a6542..f315231 100644
--- a/mplayer-manlinks.patch
+++ b/mplayer-manlinks.patch
@@ -1,7 +1,6 @@
-diff -up mplayer-export-2009-10-29/Makefile.manlinks mplayer-export-2009-10-29/Makefile
---- mplayer-export-2009-10-29/Makefile.manlinks 2009-10-19 11:56:18.000000000 +0200
-+++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:42:36.000000000 +0100
-@@ -922,10 +922,10 @@ install-mencoder-man: $(foreach lang,$(M
+--- a/Makefile
++++ b/Makefile
+@@ -880,10 +880,10 @@ install-mencoder-man: $(foreach lang,$(M
install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
install-gui-man-en: install-mplayer-man-en
@@ -14,7 +13,7 @@ diff -up mplayer-export-2009-10-29/Makefile.manlinks
mplayer-export-2009-10-29/M
install-mplayer-man-en:
$(INSTALL) -d $(MANDIR)/man1
-@@ -933,12 +933,12 @@ install-mplayer-man-en:
+@@ -897,7 +897,7 @@ endef
define GUI_MAN_RULE
install-gui-man-$(lang): install-mplayer-man-$(lang)
@@ -22,6 +21,9 @@ diff -up mplayer-export-2009-10-29/Makefile.manlinks
mplayer-export-2009-10-29/M
+ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1
endef
+ define GUI_MSG_RULE
+@@ -908,7 +908,7 @@ endef
+
define MENCODER_MAN_RULE
install-mencoder-man-$(lang): install-mplayer-man-$(lang)
- cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1
@@ -29,4 +31,3 @@ diff -up mplayer-export-2009-10-29/Makefile.manlinks
mplayer-export-2009-10-29/M
endef
define MPLAYER_MAN_RULE
-E
diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh
index c29b101..55730b7 100755
--- a/mplayer-snapshot.sh
+++ b/mplayer-snapshot.sh
@@ -13,7 +13,7 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-svn=2019-04-16
+#svn=2019-04-16
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
@@ -26,5 +26,5 @@ svn_revision=`LC_ALL=C svn info 2> /dev/null | grep Revision | cut
-d' ' -f2`
sed -i -e 's/\(SVN-r[0-9]* \)/\1rpmfusion /' -e
"s/UNKNOWN/SVN-r$svn_revision/" version.sh
find . -type d -name .svn -print0 | xargs -0r rm -rf
cd ..
-tar jcf "$pwd"/$dirname.tar.bz2 $dirname
+tar Jcf "$pwd"/$dirname.tar.xz $dirname
cd - >/dev/null
diff --git a/mplayer.spec b/mplayer.spec
index 466863f..b0d843b 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -3,16 +3,16 @@
%endif
%define codecdir %{_libdir}/codecs
-#define pre 20190416svn
-#define svn 1
-#define svnbuild 2019-04-16
+%define pre 20210313svn
+%define svn 1
+%define svnbuild 2021-03-13
Name: mplayer
-Version: 1.4
+Version: 1.4.1
%if 0%{?svn}
-Release: 15{?pre:.%{pre}}%{?dist}
+Release: 0.1%{?pre:.%{pre}}%{?dist}
%else
-Release: 15%{?dist}
+Release: 2%{?dist}
%endif
Summary: Movie player playing most video formats and DVDs
@@ -24,7 +24,7 @@ License: GPLv2+
URL: https://www.mplayerhq.hu/
%if 0%{?svn}
# run ./mplayer-snapshot.sh to get this
-Source0: mplayer-export-%{svnbuild}.tar.bz2
+Source0: mplayer-export-%{svnbuild}.tar.xz
%else
Source0:
https://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz
%endif
@@ -35,12 +35,7 @@ Patch0: %{name}-config.patch
# use roff include statements instead of symlinks
Patch1: %{name}-manlinks.patch
# use system FFmpeg libraries
-Patch3: %{name}-ffmpeg.patch
-
-Patch4: 0001-codecs.conf-Add-AV1-decoder-dav1d-via-FFmpeg.patch
-Patch5: 0002-codecs.conf-Add-AOM-AV1-decoder-via-FFmpeg.patch
-Patch6: 0003-codecs.conf-Bump-version.patch
-Patch7: mplayer.git-7ba6fc7408b5fb46c698e17471d12dd53d5685ec.patch
+Patch2: %{name}-ffmpeg.patch
BuildRequires: SDL-devel
BuildRequires: a52dec-devel
@@ -232,11 +227,7 @@ rm -rf ffmpeg
%endif
%patch0 -p1 -b .config
%patch1 -p1 -b .manlinks
-%patch3 -p1 -b .ffmpeg
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch2 -p1 -b .ffmpeg
mkdir GUI
cp -a `ls -1|grep -v GUI` GUI/
@@ -385,6 +376,9 @@ fi
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Mar 13 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.4.1-0.1.20210313svn
+- Update to latest svn
+
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
1.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/sources b/sources
index 0c02274..f957e38 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2
-58d39f72bf7f3ddaa9e019224bffcb74 MPlayer-1.4.tar.xz
+SHA512 (mplayer-export-2021-03-13.tar.xz) =
d9a423e7d4ef8346f5944e8f0aab0dea4415aa85ff0fea0ff119fdbd48c1a7c683bd5e17f3efc1b7d3bced50466584456de615e2d312019958beabcc0694b4fe