commit 258d4c202fa22ef2a4d26dae3e64b453472ee07c Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Fri Jan 19 13:12:11 2018 +0000 Update to latest svn .gitignore | 1 + mplayer-add-include_vdpau_x11.patch | 23 ----------------------- mplayer-fix-screenshot-crash.patch | 26 -------------------------- mplayer-fix-vo_png.patch | 24 ------------------------ mplayer-snapshot.sh | 2 +- mplayer.spec | 25 ++++++++----------------- sources | 2 +- 7 files changed, 11 insertions(+), 92 deletions(-) --- diff --git a/.gitignore b/.gitignore index 53fe950..58f1b5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Blue-1.11.tar.bz2 MPlayer-1.3.0.tar.xz +/mplayer-export-2018-01-19.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 7273dbb..f7fc3f8 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2015-05-05 +svn=2018-01-19 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 341e90e..c34dc27 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,15 +1,15 @@ %define codecdir %{_libdir}/codecs -#define pre 20150505svn -#define svn 1 -#define svnbuild 2015-05-05 +%define pre 20180119svn +%define svn 1 +%define svnbuild 2018-01-19 %define faad2min 1:2.6.1 Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 45.%{?pre}%{?dist} +Release: 46.%{?pre}%{?dist} %else -Release: 15%{?dist} +Release: 16%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -33,15 +33,6 @@ Patch0: %{name}-config.patch Patch1: %{name}-manlinks.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch -# Fix screenshot crash -# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4391 -# Patch is from an upstream svn commit -Patch4: %{name}-fix-screenshot-crash.patch -# Fix vo_png with recent ffmpeg -# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4470 -# Patch is from an upstream svn commit -Patch5: %{name}-fix-vo_png.patch -Patch6: %{name}-add-include_vdpau_x11.patch ExcludeArch: %{ix86} @@ -237,9 +228,6 @@ rm -rf ffmpeg %patch0 -p1 -b .config %patch1 -p1 -b .manlinks %patch3 -p1 -b .ffmpeg -%patch4 -p1 -b .screenshot -%patch5 -p1 -b .vo_png -%patch6 -p1 -b .vdpau_x11 mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -395,6 +383,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Fri Jan 19 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.3.0-46.20180119svn +- Update to latest svn + * Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1.3.0-15 - Rebuilt for ffmpeg-3.5 git diff --git a/sources b/sources index 2e566ea..535cb24 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 -e8a4d77ad4f509e81dd5e13b51636c1d MPlayer-1.3.0.tar.xz +72d9ed506f0273a8943d5d02d5e79a82 mplayer-export-2018-01-19.tar.bz2