From cdfbd1cd8e1f556d77964e69b5f9694e8b809642 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sun, 12 Jan 2014 18:55:50 +0000 Subject: [PATCH 01/54] * Sun Jan 12 2014 Julian Sikorski - 1.1-18.20140111svn - 20140111 snapshot --- .gitignore | 2 +- mplayer-snapshot.sh | 2 +- mplayer.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 7251671..154ef40 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -mplayer-export-2013-11-25.tar.bz2 +mplayer-export-2014-01-11.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index ba0e635..f939aef 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2013-11-25 +svn=2014-01-11 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index f4a2791..6da03d8 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20131125svn +%define pre 20140111svn %define svn 1 -%define svnbuild 2013-11-25 +%define svnbuild 2014-01-11 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 17.%{?pre}%{?dist} +Release: 18.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sun Jan 12 2014 Julian Sikorski - 1.1-18.20140111svn +- 20140111 snapshot + * Tue Jan 07 2014 Nicolas Chauvet - 1.1-17.20131125svn - Rebuilt for librtmp diff --git a/sources b/sources index d99b86a..ef1e028 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -aa6b4d94d1d39b046ef1237f90870fa4 mplayer-export-2013-11-25.tar.bz2 +7a48fbb0cedc6dcec6bc32869f6a7003 mplayer-export-2014-01-11.tar.bz2 From 8234b2ebc27d80caab8e2eb0a50152b822c3a1a8 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Wed, 15 Jan 2014 20:40:04 +0000 Subject: [PATCH 02/54] Patched to allow building with -Werror=format-security --- mplayer-format-security.patch | 24 ++++++++++++++++++++++++ mplayer.spec | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 mplayer-format-security.patch diff --git a/mplayer-format-security.patch b/mplayer-format-security.patch new file mode 100644 index 0000000..4931a7b --- /dev/null +++ b/mplayer-format-security.patch @@ -0,0 +1,24 @@ +diff -up mplayer-export-2014-01-11/gui/interface.c.format-security mplayer-export-2014-01-11/gui/interface.c +--- mplayer-export-2014-01-11/gui/interface.c.format-security 2014-01-12 17:09:19.000000000 +0100 ++++ mplayer-export-2014-01-11/gui/interface.c 2014-01-15 21:38:14.805772554 +0100 +@@ -1183,7 +1183,7 @@ void gmp_msg(int mod, int lev, const cha + vsnprintf(msg, sizeof(msg), format, va); + va_end(va); + +- mp_msg(mod, lev, msg); ++ mp_msg(mod, lev, "%s", msg); + + if (mp_msg_test(mod, lev)) + gtkMessageBox(MSGBOX_FATAL, msg); +diff -up mplayer-export-2014-01-11/stream/stream_radio.c.format-security mplayer-export-2014-01-11/stream/stream_radio.c +--- mplayer-export-2014-01-11/stream/stream_radio.c.format-security 2014-01-12 17:09:18.000000000 +0100 ++++ mplayer-export-2014-01-11/stream/stream_radio.c 2014-01-15 21:38:14.805772554 +0100 +@@ -1138,7 +1138,7 @@ static int open_s(stream_t *stream,int m + mp_msg(MSGT_RADIO,MSGL_V,"\n"); + + if(priv->driver) +- mp_msg(MSGT_RADIO, MSGL_INFO, priv->driver->info); ++ mp_msg(MSGT_RADIO, MSGL_INFO, "%s", priv->driver->info); + else{ + mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_DriverUnknownStr,priv->radio_param->driver); + close_s(stream); diff --git a/mplayer.spec b/mplayer.spec index 6da03d8..3ed96b5 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -31,6 +31,7 @@ Patch1: %{name}-manlinks.patch Patch2: %{name}-nodvdcss.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch +Patch4: %{name}-format-security.patch BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -225,6 +226,7 @@ rm -rf ffmpeg libdvdcss libdvdnav libdvdread4 %patch1 -p1 -b .manlinks %patch2 -p1 -b .nodvdcss %patch3 -p1 -b .ffmpeg +%patch4 -p1 -b .format-security mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ From 09109eaad00f4f7a80947c6b26bf7dba760d8b20 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Tue, 11 Feb 2014 17:29:59 +0000 Subject: [PATCH 03/54] * Tue Feb 11 2014 Julian Sikorski - 1.1-19.20140211svn - 20140211 snapshot --- mplayer-format-security.patch | 24 ------------------------ mplayer-snapshot.sh | 2 +- mplayer.spec | 13 +++++++------ 3 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 mplayer-format-security.patch diff --git a/mplayer-format-security.patch b/mplayer-format-security.patch deleted file mode 100644 index 4931a7b..0000000 --- a/mplayer-format-security.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up mplayer-export-2014-01-11/gui/interface.c.format-security mplayer-export-2014-01-11/gui/interface.c ---- mplayer-export-2014-01-11/gui/interface.c.format-security 2014-01-12 17:09:19.000000000 +0100 -+++ mplayer-export-2014-01-11/gui/interface.c 2014-01-15 21:38:14.805772554 +0100 -@@ -1183,7 +1183,7 @@ void gmp_msg(int mod, int lev, const cha - vsnprintf(msg, sizeof(msg), format, va); - va_end(va); - -- mp_msg(mod, lev, msg); -+ mp_msg(mod, lev, "%s", msg); - - if (mp_msg_test(mod, lev)) - gtkMessageBox(MSGBOX_FATAL, msg); -diff -up mplayer-export-2014-01-11/stream/stream_radio.c.format-security mplayer-export-2014-01-11/stream/stream_radio.c ---- mplayer-export-2014-01-11/stream/stream_radio.c.format-security 2014-01-12 17:09:18.000000000 +0100 -+++ mplayer-export-2014-01-11/stream/stream_radio.c 2014-01-15 21:38:14.805772554 +0100 -@@ -1138,7 +1138,7 @@ static int open_s(stream_t *stream,int m - mp_msg(MSGT_RADIO,MSGL_V,"\n"); - - if(priv->driver) -- mp_msg(MSGT_RADIO, MSGL_INFO, priv->driver->info); -+ mp_msg(MSGT_RADIO, MSGL_INFO, "%s", priv->driver->info); - else{ - mp_msg(MSGT_RADIO, MSGL_INFO, MSGTR_RADIO_DriverUnknownStr,priv->radio_param->driver); - close_s(stream); diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index f939aef..fa87ac9 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-01-11 +svn=2014-02-11 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 3ed96b5..59d9a42 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140111svn +%define pre 20140211svn %define svn 1 -%define svnbuild 2014-01-11 +%define svnbuild 2014-02-11 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 18.%{?pre}%{?dist} +Release: 19.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -31,7 +31,6 @@ Patch1: %{name}-manlinks.patch Patch2: %{name}-nodvdcss.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch -Patch4: %{name}-format-security.patch BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -112,7 +111,7 @@ RoQ, and PVA files. You can also use it to watch VCDs, SVCDs, DVDs, It supports a wide range of output drivers including X11, XVideo, DGA, OpenGL, SVGAlib, fbdev, AAlib, DirectFB etc. There are also nice antialiased shaded subtitles and OSD. -Non-default rpmbuild options: +The following on-default rpmbuild options are available: --with samba: Enable Samba (smb://) support --with xmms: Enable XMMS input plugin support --without amr: Disable AMR support @@ -226,7 +225,6 @@ rm -rf ffmpeg libdvdcss libdvdnav libdvdread4 %patch1 -p1 -b .manlinks %patch2 -p1 -b .nodvdcss %patch3 -p1 -b .ffmpeg -%patch4 -p1 -b .format-security mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -382,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Tue Feb 11 2014 Julian Sikorski - 1.1-19.20140211svn +- 20140211 snapshot + * Sun Jan 12 2014 Julian Sikorski - 1.1-18.20140111svn - 20140111 snapshot From 5d4b9b6a3d6f86d074eac031cb7fbc99c7d0f918 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Tue, 11 Feb 2014 17:32:45 +0000 Subject: [PATCH 04/54] Uploaded correct sources --- .gitignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 154ef40..192b03f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -mplayer-export-2014-01-11.tar.bz2 +mplayer-export-2014-02-11.tar.bz2 diff --git a/sources b/sources index ef1e028..e66f34f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -7a48fbb0cedc6dcec6bc32869f6a7003 mplayer-export-2014-01-11.tar.bz2 +6888d412884a24084118e82d78814420 mplayer-export-2014-02-11.tar.bz2 From d6fc5898c4c5a3f402102e48d7297805c1a09e39 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 1 Mar 2014 07:19:49 +0000 Subject: [PATCH 05/54] * Sat Mar 01 2014 Julian Sikorski - 1.1-20.20140301svn - 20140301 snapshot --- .gitignore | 2 +- mplayer-ffmpeg.patch | 37 ++++++++++++++----------------------- mplayer-snapshot.sh | 2 +- mplayer.spec | 9 ++++++--- sources | 2 +- 5 files changed, 23 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 192b03f..1eebdd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -mplayer-export-2014-02-11.tar.bz2 +mplayer-export-2014-03-01.tar.bz2 diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch index 0e5dd6e..8e7520c 100644 --- a/mplayer-ffmpeg.patch +++ b/mplayer-ffmpeg.patch @@ -1,7 +1,7 @@ -diff -up mplayer-export-2013-08-01/configure.ffmpeg mplayer-export-2013-08-01/configure ---- mplayer-export-2013-08-01/configure.ffmpeg 2013-08-01 12:37:20.815714081 +0200 -+++ mplayer-export-2013-08-01/configure 2013-08-01 12:37:20.817714096 +0200 -@@ -6987,7 +6987,7 @@ elif test "$ffmpeg_so" = auto ; then +diff -up mplayer-export-2014-03-01/configure.ffmpeg mplayer-export-2014-03-01/configure +--- mplayer-export-2014-03-01/configure.ffmpeg 2014-03-01 11:25:45.356757774 +0100 ++++ mplayer-export-2014-03-01/configure 2014-03-01 11:25:45.359757607 +0100 +@@ -7082,7 +7082,7 @@ if test "$ffmpeg_so" = auto ; then inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil) ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil) header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp && @@ -10,18 +10,9 @@ diff -up mplayer-export-2013-08-01/configure.ffmpeg mplayer-export-2013-08-01/co elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil" ffmpeg_so=yes -@@ -7696,7 +7696,7 @@ if test "$_gui" = yes ; then - - # Required libraries - if test "$ffmpeg" != yes || -- ! echo $libavdecoders | grep -q PNG_DECODER ; then -+ ! cat $_libdir/pkgconfig/libavcodec.pc | grep -q lz ; then - die "The GUI requires libavcodec with PNG support (needs zlib)." - fi - test "$_freetype" = no && test "$_bitmap_font" = no && -diff -up mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h ---- mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg 2013-08-01 12:37:20.818714103 +0200 -+++ mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h 2013-08-01 12:37:20.818714103 +0200 +diff -up mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h +--- mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100 ++++ mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h 2014-03-01 11:25:45.359757607 +0100 @@ -0,0 +1,32 @@ +/* + * copyright (c) 2001 Fabrice Bellard @@ -55,9 +46,9 @@ diff -up mplayer-export-2013-08-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer- +} AVCodecTag; + +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h ---- mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg 2013-08-01 12:37:20.818714103 +0200 -+++ mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h 2013-08-01 12:39:29.232657100 +0200 +diff -up mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h +--- mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100 ++++ mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h 2014-03-01 11:25:45.359757607 +0100 @@ -0,0 +1,112 @@ +/* + * copyright (c) 2006 Michael Niedermayer @@ -171,10 +162,10 @@ diff -up mplayer-export-2013-08-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-exp +#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) + +#endif /* AVUTIL_X86_ASM_H */ -diff -up mplayer-export-2013-08-01/Makefile.ffmpeg mplayer-export-2013-08-01/Makefile ---- mplayer-export-2013-08-01/Makefile.ffmpeg 2013-08-01 12:37:20.815714081 +0200 -+++ mplayer-export-2013-08-01/Makefile 2013-08-01 12:37:20.818714103 +0200 -@@ -775,7 +775,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): +diff -up mplayer-export-2014-03-01/Makefile.ffmpeg mplayer-export-2014-03-01/Makefile +--- mplayer-export-2014-03-01/Makefile.ffmpeg 2014-03-01 11:25:45.357757718 +0100 ++++ mplayer-export-2014-03-01/Makefile 2014-03-01 11:25:45.360757551 +0100 +@@ -776,7 +776,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING 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 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index fa87ac9..43fce60 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-02-11 +svn=2014-03-01 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 59d9a42..636a477 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140211svn +%define pre 20140301svn %define svn 1 -%define svnbuild 2014-02-11 +%define svnbuild 2014-03-01 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 19.%{?pre}%{?dist} +Release: 20.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Mar 01 2014 Julian Sikorski - 1.1-20.20140301svn +- 20140301 snapshot + * Tue Feb 11 2014 Julian Sikorski - 1.1-19.20140211svn - 20140211 snapshot diff --git a/sources b/sources index e66f34f..3ce531c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -6888d412884a24084118e82d78814420 mplayer-export-2014-02-11.tar.bz2 +5048b11765630664508888bdce26244f mplayer-export-2014-03-01.tar.bz2 From 59c497433f08ada3993e55e378f36f0a5ed63c20 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 6 Mar 2014 09:18:39 +0000 Subject: [PATCH 06/54] * Thu Mar 06 2014 Nicolas Chauvet - 1.1-21.20140301svn - Rebuilt for x264 --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index 636a477..4e300c3 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -6,7 +6,7 @@ Name: mplayer Version: 1.1 -Release: 20.%{?pre}%{?dist} +Release: 21.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Mar 06 2014 Nicolas Chauvet - 1.1-21.20140301svn +- Rebuilt for x264 + * Sat Mar 01 2014 Julian Sikorski - 1.1-20.20140301svn - 20140301 snapshot From 4980e97358597d335d6846608d88b52d4d944052 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Tue, 18 Mar 2014 03:06:26 +0000 Subject: [PATCH 07/54] * Tue Mar 18 2014 Julian Sikorski - 1.1-22.20140301svn - Rebuilt for x264 --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index 4e300c3..dc21424 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -6,7 +6,7 @@ Name: mplayer Version: 1.1 -Release: 21.%{?pre}%{?dist} +Release: 22.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Tue Mar 18 2014 Julian Sikorski - 1.1-22.20140301svn +- Rebuilt for x264 + * Thu Mar 06 2014 Nicolas Chauvet - 1.1-21.20140301svn - Rebuilt for x264 From a45fcc28d6a35274d3222daf213138fc57922ab3 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Fri, 21 Mar 2014 02:29:03 +0000 Subject: [PATCH 08/54] * Fri Mar 21 2014 Julian Sikorski - 1.1-23.20140301svn - Rebuilt for libass-0.10.2 --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index dc21424..5f0fa62 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -6,7 +6,7 @@ Name: mplayer Version: 1.1 -Release: 22.%{?pre}%{?dist} +Release: 23.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Fri Mar 21 2014 Julian Sikorski - 1.1-23.20140301svn +- Rebuilt for libass-0.10.2 + * Tue Mar 18 2014 Julian Sikorski - 1.1-22.20140301svn - Rebuilt for x264 From cead68989f67f2cb1425744fcefc126abb117702 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 27 Mar 2014 02:54:47 +0000 Subject: [PATCH 09/54] * Thu Mar 27 2014 Julian Sikorski - 1.1-24.20140327svn - 20140327 snapshot --- .gitignore | 2 +- mplayer-ffmpeg.patch | 30 +++++++++--------------------- mplayer-snapshot.sh | 2 +- mplayer.spec | 9 ++++++--- sources | 2 +- 5 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 1eebdd4..93af61e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.8.tar.bz2 -mplayer-export-2014-03-01.tar.bz2 +mplayer-export-2014-03-27.tar.bz2 diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch index 8e7520c..27c6228 100644 --- a/mplayer-ffmpeg.patch +++ b/mplayer-ffmpeg.patch @@ -1,18 +1,6 @@ -diff -up mplayer-export-2014-03-01/configure.ffmpeg mplayer-export-2014-03-01/configure ---- mplayer-export-2014-03-01/configure.ffmpeg 2014-03-01 11:25:45.356757774 +0100 -+++ mplayer-export-2014-03-01/configure 2014-03-01 11:25:45.359757607 +0100 -@@ -7082,7 +7082,7 @@ if test "$ffmpeg_so" = auto ; then - inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil) - ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil) - header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp && -- extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes -+ extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes && extra_cflags="$extra_cflags $inc_ffmpeg" - elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then - extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil" - ffmpeg_so=yes -diff -up mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h ---- mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100 -+++ mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h 2014-03-01 11:25:45.359757607 +0100 +diff -up mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h +--- mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h.ffmpeg 2014-03-27 07:31:02.816463722 +0100 ++++ mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h 2014-03-27 07:31:02.816463722 +0100 @@ -0,0 +1,32 @@ +/* + * copyright (c) 2001 Fabrice Bellard @@ -46,9 +34,9 @@ diff -up mplayer-export-2014-03-01/ffmpeg/libavformat/internal.h.ffmpeg mplayer- +} AVCodecTag; + +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h ---- mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg 2014-03-01 11:25:45.359757607 +0100 -+++ mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h 2014-03-01 11:25:45.359757607 +0100 +diff -up mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h +--- mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg 2014-03-27 07:31:02.816463722 +0100 ++++ mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h 2014-03-27 07:31:02.816463722 +0100 @@ -0,0 +1,112 @@ +/* + * copyright (c) 2006 Michael Niedermayer @@ -162,9 +150,9 @@ diff -up mplayer-export-2014-03-01/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-exp +#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) + +#endif /* AVUTIL_X86_ASM_H */ -diff -up mplayer-export-2014-03-01/Makefile.ffmpeg mplayer-export-2014-03-01/Makefile ---- mplayer-export-2014-03-01/Makefile.ffmpeg 2014-03-01 11:25:45.357757718 +0100 -+++ mplayer-export-2014-03-01/Makefile 2014-03-01 11:25:45.360757551 +0100 +diff -up mplayer-export-2014-03-27/Makefile.ffmpeg mplayer-export-2014-03-27/Makefile +--- mplayer-export-2014-03-27/Makefile.ffmpeg 2014-03-27 07:31:02.814463712 +0100 ++++ mplayer-export-2014-03-27/Makefile 2014-03-27 07:31:02.816463722 +0100 @@ -776,7 +776,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 43fce60..84cddd3 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-03-01 +svn=2014-03-27 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 5f0fa62..6c49149 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140301svn +%define pre 20140327svn %define svn 1 -%define svnbuild 2014-03-01 +%define svnbuild 2014-03-27 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 23.%{?pre}%{?dist} +Release: 24.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Mar 27 2014 Julian Sikorski - 1.1-24.20140327svn +- 20140327 snapshot + * Fri Mar 21 2014 Julian Sikorski - 1.1-23.20140301svn - Rebuilt for libass-0.10.2 diff --git a/sources b/sources index 3ce531c..8578323 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -5048b11765630664508888bdce26244f mplayer-export-2014-03-01.tar.bz2 +1e1f961f11ad329edfd9ebd6420eee4c mplayer-export-2014-03-27.tar.bz2 From 715edcedbfd1f0aa8c779b1c2e6530f9b8161007 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 12 Jul 2014 08:24:55 +0000 Subject: [PATCH 10/54] * Sat Jul 12 2014 Julian Sikorski - 1.1-25.20140711svn - 20140711 snapshot --- .gitignore | 4 ++-- mplayer-snapshot.sh | 2 +- mplayer.spec | 11 +++++++---- sources | 4 ++-- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 93af61e..23998e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -Blue-1.8.tar.bz2 -mplayer-export-2014-03-27.tar.bz2 +Blue-1.10.tar.bz2 +mplayer-export-2014-07-11.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 84cddd3..a700fe1 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-03-27 +svn=2014-07-11 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 6c49149..a3d900d 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140327svn +%define pre 20140711svn %define svn 1 -%define svnbuild 2014-03-27 +%define svnbuild 2014-07-11 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 24.%{?pre}%{?dist} +Release: 25.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -21,7 +21,7 @@ Source0: mplayer-export-%{svnbuild}.tar.bz2 %else Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz %endif -Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2 +Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.10.tar.bz2 Source10: mplayer-snapshot.sh # set defaults for Fedora Patch0: %{name}-config.patch @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Jul 12 2014 Julian Sikorski - 1.1-25.20140711svn +- 20140711 snapshot + * Thu Mar 27 2014 Julian Sikorski - 1.1-24.20140327svn - 20140327 snapshot diff --git a/sources b/sources index 8578323..f4583d4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2 -1e1f961f11ad329edfd9ebd6420eee4c mplayer-export-2014-03-27.tar.bz2 +d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 +fbbe54799cc0f872afe785a1fffec8cb mplayer-export-2014-07-11.tar.bz2 From 1c04ef418c83a0cdd5db7da1499dbfa7486c95b7 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Wed, 6 Aug 2014 05:50:16 +0000 Subject: [PATCH 11/54] * Wed Aug 06 2014 Julian Sikorski - 1.1-26.20140806svn - 20140806 snapshot --- .gitignore | 2 +- mplayer-snapshot.sh | 2 +- mplayer.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 23998e6..08f2a26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.10.tar.bz2 -mplayer-export-2014-07-11.tar.bz2 +mplayer-export-2014-08-06.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index a700fe1..425350a 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-07-11 +svn=2014-08-06 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index a3d900d..8f23abd 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140711svn +%define pre 20140806svn %define svn 1 -%define svnbuild 2014-07-11 +%define svnbuild 2014-08-06 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 25.%{?pre}%{?dist} +Release: 26.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Wed Aug 06 2014 Julian Sikorski - 1.1-26.20140806svn +- 20140806 snapshot + * Sat Jul 12 2014 Julian Sikorski - 1.1-25.20140711svn - 20140711 snapshot diff --git a/sources b/sources index f4583d4..4d98878 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -fbbe54799cc0f872afe785a1fffec8cb mplayer-export-2014-07-11.tar.bz2 +8dd0e5d2522b51fb25391ac997589e34 mplayer-export-2014-08-06.tar.bz2 From ae93ea8d76a9102890ab0ff4320fbc51ae9b3ac4 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 25 Sep 2014 05:41:06 +0000 Subject: [PATCH 12/54] * Thu Sep 25 2014 Julian Sikorski - 1.1-27.20140919svn - 20140919 snapshot --- .gitignore | 1 + mplayer-snapshot.sh | 2 +- mplayer.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 08f2a26..6b20396 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ Blue-1.10.tar.bz2 mplayer-export-2014-08-06.tar.bz2 +mplayer-export-2014-09-19.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 425350a..427ad72 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-08-06 +svn=2014-09-19 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 8f23abd..979df2e 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140806svn +%define pre 20140919svn %define svn 1 -%define svnbuild 2014-08-06 +%define svnbuild 2014-09-19 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 26.%{?pre}%{?dist} +Release: 27.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Sep 25 2014 Julian Sikorski - 1.1-27.20140919svn +- 20140919 snapshot + * Wed Aug 06 2014 Julian Sikorski - 1.1-26.20140806svn - 20140806 snapshot diff --git a/sources b/sources index 4d98878..839cf2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -8dd0e5d2522b51fb25391ac997589e34 mplayer-export-2014-08-06.tar.bz2 +a373d7f692b6be32004e2eabb4b41739 mplayer-export-2014-09-19.tar.bz2 From d8b7f1a382ea1d86121b2d113daf24c00cd505e2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 27 Sep 2014 09:15:18 +0000 Subject: [PATCH 13/54] * Sat Sep 27 2014 kwizart - 1.1-28.20140919svn - Rebuilt for FFmpeg 2.3x --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index 979df2e..0528130 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -6,7 +6,7 @@ Name: mplayer Version: 1.1 -Release: 27.%{?pre}%{?dist} +Release: 28.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Sep 27 2014 kwizart - 1.1-28.20140919svn +- Rebuilt for FFmpeg 2.3x + * Thu Sep 25 2014 Julian Sikorski - 1.1-27.20140919svn - 20140919 snapshot From 60b558d82b46b3d9db06ff3fec221898d4f3fffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 1 Oct 2014 23:56:37 +0000 Subject: [PATCH 14/54] =?UTF-8?q?*=20Wed=20Oct=2001=202014=20S=C3=A9rgio?= =?UTF-8?q?=20Basto=20=20-=201.1-29.20140919svn=20-=20R?= =?UTF-8?q?ebuilt=20again=20for=20FFmpeg=202.3.x=20(with=20FFmpeg=202.3.x?= =?UTF-8?q?=20in=20buildroot)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index 0528130..f35be4e 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -6,7 +6,7 @@ Name: mplayer Version: 1.1 -Release: 28.%{?pre}%{?dist} +Release: 29.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Wed Oct 01 2014 Sérgio Basto - 1.1-29.20140919svn +- Rebuilt again for FFmpeg 2.3.x (with FFmpeg 2.3.x in buildroot) + * Sat Sep 27 2014 kwizart - 1.1-28.20140919svn - Rebuilt for FFmpeg 2.3x From 3f1830a0cd68c7e2a66c2ef303e60926c52fbe1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 20 Oct 2014 01:31:23 +0000 Subject: [PATCH 15/54] Rebuilt for FFmpeg 2.4.3 --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index f35be4e..ed84fce 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -6,7 +6,7 @@ Name: mplayer Version: 1.1 -Release: 29.%{?pre}%{?dist} +Release: 30.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Mon Oct 20 2014 Sérgio Basto - 1.1-30.20140919svn +- Rebuilt for FFmpeg 2.4.3 + * Wed Oct 01 2014 Sérgio Basto - 1.1-29.20140919svn - Rebuilt again for FFmpeg 2.3.x (with FFmpeg 2.3.x in buildroot) From 3248cbfa63e87f65b249223af543af5271ecd7a8 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Tue, 21 Oct 2014 20:41:22 +0000 Subject: [PATCH 16/54] * Tue Oct 21 2014 Julian Sikorski - 1.1-31.20141020svn - 20141020 snapshot --- .gitignore | 3 +-- mplayer-snapshot.sh | 2 +- mplayer.spec | 9 ++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6b20396..7ac86a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ Blue-1.10.tar.bz2 -mplayer-export-2014-08-06.tar.bz2 -mplayer-export-2014-09-19.tar.bz2 +mplayer-export-2014-10-20.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 427ad72..4eccd1a 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-09-19 +svn=2014-10-20 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index ed84fce..30934ad 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20140919svn +%define pre 20141020svn %define svn 1 -%define svnbuild 2014-09-19 +%define svnbuild 2014-10-20 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 30.%{?pre}%{?dist} +Release: 31.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -380,6 +380,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Tue Oct 21 2014 Julian Sikorski - 1.1-31.20141020svn +- 20141020 snapshot + * Mon Oct 20 2014 Sérgio Basto - 1.1-30.20140919svn - Rebuilt for FFmpeg 2.4.3 diff --git a/sources b/sources index 839cf2b..f1bf220 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -a373d7f692b6be32004e2eabb4b41739 mplayer-export-2014-09-19.tar.bz2 +9a21e3a2119aedfc893638d977a7abfc mplayer-export-2014-10-20.tar.bz2 From ffe8cb95a2718793dcbf35a41066d3be88c1aadb Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 31 Jan 2015 08:45:06 +0000 Subject: [PATCH 17/54] * Sat Jan 31 2015 Julian Sikorski - 1.1-32.20150123svn - 20150123 snapshot - Internal libdvd* are no more, cleaned up the spec accordingly --- .gitignore | 2 +- mplayer-nodvdcss.patch | 43 ------------------------------------------ mplayer-snapshot.sh | 6 ++---- mplayer.spec | 16 +++++++--------- sources | 2 +- 5 files changed, 11 insertions(+), 58 deletions(-) delete mode 100644 mplayer-nodvdcss.patch diff --git a/.gitignore b/.gitignore index 7ac86a5..5919298 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.10.tar.bz2 -mplayer-export-2014-10-20.tar.bz2 +mplayer-export-2015-01-23.tar.bz2 diff --git a/mplayer-nodvdcss.patch b/mplayer-nodvdcss.patch deleted file mode 100644 index 099afbf..0000000 --- a/mplayer-nodvdcss.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up mplayer-export-2013-03-29/configure.nodvdcss mplayer-export-2013-03-29/configure ---- mplayer-export-2013-03-29/configure.nodvdcss 2013-03-28 08:45:33.000000000 +0100 -+++ mplayer-export-2013-03-29/configure 2013-03-28 08:46:54.302523303 +0100 -@@ -741,7 +741,7 @@ _dvdnavconfig=dvdnav-config - _dvdreadconfig=dvdread-config - _dvdread=auto - _dvdread_internal=auto --_libdvdcss_internal=auto -+_libdvdcss_internal=no - _xanim=auto - _real=auto - _live=auto -diff -up mplayer-export-2013-03-29/Makefile.nodvdcss mplayer-export-2013-03-29/Makefile ---- mplayer-export-2013-03-29/Makefile.nodvdcss 2013-03-28 08:46:54.300523311 +0100 -+++ mplayer-export-2013-03-29/Makefile 2013-03-28 08:48:09.386242474 +0100 -@@ -124,11 +124,6 @@ SRCS_COMMON-$(LIBDCA) += - SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ - libmpcodecs/vd_libdv.c \ - libmpdemux/demux_rawdv.c --SRCS_COMMON-$(LIBDVDCSS_INTERNAL) += libdvdcss/css.c \ -- libdvdcss/device.c \ -- libdvdcss/error.c \ -- libdvdcss/ioctl.c \ -- libdvdcss/libdvdcss.c \ - - SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c - -@@ -730,7 +725,6 @@ DIRS = . \ - - ALL_DIRS = $(DIRS) \ - libass \ -- libdvdcss \ - libdvdnav \ - libdvdnav/vm \ - libdvdread4 \ -@@ -859,7 +853,6 @@ osdep/mplayer-rc.o: osdep/mplayer.exe.ma - - gui/%: CFLAGS += -Wno-strict-prototypes - --libdvdcss/%: CFLAGS := $(CFLAGS_LIBDVDCSS) $(CFLAGS) - libdvdnav/%: CFLAGS := -Ilibdvdnav -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) - libdvdread4/%: CFLAGS := -Ilibdvdread4 $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) - diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 4eccd1a..f4fd113 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,17 +13,15 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2014-10-20 +svn=2015-01-23 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD cd "$tmp" -svn checkout --ignore-externals -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname +svn checkout -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname cd $dirname -rm -rf libdvdcss libswscale - 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 diff --git a/mplayer.spec b/mplayer.spec index 30934ad..7fe4f8b 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20141020svn +%define pre 20150123svn %define svn 1 -%define svnbuild 2014-10-20 +%define svnbuild 2015-01-23 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 31.%{?pre}%{?dist} +Release: 32.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -27,8 +27,6 @@ Source10: mplayer-snapshot.sh Patch0: %{name}-config.patch # use roff include statements instead of symlinks Patch1: %{name}-manlinks.patch -# erase any trace of libdvdcss -Patch2: %{name}-nodvdcss.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch @@ -184,8 +182,6 @@ This package contains various scripts from MPlayer TOOLS directory. %endif \ --enable-unrarexec \\\ \\\ - --disable-dvdread-internal \\\ - --disable-libdvdcss-internal \\\ %{!?_with_nemesi:--disable-nemesi} \\\ %{!?_with_samba:--disable-smb} \\\ \\\ @@ -219,11 +215,9 @@ This package contains various scripts from MPlayer TOOLS directory. %setup -q -n mplayer-export-%{svnbuild} %else %setup -q -n MPlayer-%{version}%{?pre} -rm -rf ffmpeg libdvdcss libdvdnav libdvdread4 %endif %patch0 -p1 -b .config %patch1 -p1 -b .manlinks -%patch2 -p1 -b .nodvdcss %patch3 -p1 -b .ffmpeg mkdir GUI @@ -380,6 +374,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Jan 31 2015 Julian Sikorski - 1.1-32.20150123svn +- 20150123 snapshot +- Internal libdvd* are no more, cleaned up the spec accordingly + * Tue Oct 21 2014 Julian Sikorski - 1.1-31.20141020svn - 20141020 snapshot diff --git a/sources b/sources index f1bf220..c1ab4d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -9a21e3a2119aedfc893638d977a7abfc mplayer-export-2014-10-20.tar.bz2 +c0f5e1b9847812b76fb107563fda93c5 mplayer-export-2015-01-23.tar.bz2 From 9eba0cf07b9795192176d679a17f41d2da667e51 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 7 May 2015 07:22:01 +0200 Subject: [PATCH 18/54] * Thu May 07 2015 Julian Sikorski - 1.1-33.20150505svn - 20150505 snapshot - Updated ffmpeg patch --- .gitignore | 2 +- mplayer-ffmpeg.patch | 119 ++++++++++++++++++++++++++++++++++++++----- mplayer-snapshot.sh | 2 +- mplayer.spec | 10 ++-- sources | 2 +- 5 files changed, 116 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 5919298..0c42b10 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.10.tar.bz2 -mplayer-export-2015-01-23.tar.bz2 +mplayer-export-2015-05-05.tar.bz2 diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch index 27c6228..35934db 100644 --- a/mplayer-ffmpeg.patch +++ b/mplayer-ffmpeg.patch @@ -1,7 +1,7 @@ -diff -up mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h ---- mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h.ffmpeg 2014-03-27 07:31:02.816463722 +0100 -+++ mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h 2014-03-27 07:31:02.816463722 +0100 -@@ -0,0 +1,32 @@ +diff -up mplayer-export-2015-05-05/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2015-05-05/ffmpeg/libavformat/internal.h +--- mplayer-export-2015-05-05/ffmpeg/libavformat/internal.h.ffmpeg 2015-05-06 07:22:42.640716026 +0200 ++++ mplayer-export-2015-05-05/ffmpeg/libavformat/internal.h 2015-05-06 07:26:44.614138993 +0200 +@@ -0,0 +1,84 @@ +/* + * copyright (c) 2001 Fabrice Bellard + * @@ -33,11 +33,63 @@ diff -up mplayer-export-2014-03-27/ffmpeg/libavformat/internal.h.ffmpeg mplayer- + unsigned int tag; +} AVCodecTag; + ++struct AVFormatInternal { ++ /** ++ * Number of streams relevant for interleaving. ++ * Muxing only. ++ */ ++ int nb_interleaved_streams; ++ ++ /** ++ * This buffer is only needed when packets were already buffered but ++ * not decoded, for example to get the codec parameters in MPEG ++ * streams. ++ */ ++ struct AVPacketList *packet_buffer; ++ struct AVPacketList *packet_buffer_end; ++ ++ /* av_seek_frame() support */ ++ int64_t data_offset; /**< offset of the first packet */ ++ ++ /** ++ * Raw packets from the demuxer, prior to parsing and decoding. ++ * This buffer is used for buffering packets until the codec can ++ * be identified, as parsing cannot be done without knowing the ++ * codec. ++ */ ++ struct AVPacketList *raw_packet_buffer; ++ struct AVPacketList *raw_packet_buffer_end; ++ /** ++ * Packets split by the parser get queued here. ++ */ ++ struct AVPacketList *parse_queue; ++ struct AVPacketList *parse_queue_end; ++ /** ++ * Remaining size available for raw_packet_buffer, in bytes. ++ */ ++#define RAW_PACKET_BUFFER_SIZE 2500000 ++ int raw_packet_buffer_remaining_size; ++ ++ /** ++ * Offset to remap timestamps to be non-negative. ++ * Expressed in timebase units. ++ * @see AVStream.mux_ts_offset ++ */ ++ int64_t offset; ++ ++ /** ++ * Timebase for the timestamp offset. ++ */ ++ AVRational offset_timebase; ++ ++ int inject_global_side_data; ++}; ++ +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h ---- mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg 2014-03-27 07:31:02.816463722 +0100 -+++ mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h 2014-03-27 07:31:02.816463722 +0100 -@@ -0,0 +1,112 @@ +diff -up mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h +--- mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h.ffmpeg 2015-05-06 07:22:42.641716032 +0200 ++++ mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h 2015-05-06 07:26:07.485717938 +0200 +@@ -0,0 +1,153 @@ +/* + * copyright (c) 2006 Michael Niedermayer + * @@ -65,6 +117,7 @@ diff -up mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-exp +#include "config.h" + +typedef struct xmm_reg { uint64_t a, b; } xmm_reg; ++typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg; + +#if ARCH_X86_64 +# define OPSIZE "q" @@ -147,13 +200,53 @@ diff -up mplayer-export-2014-03-27/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-exp +# define LOCAL_MANGLE(a) #a +#endif + -+#define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) ++#if HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS ++# define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) ++# define NAMED_CONSTRAINTS_ADD(...) ++# define NAMED_CONSTRAINTS(...) ++# define NAMED_CONSTRAINTS_ARRAY_ADD(...) ++# define NAMED_CONSTRAINTS_ARRAY(...) ++#else ++ /* When direct symbol references are used in code passed to a compiler that does not support them ++ * then these references need to be converted to named asm constraints instead. ++ * Instead of returning a direct symbol MANGLE now returns a named constraint for that specific symbol. ++ * In order for this to work there must also be a corresponding entry in the asm-interface. To add this ++ * entry use the macro NAMED_CONSTRAINTS() and pass in a list of each symbol reference used in the ++ * corresponding block of code. (e.g. NAMED_CONSTRAINTS(var1,var2,var3) where var1 is the first symbol etc. ). ++ * If there are already existing constraints then use NAMED_CONSTRAINTS_ADD to add to the existing constraint list. ++ */ ++# define MANGLE(a) "%["#a"]" ++ // Intel/MSVC does not correctly expand va-args so we need a rather ugly hack in order to get it to work ++# define FE_0(P,X) P(X) ++# define FE_1(P,X,X1) P(X), FE_0(P,X1) ++# define FE_2(P,X,X1,X2) P(X), FE_1(P,X1,X2) ++# define FE_3(P,X,X1,X2,X3) P(X), FE_2(P,X1,X2,X3) ++# define FE_4(P,X,X1,X2,X3,X4) P(X), FE_3(P,X1,X2,X3,X4) ++# define FE_5(P,X,X1,X2,X3,X4,X5) P(X), FE_4(P,X1,X2,X3,X4,X5) ++# define FE_6(P,X,X1,X2,X3,X4,X5,X6) P(X), FE_5(P,X1,X2,X3,X4,X5,X6) ++# define FE_7(P,X,X1,X2,X3,X4,X5,X6,X7) P(X), FE_6(P,X1,X2,X3,X4,X5,X6,X7) ++# define FE_8(P,X,X1,X2,X3,X4,X5,X6,X7,X8) P(X), FE_7(P,X1,X2,X3,X4,X5,X6,X7,X8) ++# define FE_9(P,X,X1,X2,X3,X4,X5,X6,X7,X8,X9) P(X), FE_8(P,X1,X2,X3,X4,X5,X6,X7,X8,X9) ++# define GET_FE_IMPL(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,NAME,...) NAME ++# define GET_FE(A) GET_FE_IMPL A ++# define GET_FE_GLUE(x, y) x y ++# define FOR_EACH_VA(P,...) GET_FE_GLUE(GET_FE((__VA_ARGS__,FE_9,FE_8,FE_7,FE_6,FE_5,FE_4,FE_3,FE_2,FE_1,FE_0)), (P,__VA_ARGS__)) ++# define NAME_CONSTRAINT(x) [x] "m"(x) ++ // Parameters are a list of each symbol reference required ++# define NAMED_CONSTRAINTS_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__) ++ // Same but without comma for when there are no previously defined constraints ++# define NAMED_CONSTRAINTS(...) FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__) ++ // Same as above NAMED_CONSTRAINTS except used for passing arrays/pointers instead of normal variables ++# define NAME_CONSTRAINT_ARRAY(x) [x] "m"(*x) ++# define NAMED_CONSTRAINTS_ARRAY_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__) ++# define NAMED_CONSTRAINTS_ARRAY(...) FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__) ++#endif + +#endif /* AVUTIL_X86_ASM_H */ -diff -up mplayer-export-2014-03-27/Makefile.ffmpeg mplayer-export-2014-03-27/Makefile ---- mplayer-export-2014-03-27/Makefile.ffmpeg 2014-03-27 07:31:02.814463712 +0100 -+++ mplayer-export-2014-03-27/Makefile 2014-03-27 07:31:02.816463722 +0100 -@@ -776,7 +776,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): +diff -up mplayer-export-2015-05-05/Makefile.ffmpeg mplayer-export-2015-05-05/Makefile +--- mplayer-export-2015-05-05/Makefile.ffmpeg 2015-05-06 07:22:42.638716016 +0200 ++++ mplayer-export-2015-05-05/Makefile 2015-05-06 07:22:42.642716037 +0200 +@@ -754,7 +754,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING 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 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index f4fd113..7273dbb 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-01-23 +svn=2015-05-05 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 7fe4f8b..b807f15 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20150123svn +%define pre 20150505svn %define svn 1 -%define svnbuild 2015-01-23 +%define svnbuild 2015-05-05 %define faad2min 1:2.6.1 Name: mplayer Version: 1.1 -Release: 32.%{?pre}%{?dist} +Release: 33.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -374,6 +374,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu May 07 2015 Julian Sikorski - 1.1-33.20150505svn +- 20150505 snapshot +- Updated ffmpeg patch + * Sat Jan 31 2015 Julian Sikorski - 1.1-32.20150123svn - 20150123 snapshot - Internal libdvd* are no more, cleaned up the spec accordingly diff --git a/sources b/sources index c1ab4d8..1b8a0b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -c0f5e1b9847812b76fb107563fda93c5 mplayer-export-2015-01-23.tar.bz2 +b50df87674a965949a50a6ede773da27 mplayer-export-2015-05-05.tar.bz2 From 3df293c9a5304d50727989e45f179ac5a7c05e86 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 29 Oct 2015 08:08:52 +0100 Subject: [PATCH 19/54] Updated to 1.2 - Updated Blue skin to 1.11 --- .gitignore | 4 ++-- mplayer.spec | 19 ++++++++++++++----- sources | 4 ++-- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 0c42b10..b2bb5ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -Blue-1.10.tar.bz2 -mplayer-export-2015-05-05.tar.bz2 +Blue-1.11.tar.bz2 +MPlayer-1.2.tar.xz diff --git a/mplayer.spec b/mplayer.spec index b807f15..ec646a2 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,12 +1,16 @@ %define codecdir %{_libdir}/codecs -%define pre 20150505svn -%define svn 1 -%define svnbuild 2015-05-05 +#define pre 20150505svn +#define svn 1 +#define svnbuild 2015-05-05 %define faad2min 1:2.6.1 Name: mplayer -Version: 1.1 +Version: 1.2 +%if 0%{?svn} Release: 33.%{?pre}%{?dist} +%else +Release: 1%{?dist} +%endif Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -21,7 +25,7 @@ Source0: mplayer-export-%{svnbuild}.tar.bz2 %else Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz %endif -Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.10.tar.bz2 +Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.11.tar.bz2 Source10: mplayer-snapshot.sh # set defaults for Fedora Patch0: %{name}-config.patch @@ -215,6 +219,7 @@ This package contains various scripts from MPlayer TOOLS directory. %setup -q -n mplayer-export-%{svnbuild} %else %setup -q -n MPlayer-%{version}%{?pre} +rm -rf ffmpeg %endif %patch0 -p1 -b .config %patch1 -p1 -b .manlinks @@ -374,6 +379,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Oct 29 2015 Julian Sikorski - 1.2-1 +- Updated to 1.2 +- Updated Blue skin to 1.11 + * Thu May 07 2015 Julian Sikorski - 1.1-33.20150505svn - 20150505 snapshot - Updated ffmpeg patch diff --git a/sources b/sources index 1b8a0b5..381e5ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2 -b50df87674a965949a50a6ede773da27 mplayer-export-2015-05-05.tar.bz2 +de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 +58409fccb8ef33013fb780405405491f MPlayer-1.2.tar.xz From 984a51b9fc62f84cea5776de57c25073d0e9304b Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 28 Jan 2016 19:25:00 +0100 Subject: [PATCH 20/54] Updated to 1.2.1 - Removed asm.h from mplayer-ffmpeg.patch --- .gitignore | 2 +- mplayer-ffmpeg.patch | 157 ------------------------------------------- mplayer.spec | 8 ++- sources | 2 +- 4 files changed, 8 insertions(+), 161 deletions(-) diff --git a/.gitignore b/.gitignore index b2bb5ee..40ffb81 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.11.tar.bz2 -MPlayer-1.2.tar.xz +MPlayer-1.2.1.tar.xz diff --git a/mplayer-ffmpeg.patch b/mplayer-ffmpeg.patch index 35934db..5bf0ec3 100644 --- a/mplayer-ffmpeg.patch +++ b/mplayer-ffmpeg.patch @@ -86,163 +86,6 @@ diff -up mplayer-export-2015-05-05/ffmpeg/libavformat/internal.h.ffmpeg mplayer- +}; + +#endif /* AVFORMAT_INTERNAL_H */ -diff -up mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h.ffmpeg mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h ---- mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h.ffmpeg 2015-05-06 07:22:42.641716032 +0200 -+++ mplayer-export-2015-05-05/ffmpeg/libavutil/x86/asm.h 2015-05-06 07:26:07.485717938 +0200 -@@ -0,0 +1,153 @@ -+/* -+ * copyright (c) 2006 Michael Niedermayer -+ * -+ * This file is part of FFmpeg. -+ * -+ * FFmpeg is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * FFmpeg is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with FFmpeg; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#ifndef AVUTIL_X86_ASM_H -+#define AVUTIL_X86_ASM_H -+ -+#include -+#include "config.h" -+ -+typedef struct xmm_reg { uint64_t a, b; } xmm_reg; -+typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg; -+ -+#if ARCH_X86_64 -+# define OPSIZE "q" -+# define REG_a "rax" -+# define REG_b "rbx" -+# define REG_c "rcx" -+# define REG_d "rdx" -+# define REG_D "rdi" -+# define REG_S "rsi" -+# define PTR_SIZE "8" -+typedef int64_t x86_reg; -+ -+# define REG_SP "rsp" -+# define REG_BP "rbp" -+# define REGBP rbp -+# define REGa rax -+# define REGb rbx -+# define REGc rcx -+# define REGd rdx -+# define REGSP rsp -+ -+#elif ARCH_X86_32 -+ -+# define OPSIZE "l" -+# define REG_a "eax" -+# define REG_b "ebx" -+# define REG_c "ecx" -+# define REG_d "edx" -+# define REG_D "edi" -+# define REG_S "esi" -+# define PTR_SIZE "4" -+typedef int32_t x86_reg; -+ -+# define REG_SP "esp" -+# define REG_BP "ebp" -+# define REGBP ebp -+# define REGa eax -+# define REGb ebx -+# define REGc ecx -+# define REGd edx -+# define REGSP esp -+#else -+typedef int x86_reg; -+#endif -+ -+#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) -+#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) -+ -+#if ARCH_X86_64 && defined(PIC) -+# define BROKEN_RELOCATIONS 1 -+#endif -+ -+/* -+ * If gcc is not set to support sse (-msse) it will not accept xmm registers -+ * in the clobber list for inline asm. XMM_CLOBBERS takes a list of xmm -+ * registers to be marked as clobbered and evaluates to nothing if they are -+ * not supported, or to the list itself if they are supported. Since a clobber -+ * list may not be empty, XMM_CLOBBERS_ONLY should be used if the xmm -+ * registers are the only in the clobber list. -+ * For example a list with "eax" and "xmm0" as clobbers should become: -+ * : XMM_CLOBBERS("xmm0",) "eax" -+ * and a list with only "xmm0" should become: -+ * XMM_CLOBBERS_ONLY("xmm0") -+ */ -+#if HAVE_XMM_CLOBBERS -+# define XMM_CLOBBERS(...) __VA_ARGS__ -+# define XMM_CLOBBERS_ONLY(...) : __VA_ARGS__ -+#else -+# define XMM_CLOBBERS(...) -+# define XMM_CLOBBERS_ONLY(...) -+#endif -+ -+/* Use to export labels from asm. */ -+#define LABEL_MANGLE(a) EXTERN_PREFIX #a -+ -+// Use rip-relative addressing if compiling PIC code on x86-64. -+#if ARCH_X86_64 && defined(PIC) -+# define LOCAL_MANGLE(a) #a "(%%rip)" -+#else -+# define LOCAL_MANGLE(a) #a -+#endif -+ -+#if HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS -+# define MANGLE(a) EXTERN_PREFIX LOCAL_MANGLE(a) -+# define NAMED_CONSTRAINTS_ADD(...) -+# define NAMED_CONSTRAINTS(...) -+# define NAMED_CONSTRAINTS_ARRAY_ADD(...) -+# define NAMED_CONSTRAINTS_ARRAY(...) -+#else -+ /* When direct symbol references are used in code passed to a compiler that does not support them -+ * then these references need to be converted to named asm constraints instead. -+ * Instead of returning a direct symbol MANGLE now returns a named constraint for that specific symbol. -+ * In order for this to work there must also be a corresponding entry in the asm-interface. To add this -+ * entry use the macro NAMED_CONSTRAINTS() and pass in a list of each symbol reference used in the -+ * corresponding block of code. (e.g. NAMED_CONSTRAINTS(var1,var2,var3) where var1 is the first symbol etc. ). -+ * If there are already existing constraints then use NAMED_CONSTRAINTS_ADD to add to the existing constraint list. -+ */ -+# define MANGLE(a) "%["#a"]" -+ // Intel/MSVC does not correctly expand va-args so we need a rather ugly hack in order to get it to work -+# define FE_0(P,X) P(X) -+# define FE_1(P,X,X1) P(X), FE_0(P,X1) -+# define FE_2(P,X,X1,X2) P(X), FE_1(P,X1,X2) -+# define FE_3(P,X,X1,X2,X3) P(X), FE_2(P,X1,X2,X3) -+# define FE_4(P,X,X1,X2,X3,X4) P(X), FE_3(P,X1,X2,X3,X4) -+# define FE_5(P,X,X1,X2,X3,X4,X5) P(X), FE_4(P,X1,X2,X3,X4,X5) -+# define FE_6(P,X,X1,X2,X3,X4,X5,X6) P(X), FE_5(P,X1,X2,X3,X4,X5,X6) -+# define FE_7(P,X,X1,X2,X3,X4,X5,X6,X7) P(X), FE_6(P,X1,X2,X3,X4,X5,X6,X7) -+# define FE_8(P,X,X1,X2,X3,X4,X5,X6,X7,X8) P(X), FE_7(P,X1,X2,X3,X4,X5,X6,X7,X8) -+# define FE_9(P,X,X1,X2,X3,X4,X5,X6,X7,X8,X9) P(X), FE_8(P,X1,X2,X3,X4,X5,X6,X7,X8,X9) -+# define GET_FE_IMPL(_0,_1,_2,_3,_4,_5,_6,_7,_8,_9,NAME,...) NAME -+# define GET_FE(A) GET_FE_IMPL A -+# define GET_FE_GLUE(x, y) x y -+# define FOR_EACH_VA(P,...) GET_FE_GLUE(GET_FE((__VA_ARGS__,FE_9,FE_8,FE_7,FE_6,FE_5,FE_4,FE_3,FE_2,FE_1,FE_0)), (P,__VA_ARGS__)) -+# define NAME_CONSTRAINT(x) [x] "m"(x) -+ // Parameters are a list of each symbol reference required -+# define NAMED_CONSTRAINTS_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__) -+ // Same but without comma for when there are no previously defined constraints -+# define NAMED_CONSTRAINTS(...) FOR_EACH_VA(NAME_CONSTRAINT,__VA_ARGS__) -+ // Same as above NAMED_CONSTRAINTS except used for passing arrays/pointers instead of normal variables -+# define NAME_CONSTRAINT_ARRAY(x) [x] "m"(*x) -+# define NAMED_CONSTRAINTS_ARRAY_ADD(...) , FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__) -+# define NAMED_CONSTRAINTS_ARRAY(...) FOR_EACH_VA(NAME_CONSTRAINT_ARRAY,__VA_ARGS__) -+#endif -+ -+#endif /* AVUTIL_X86_ASM_H */ diff -up mplayer-export-2015-05-05/Makefile.ffmpeg mplayer-export-2015-05-05/Makefile --- mplayer-export-2015-05-05/Makefile.ffmpeg 2015-05-06 07:22:42.638716016 +0200 +++ mplayer-export-2015-05-05/Makefile 2015-05-06 07:22:42.642716037 +0200 diff --git a/mplayer.spec b/mplayer.spec index ec646a2..d0bb718 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -5,9 +5,9 @@ %define faad2min 1:2.6.1 Name: mplayer -Version: 1.2 +Version: 1.2.1 %if 0%{?svn} -Release: 33.%{?pre}%{?dist} +Release: 34.%{?pre}%{?dist} %else Release: 1%{?dist} %endif @@ -379,6 +379,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Jan 28 2016 Julian Sikorski - 1.2.1-1 +- Updated to 1.2.1 +- Removed asm.h from mplayer-ffmpeg.patch + * Thu Oct 29 2015 Julian Sikorski - 1.2-1 - Updated to 1.2 - Updated Blue skin to 1.11 diff --git a/sources b/sources index 381e5ea..781a057 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 -58409fccb8ef33013fb780405405491f MPlayer-1.2.tar.xz +7fe68d1961427d0b4e306074e2cac246 MPlayer-1.2.1.tar.xz From d1c0b574ad672f2fc669f634d83767b178b2f12c Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 2 Apr 2016 15:15:37 +0200 Subject: [PATCH 21/54] Fixed BuildRequires so that audio CD support actually works --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index d0bb718..eefd849 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -9,7 +9,7 @@ Version: 1.2.1 %if 0%{?svn} Release: 34.%{?pre}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -61,7 +61,7 @@ BuildRequires: libass-devel >= 0.9.10 BuildRequires: libbluray-devel BuildRequires: libbs2b-devel BuildRequires: libcaca-devel -BuildRequires: libcdio-devel +BuildRequires: libcdio-paranoia-devel BuildRequires: libdca-devel BuildRequires: libdv-devel BuildRequires: libdvdnav-devel >= 4.1.3-1 @@ -379,6 +379,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Apr 02 2016 Julian Sikorski - 1.2.1-2 +- Fixed BuildRequires so that audio CD support actually works + * Thu Jan 28 2016 Julian Sikorski - 1.2.1-1 - Updated to 1.2.1 - Removed asm.h from mplayer-ffmpeg.patch From 40701a10227e066e872d0029684ea5dddee71acf Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Wed, 18 May 2016 18:03:31 +0200 Subject: [PATCH 22/54] Updated to 1.3.0 --- .gitignore | 2 +- mplayer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 40ffb81..53fe950 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ Blue-1.11.tar.bz2 -MPlayer-1.2.1.tar.xz +MPlayer-1.3.0.tar.xz diff --git a/mplayer.spec b/mplayer.spec index eefd849..78faa43 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -5,11 +5,11 @@ %define faad2min 1:2.6.1 Name: mplayer -Version: 1.2.1 +Version: 1.3.0 %if 0%{?svn} Release: 34.%{?pre}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -379,6 +379,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Wed May 18 2016 Julian Sikorski - 1.3.0-1 +- Updated to 1.3.0 + * Sat Apr 02 2016 Julian Sikorski - 1.2.1-2 - Fixed BuildRequires so that audio CD support actually works diff --git a/sources b/sources index 781a057..2e566ea 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 -7fe68d1961427d0b4e306074e2cac246 MPlayer-1.2.1.tar.xz +e8a4d77ad4f509e81dd5e13b51636c1d MPlayer-1.3.0.tar.xz From 0039d1c9046da60ae19018b826dd4c648a990e00 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Sat, 30 Jul 2016 15:55:22 +0200 Subject: [PATCH 23/54] Rebuilt for ffmpeg-3.1.1 --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 78faa43..c8be9aa 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 34.%{?pre}%{?dist} +Release: 35.%{?pre}%{?dist} %else -Release: 1%{?dist} +Release: 2%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -379,6 +379,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Jul 30 2016 Julian Sikorski - 1.3.0-2 +- Rebuilt for ffmpeg-3.1.1 + * Wed May 18 2016 Julian Sikorski - 1.3.0-1 - Updated to 1.3.0 From 5b370274e4f64008e5b54c7ae03f6a37fe4f1bae Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Tue, 25 Oct 2016 16:01:07 +0100 Subject: [PATCH 24/54] BR: perl-generators for proper dependency generation See https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl --- mplayer.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index c8be9aa..204f925 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -9,7 +9,7 @@ Version: 1.3.0 %if 0%{?svn} Release: 35.%{?pre}%{?dist} %else -Release: 2%{?dist} +Release: 3%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -75,6 +75,7 @@ BuildRequires: libvorbis-devel BuildRequires: lirc-devel #BuildRequires: live555-devel #broken - see libnemesi as an alternative BuildRequires: lzo-devel >= 2 +BuildRequires: perl-generators BuildRequires: pulseaudio-libs-devel BuildRequires: speex-devel >= 1.1 BuildRequires: twolame-devel @@ -379,6 +380,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Tue Oct 25 2016 Paul Howarth - 1.3.0-3 +- BR: perl-generators for proper dependency generation + (https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl) + * Sat Jul 30 2016 Julian Sikorski - 1.3.0-2 - Rebuilt for ffmpeg-3.1.1 From fd2109d88389721eca4aa61cc8d24a441dd4a42d Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 5 Nov 2016 23:06:44 +0000 Subject: [PATCH 25/54] Add provides mplayer-backend (rfbz#4284) --- mplayer.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 204f925..b0bf7dd 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 35.%{?pre}%{?dist} +Release: 36.%{?pre}%{?dist} %else -Release: 3%{?dist} +Release: 4%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -105,6 +105,7 @@ BuildRequires: libxslt Obsoletes: mplayer-fonts Requires: faad2-libs >= %{faad2min} Requires: mplayer-common = %{version}-%{release} +Provides: mplayer-backend %description MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM, @@ -380,6 +381,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Nov 05 2016 Leigh Scott - 1.3.0-4 +- Add provides mplayer-backend (rfbz#4284) +- Rebuilt for new ffmpeg + * Tue Oct 25 2016 Paul Howarth - 1.3.0-3 - BR: perl-generators for proper dependency generation (https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl) From 022f60b10592e3d1ccbf7a4bcfae227dfbd684cc Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Thu, 17 Nov 2016 15:04:29 +0100 Subject: [PATCH 26/54] Rebuilt for libcdio-0.94 --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index b0bf7dd..3713015 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -9,7 +9,7 @@ Version: 1.3.0 %if 0%{?svn} Release: 36.%{?pre}%{?dist} %else -Release: 4%{?dist} +Release: 5%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -381,6 +381,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Nov 17 2016 Adrian Reber - 1.3.0-5 +- Rebuilt for libcdio-0.94 + * Sat Nov 05 2016 Leigh Scott - 1.3.0-4 - Add provides mplayer-backend (rfbz#4284) - Rebuilt for new ffmpeg From 40f04b0ce3f125b5310ed81f23d0f9919413cb85 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 6 Feb 2017 10:39:35 +0000 Subject: [PATCH 27/54] Fix screenshot crash (rfbz#4391) --- mplayer-fix-screenshot-crash.patch | 26 ++++++++++++++++++++++++++ mplayer.spec | 14 +++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 mplayer-fix-screenshot-crash.patch diff --git a/mplayer-fix-screenshot-crash.patch b/mplayer-fix-screenshot-crash.patch new file mode 100644 index 0000000..9f17461 --- /dev/null +++ b/mplayer-fix-screenshot-crash.patch @@ -0,0 +1,26 @@ +From bbaf524d691d6bfecfd65175259fd61abc6e5f69 Mon Sep 17 00:00:00 2001 +From: rtogni +Date: Sun, 3 Jul 2016 20:06:11 +0000 +Subject: [PATCH] Fix crash with screenshot filter. + +avcodec_open2() now requires timebase to be always set, even for png images. +The patch sets it to 1/1, since pictures do not have a framerate. + +Patch by Thomas Kirsten (Tho_Ki gmx de) +--- + libmpcodecs/vf_screenshot.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c +index 4692d20..992ea6d 100644 +--- a/libmpcodecs/vf_screenshot.c ++++ b/libmpcodecs/vf_screenshot.c +@@ -81,6 +81,8 @@ static int config(struct vf_instance *vf, + vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24; + vf->priv->avctx->width = d_width; + vf->priv->avctx->height = d_height; ++ vf->priv->avctx->time_base.num = 1; ++ vf->priv->avctx->time_base.den = 1; + vf->priv->avctx->compression_level = 0; + if (avcodec_open2(vf->priv->avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL)) { + mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n"); diff --git a/mplayer.spec b/mplayer.spec index 3713015..2d15014 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 36.%{?pre}%{?dist} +Release: 37.%{?pre}%{?dist} %else -Release: 5%{?dist} +Release: 6%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -32,7 +32,11 @@ Patch0: %{name}-config.patch # use roff include statements instead of symlinks Patch1: %{name}-manlinks.patch # use system FFmpeg libraries -Patch3: %{name}-ffmpeg.patch +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 BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -226,6 +230,7 @@ rm -rf ffmpeg %patch0 -p1 -b .config %patch1 -p1 -b .manlinks %patch3 -p1 -b .ffmpeg +%patch4 -p1 -b .screenshot mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -381,6 +386,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Mon Feb 06 2017 Leigh Scott - 1.3.0-6 +- Fix screenshot crash (rfbz#4391) + * Thu Nov 17 2016 Adrian Reber - 1.3.0-5 - Rebuilt for libcdio-0.94 From 72534932ba3089668299f995237ca313a6ac0af0 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 3 Mar 2017 11:54:29 +0000 Subject: [PATCH 28/54] Fix vo_png with recent ffmpeg (rfbz#4470) --- mplayer-fix-vo_png.patch | 24 ++++++++++++++++++++++++ mplayer.spec | 12 ++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 mplayer-fix-vo_png.patch diff --git a/mplayer-fix-vo_png.patch b/mplayer-fix-vo_png.patch new file mode 100644 index 0000000..62b100c --- /dev/null +++ b/mplayer-fix-vo_png.patch @@ -0,0 +1,24 @@ +From 3e7a0f39e5acf4e9da96cb075050e51e24e81403 Mon Sep 17 00:00:00 2001 +From: rtogni +Date: Sun, 7 Aug 2016 20:44:47 +0000 +Subject: [PATCH] Fix vo_png with recent ffmpeg + +avcodec_open2() now requires timebase to be always set, even for png images. +The patch sets it to 1/1, since pictures do not have a framerate. +--- + libvo/vo_png.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libvo/vo_png.c b/libvo/vo_png.c +index 38a4097..5696a1f 100644 +--- a/libvo/vo_png.c ++++ b/libvo/vo_png.c +@@ -136,6 +136,8 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin + avctx->pix_fmt = imgfmt2pixfmt(format); + avctx->width = width; + avctx->height = height; ++ avctx->time_base.num = 1; ++ avctx->time_base.den = 1; + if (avcodec_open2(avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL) < 0) { + uninit(); + return -1; diff --git a/mplayer.spec b/mplayer.spec index 2d15014..12cf51d 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 37.%{?pre}%{?dist} +Release: 38.%{?pre}%{?dist} %else -Release: 6%{?dist} +Release: 7%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -37,6 +37,10 @@ Patch3: %{name}-ffmpeg.patch # 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 BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -231,6 +235,7 @@ rm -rf ffmpeg %patch1 -p1 -b .manlinks %patch3 -p1 -b .ffmpeg %patch4 -p1 -b .screenshot +%patch5 -p1 -b .vo_png mkdir GUI cp -a `ls -1|grep -v GUI` GUI/ @@ -386,6 +391,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Fri Mar 03 2017 Leigh Scott - 1.3.0-7 +- Fix vo_png with recent ffmpeg (rfbz#4470) + * Mon Feb 06 2017 Leigh Scott - 1.3.0-6 - Fix screenshot crash (rfbz#4391) From 7cb900d52d57938f4fe31d1fd4e0132f269bb0ce Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 20 Mar 2017 14:03:35 +0100 Subject: [PATCH 29/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 12cf51d..41ac304 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 38.%{?pre}%{?dist} +Release: 39.%{?pre}%{?dist} %else -Release: 7%{?dist} +Release: 8%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -391,6 +391,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Mon Mar 20 2017 RPM Fusion Release Engineering - 1.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Mar 03 2017 Leigh Scott - 1.3.0-7 - Fix vo_png with recent ffmpeg (rfbz#4470) From 0eed7e69a21acc7a04ad27a740f5e5b5ac226773 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 29 Apr 2017 17:17:31 +0100 Subject: [PATCH 30/54] Rebuild for ffmpeg update --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 41ac304..7f93a61 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 39.%{?pre}%{?dist} +Release: 40.%{?pre}%{?dist} %else -Release: 8%{?dist} +Release: 9%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -391,6 +391,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Apr 29 2017 Leigh Scott - 1.3.0-9 +- Rebuild for ffmpeg update + * Mon Mar 20 2017 RPM Fusion Release Engineering - 1.3.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From eefa988a55badfa1576bb11da0ede7905c5f2d80 Mon Sep 17 00:00:00 2001 From: Paul Howarth Date: Sat, 15 Jul 2017 09:30:00 +0100 Subject: [PATCH 31/54] Perl 5.26 rebuild --- mplayer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index 7f93a61..d1bbcf6 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -9,7 +9,7 @@ Version: 1.3.0 %if 0%{?svn} Release: 40.%{?pre}%{?dist} %else -Release: 9%{?dist} +Release: 10%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -391,6 +391,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sat Jul 15 2017 Paul Howarth - 1.3.0-10 +- Perl 5.26 rebuild + * Sat Apr 29 2017 Leigh Scott - 1.3.0-9 - Rebuild for ffmpeg update From 77525533b8ffaa8885942d89f7b5b41649c74f6e Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 31 Aug 2017 16:33:09 +0200 Subject: [PATCH 32/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index d1bbcf6..fcab644 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 40.%{?pre}%{?dist} +Release: 41.%{?pre}%{?dist} %else -Release: 10%{?dist} +Release: 11%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -391,6 +391,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Aug 31 2017 RPM Fusion Release Engineering - 1.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Jul 15 2017 Paul Howarth - 1.3.0-10 - Perl 5.26 rebuild From d0f50cffc888feb1725e24e0504853e74ab73467 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 17 Oct 2017 11:16:50 +0100 Subject: [PATCH 33/54] Rebuild for ffmpeg update --- mplayer-add-include_vdpau_x11.patch | 23 +++++++++++++++++++++++ mplayer.spec | 10 ++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 mplayer-add-include_vdpau_x11.patch diff --git a/mplayer-add-include_vdpau_x11.patch b/mplayer-add-include_vdpau_x11.patch new file mode 100644 index 0000000..3c2891b --- /dev/null +++ b/mplayer-add-include_vdpau_x11.patch @@ -0,0 +1,23 @@ +From 2fe876f5ed67edd72e6da4fd0ccaae03a1952d4c Mon Sep 17 00:00:00 2001 +From: al +Date: Wed, 19 Apr 2017 23:06:04 +0000 +Subject: [PATCH] vo_vdpau: Explicitly include header vdpau_x11.h + +The include from inside libavcodec/vdpau.h was removed in FFmpeg +commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 . +--- + libvo/vo_vdpau.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c +index 7b94cad1b9..99f08d6c7b 100644 +--- a/libvo/vo_vdpau.c ++++ b/libvo/vo_vdpau.c +@@ -34,6 +34,7 @@ + + #include + #include ++#include + + #include "config.h" + #include "sub/ass_mp.h" diff --git a/mplayer.spec b/mplayer.spec index fcab644..a210ef2 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 41.%{?pre}%{?dist} +Release: 42.%{?pre}%{?dist} %else -Release: 11%{?dist} +Release: 12%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -41,6 +41,7 @@ Patch4: %{name}-fix-screenshot-crash.patch # 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 BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -236,6 +237,7 @@ rm -rf ffmpeg %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/ @@ -391,6 +393,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Tue Oct 17 2017 Leigh Scott - 1.3.0-12 +- Rebuild for ffmpeg update +- Add build upstream build fix for newer ffmpeg + * Thu Aug 31 2017 RPM Fusion Release Engineering - 1.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 767e04e087ed0c767b3b8c104c5d5d03df3a9309 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 23 Oct 2017 21:57:03 +0100 Subject: [PATCH 34/54] Exclude ix86 (rfbz #4687) --- mplayer.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index a210ef2..9fafa45 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 42.%{?pre}%{?dist} +Release: 43.%{?pre}%{?dist} %else -Release: 12%{?dist} +Release: 13%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -43,6 +43,8 @@ Patch4: %{name}-fix-screenshot-crash.patch Patch5: %{name}-fix-vo_png.patch Patch6: %{name}-add-include_vdpau_x11.patch +ExcludeArch: %{ix86} + BuildRequires: SDL-devel BuildRequires: a52dec-devel BuildRequires: aalib-devel @@ -393,6 +395,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Mon Oct 23 2017 Leigh Scott - 1.3.0-13 +- Exclude ix86 (rfbz #4687) + * Tue Oct 17 2017 Leigh Scott - 1.3.0-12 - Rebuild for ffmpeg update - Add build upstream build fix for newer ffmpeg From 4a8471b4da5dd429677eec91450394919d7eb6d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 31 Dec 2017 03:29:52 +0000 Subject: [PATCH 35/54] Mass rebuild for x264 and x265 --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 9fafa45..0d6dfda 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 43.%{?pre}%{?dist} +Release: 44.%{?pre}%{?dist} %else -Release: 13%{?dist} +Release: 14%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -395,6 +395,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sun Dec 31 2017 Sérgio Basto - 1.3.0-14 +- Mass rebuild for x264 and x265 + * Mon Oct 23 2017 Leigh Scott - 1.3.0-13 - Exclude ix86 (rfbz #4687) From edf5fc338449b94722089e9178e76b5b569d0e9e Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 18 Jan 2018 00:33:09 +0000 Subject: [PATCH 36/54] Rebuilt for ffmpeg-3.5 git --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 0d6dfda..341e90e 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 44.%{?pre}%{?dist} +Release: 45.%{?pre}%{?dist} %else -Release: 14%{?dist} +Release: 15%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -395,6 +395,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Jan 18 2018 Leigh Scott - 1.3.0-15 +- Rebuilt for ffmpeg-3.5 git + * Sun Dec 31 2017 Sérgio Basto - 1.3.0-14 - Mass rebuild for x264 and x265 From 258d4c202fa22ef2a4d26dae3e64b453472ee07c Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 19 Jan 2018 13:12:11 +0000 Subject: [PATCH 37/54] 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(-) delete mode 100644 mplayer-add-include_vdpau_x11.patch delete mode 100644 mplayer-fix-screenshot-crash.patch delete mode 100644 mplayer-fix-vo_png.patch 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-add-include_vdpau_x11.patch b/mplayer-add-include_vdpau_x11.patch deleted file mode 100644 index 3c2891b..0000000 --- a/mplayer-add-include_vdpau_x11.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 2fe876f5ed67edd72e6da4fd0ccaae03a1952d4c Mon Sep 17 00:00:00 2001 -From: al -Date: Wed, 19 Apr 2017 23:06:04 +0000 -Subject: [PATCH] vo_vdpau: Explicitly include header vdpau_x11.h - -The include from inside libavcodec/vdpau.h was removed in FFmpeg -commit d40e181bec22014a9ea312ab6837f7f0bc4f9e42 . ---- - libvo/vo_vdpau.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c -index 7b94cad1b9..99f08d6c7b 100644 ---- a/libvo/vo_vdpau.c -+++ b/libvo/vo_vdpau.c -@@ -34,6 +34,7 @@ - - #include - #include -+#include - - #include "config.h" - #include "sub/ass_mp.h" diff --git a/mplayer-fix-screenshot-crash.patch b/mplayer-fix-screenshot-crash.patch deleted file mode 100644 index 9f17461..0000000 --- a/mplayer-fix-screenshot-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bbaf524d691d6bfecfd65175259fd61abc6e5f69 Mon Sep 17 00:00:00 2001 -From: rtogni -Date: Sun, 3 Jul 2016 20:06:11 +0000 -Subject: [PATCH] Fix crash with screenshot filter. - -avcodec_open2() now requires timebase to be always set, even for png images. -The patch sets it to 1/1, since pictures do not have a framerate. - -Patch by Thomas Kirsten (Tho_Ki gmx de) ---- - libmpcodecs/vf_screenshot.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c -index 4692d20..992ea6d 100644 ---- a/libmpcodecs/vf_screenshot.c -+++ b/libmpcodecs/vf_screenshot.c -@@ -81,6 +81,8 @@ static int config(struct vf_instance *vf, - vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24; - vf->priv->avctx->width = d_width; - vf->priv->avctx->height = d_height; -+ vf->priv->avctx->time_base.num = 1; -+ vf->priv->avctx->time_base.den = 1; - vf->priv->avctx->compression_level = 0; - if (avcodec_open2(vf->priv->avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL)) { - mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n"); diff --git a/mplayer-fix-vo_png.patch b/mplayer-fix-vo_png.patch deleted file mode 100644 index 62b100c..0000000 --- a/mplayer-fix-vo_png.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3e7a0f39e5acf4e9da96cb075050e51e24e81403 Mon Sep 17 00:00:00 2001 -From: rtogni -Date: Sun, 7 Aug 2016 20:44:47 +0000 -Subject: [PATCH] Fix vo_png with recent ffmpeg - -avcodec_open2() now requires timebase to be always set, even for png images. -The patch sets it to 1/1, since pictures do not have a framerate. ---- - libvo/vo_png.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libvo/vo_png.c b/libvo/vo_png.c -index 38a4097..5696a1f 100644 ---- a/libvo/vo_png.c -+++ b/libvo/vo_png.c -@@ -136,6 +136,8 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin - avctx->pix_fmt = imgfmt2pixfmt(format); - avctx->width = width; - avctx->height = height; -+ avctx->time_base.num = 1; -+ avctx->time_base.den = 1; - if (avcodec_open2(avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL) < 0) { - uninit(); - return -1; 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 - 1.3.0-46.20180119svn +- Update to latest svn + * Thu Jan 18 2018 Leigh Scott - 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 From 977ac27fbc84fdccb689edfea746891cc6826a48 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 19 Jan 2018 13:21:50 +0000 Subject: [PATCH 38/54] fix version --- mplayer.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index c34dc27..fdd5c84 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,7 +7,7 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 46.%{?pre}%{?dist} +Release: 16.%{?pre}%{?dist} %else Release: 16%{?dist} %endif @@ -383,7 +383,7 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog -* Fri Jan 19 2018 Leigh Scott - 1.3.0-46.20180119svn +* Fri Jan 19 2018 Leigh Scott - 1.3.0-16.20180119svn - Update to latest svn * Thu Jan 18 2018 Leigh Scott - 1.3.0-15 From 4aa8063bae42b03993787b1cbc1000fe0e645500 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 28 Jan 2018 15:56:15 +0100 Subject: [PATCH 39/54] Rebuilt --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index fdd5c84..a4ead7f 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 16.%{?pre}%{?dist} +Release: 17.%{?pre}%{?dist} %else -Release: 16%{?dist} +Release: 17%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -383,6 +383,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Sun Jan 28 2018 Nicolas Chauvet - 1.3.0-17.20180119svn +- Rebuilt for libcdio + * Fri Jan 19 2018 Leigh Scott - 1.3.0-16.20180119svn - Update to latest svn From 9af01d273f7c1d38d3215ed4cd2b66627b37af5b Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 1 Mar 2018 10:21:13 +0000 Subject: [PATCH 40/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: leigh123linux --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index a4ead7f..3183aa7 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 17.%{?pre}%{?dist} +Release: 18.%{?pre}%{?dist} %else -Release: 17%{?dist} +Release: 18%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -383,6 +383,9 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Thu Mar 01 2018 RPM Fusion Release Engineering - 1.3.0-18.20180119svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sun Jan 28 2018 Nicolas Chauvet - 1.3.0-17.20180119svn - Rebuilt for libcdio From a71ef72afbd28483b7c2347e108689c9f18b3a2b Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 5 Mar 2018 09:12:47 +0000 Subject: [PATCH 41/54] Disable runtime cpu detection for i686 --- mplayer.spec | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 3183aa7..0c69c31 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 18.%{?pre}%{?dist} +Release: 19.%{?pre}%{?dist} %else -Release: 18%{?dist} +Release: 19%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -34,7 +34,6 @@ Patch1: %{name}-manlinks.patch # use system FFmpeg libraries Patch3: %{name}-ffmpeg.patch -ExcludeArch: %{ix86} BuildRequires: SDL-devel BuildRequires: a52dec-devel @@ -185,7 +184,7 @@ This package contains various scripts from MPlayer TOOLS directory. --enable-menu \\\ --enable-radio \\\ --enable-radio-capture \\\ -%ifarch %{ix86} x86_64 ppc ppc64 \ +%ifarch x86_64 ppc ppc64 \ --enable-runtime-cpudetection \\\ %endif \ --enable-unrarexec \\\ @@ -306,16 +305,6 @@ desktop-file-install \ install -dm 755 $RPM_BUILD_ROOT%{codecdir} -%post gui -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : -update-desktop-database &>/dev/null || : - - -%postun gui -gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || : -update-desktop-database &>/dev/null || : - - %files %{_bindir}/mplayer @@ -383,6 +372,10 @@ update-desktop-database &>/dev/null || : %{_datadir}/mplayer/*.fp %changelog +* Mon Mar 05 2018 Leigh Scott - 1.3.0-19.20180119svn +- Disable runtime cpu detection for i686 +- Remove scriptlets + * Thu Mar 01 2018 RPM Fusion Release Engineering - 1.3.0-18.20180119svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c8f442f25866bc801324f2ffcfba8d1893cf30e0 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Thu, 8 Mar 2018 16:37:14 +0000 Subject: [PATCH 42/54] - Rebuilt for new ffmpeg snapshot Signed-off-by: leigh123linux --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 0c69c31..82de739 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 19.%{?pre}%{?dist} +Release: 20.%{?pre}%{?dist} %else -Release: 19%{?dist} +Release: 20%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -372,6 +372,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %{_datadir}/mplayer/*.fp %changelog +* Thu Mar 08 2018 RPM Fusion Release Engineering - 1.3.0-20.20180119svn +- Rebuilt for new ffmpeg snapshot + * Mon Mar 05 2018 Leigh Scott - 1.3.0-19.20180119svn - Disable runtime cpu detection for i686 - Remove scriptlets From 770cc9bf6f5218cd4c45435f2d9f88f4e0a9b4bd Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 24 Apr 2018 07:45:09 +0100 Subject: [PATCH 43/54] Rebuild for ffmpeg-4.0 release --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 82de739..8dce242 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 20.%{?pre}%{?dist} +Release: 21.%{?pre}%{?dist} %else -Release: 20%{?dist} +Release: 21%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -372,6 +372,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %{_datadir}/mplayer/*.fp %changelog +* Tue Apr 24 2018 Leigh Scott - 1.3.0-21.20180119svn +- Rebuild for ffmpeg-4.0 release + * Thu Mar 08 2018 RPM Fusion Release Engineering - 1.3.0-20.20180119svn - Rebuilt for new ffmpeg snapshot From 8f319e09b344038b4dc48dfbe1f7759827c5bd92 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 24 Apr 2018 08:45:35 +0100 Subject: [PATCH 44/54] Update to latest svn --- .gitignore | 1 + mplayer-snapshot.sh | 2 +- mplayer.spec | 11 +++++++---- sources | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 58f1b5e..76e5778 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ Blue-1.11.tar.bz2 MPlayer-1.3.0.tar.xz /mplayer-export-2018-01-19.tar.bz2 +/mplayer-export-2018-04-24.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index f7fc3f8..7155246 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2018-01-19 +svn=2018-04-24 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index 8dce242..9c0c8ce 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,15 +1,15 @@ %define codecdir %{_libdir}/codecs -%define pre 20180119svn +%define pre 20180424svn %define svn 1 -%define svnbuild 2018-01-19 +%define svnbuild 2018-04-24 %define faad2min 1:2.6.1 Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 21.%{?pre}%{?dist} +Release: 22.%{?pre}%{?dist} %else -Release: 21%{?dist} +Release: 22%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -372,6 +372,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %{_datadir}/mplayer/*.fp %changelog +* Tue Apr 24 2018 Leigh Scott - 1.3.0-22.20180424svn +- Update to latest svn + * Tue Apr 24 2018 Leigh Scott - 1.3.0-21.20180119svn - Rebuild for ffmpeg-4.0 release diff --git a/sources b/sources index 535cb24..810cf36 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 -72d9ed506f0273a8943d5d02d5e79a82 mplayer-export-2018-01-19.tar.bz2 +5d7574ce1eb48775ae652bcd9d0677b0 mplayer-export-2018-04-24.tar.bz2 From b7cd7fac4fcfcb1a9de81cca72dd61932a03a0ca Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 17 Jun 2018 10:35:46 +0100 Subject: [PATCH 45/54] Rebuild for new libass version --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 9c0c8ce..b01567e 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 22.%{?pre}%{?dist} +Release: 23.%{?pre}%{?dist} %else -Release: 22%{?dist} +Release: 23%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -372,6 +372,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %{_datadir}/mplayer/*.fp %changelog +* Sun Jun 17 2018 Leigh Scott - 1.3.0-23.20180424svn +- Rebuild for new libass version + * Tue Apr 24 2018 Leigh Scott - 1.3.0-22.20180424svn - Update to latest svn From cba237cb39ec571925ee2b610137abe0e645bc15 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 20 Jun 2018 09:37:29 +0100 Subject: [PATCH 46/54] Enable runtime cpu detection for i686 again --- .gitignore | 1 + mplayer-snapshot.sh | 2 +- mplayer.spec | 14 +++++++++----- sources | 3 +-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 76e5778..b086bb1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ Blue-1.11.tar.bz2 MPlayer-1.3.0.tar.xz /mplayer-export-2018-01-19.tar.bz2 /mplayer-export-2018-04-24.tar.bz2 +/mplayer-export-2018-06-20.tar.bz2 diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh index 7155246..1e02014 100755 --- a/mplayer-snapshot.sh +++ b/mplayer-snapshot.sh @@ -13,7 +13,7 @@ cleanup() { unset CDPATH pwd=$(pwd) svn=$(date +%Y-%m-%d) -svn=2018-04-24 +svn=2018-06-20 dirname=mplayer-export-$svn mplayer_rev={$svn} #mplayer_rev=HEAD diff --git a/mplayer.spec b/mplayer.spec index b01567e..264bb7c 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -1,15 +1,15 @@ %define codecdir %{_libdir}/codecs -%define pre 20180424svn +%define pre 20180620svn %define svn 1 -%define svnbuild 2018-04-24 +%define svnbuild 2018-06-20 %define faad2min 1:2.6.1 Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 23.%{?pre}%{?dist} +Release: 24.%{?pre}%{?dist} %else -Release: 23%{?dist} +Release: 24%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -184,7 +184,7 @@ This package contains various scripts from MPlayer TOOLS directory. --enable-menu \\\ --enable-radio \\\ --enable-radio-capture \\\ -%ifarch x86_64 ppc ppc64 \ +%ifarch %{ix86} x86_64 ppc ppc64 \ --enable-runtime-cpudetection \\\ %endif \ --enable-unrarexec \\\ @@ -372,6 +372,10 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %{_datadir}/mplayer/*.fp %changelog +* Wed Jun 20 2018 Leigh Scott - 1.3.0-24.20180620svn +- Update to latest svn +- Enable runtime cpu detection for i686 again + * Sun Jun 17 2018 Leigh Scott - 1.3.0-23.20180424svn - Rebuild for new libass version diff --git a/sources b/sources index 810cf36..c72c20f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 -5d7574ce1eb48775ae652bcd9d0677b0 mplayer-export-2018-04-24.tar.bz2 +5ba14bca349b6afcd7624ae7dd664c5d mplayer-export-2018-06-20.tar.bz2 From 493b0cdab358da01496f61cada557fd4f8714390 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 20 Jun 2018 09:53:43 +0100 Subject: [PATCH 47/54] readd lost source --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index c72c20f..c773f62 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 5ba14bca349b6afcd7624ae7dd664c5d mplayer-export-2018-06-20.tar.bz2 From 91b9cd4c0fe7b67842fe5fc4f49c6649888e55f0 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 27 Jul 2018 05:05:00 +0100 Subject: [PATCH 48/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: leigh123linux --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 264bb7c..98d10c4 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 24.%{?pre}%{?dist} +Release: 25.%{?pre}%{?dist} %else -Release: 24%{?dist} +Release: 25%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -372,6 +372,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %{_datadir}/mplayer/*.fp %changelog +* Fri Jul 27 2018 RPM Fusion Release Engineering - 1.3.0-25.20180620svn +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jun 20 2018 Leigh Scott - 1.3.0-24.20180620svn - Update to latest svn - Enable runtime cpu detection for i686 again From 9b29c9e41f2a83cc4d25ac96613391731d62cc0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 4 Oct 2018 22:13:03 +0100 Subject: [PATCH 49/54] Mass rebuild for x264 and/or x265 --- mplayer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index 98d10c4..d8c8aba 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 25.%{?pre}%{?dist} +Release: 26.%{?pre}%{?dist} %else -Release: 25%{?dist} +Release: 26%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -372,6 +372,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %{_datadir}/mplayer/*.fp %changelog +* Thu Oct 04 2018 Sérgio Basto - 1.3.0-26.20180620svn +- Mass rebuild for x264 and/or x265 + * Fri Jul 27 2018 RPM Fusion Release Engineering - 1.3.0-25.20180620svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From a0fe5d4646037a0f7b9572c8f8d1588dc455a813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 11 Oct 2018 04:24:02 +0100 Subject: [PATCH 50/54] Fix this message error [1] on rfpkg push [1] Could not execute sources: sources has invalid content: de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 Please note that sources file must not be modified manually. --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index c773f62..9875f39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 +de7b4438b68729089d92912f041abe54 Blue-1.11.tar.bz2 5ba14bca349b6afcd7624ae7dd664c5d mplayer-export-2018-06-20.tar.bz2 From 3b6c0d2514fa4b009bf36c17f8960445ed7d3976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 11 Oct 2018 04:47:04 +0100 Subject: [PATCH 51/54] Add BuildRequires: gcc-c++ --- mplayer.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index d8c8aba..7fed9b8 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -38,8 +38,8 @@ Patch3: %{name}-ffmpeg.patch BuildRequires: SDL-devel BuildRequires: a52dec-devel BuildRequires: aalib-devel -BuildRequires: bzip2-devel BuildRequires: alsa-lib-devel +BuildRequires: bzip2-devel BuildRequires: desktop-file-utils BuildRequires: enca-devel BuildRequires: faad2-devel >= %{faad2min} @@ -47,6 +47,7 @@ BuildRequires: ffmpeg-devel >= 0.10 BuildRequires: fontconfig-devel BuildRequires: freetype-devel >= 2.0.9 BuildRequires: fribidi-devel +BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: gsm-devel BuildRequires: gtk2-devel From 3ef425a5beee697a8108209813ee461b01d4422d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 11 Oct 2018 05:12:30 +0100 Subject: [PATCH 52/54] Fix ambiguous python shebang --- mplayer.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mplayer.spec b/mplayer.spec index 7fed9b8..9435fe0 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -304,6 +304,7 @@ desktop-file-install \ # Codec dir install -dm 755 $RPM_BUILD_ROOT%{codecdir} +find %{buildroot}%{_bindir}/mythtv/ -type f -name "*.py" -exec sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' {} ';' %files @@ -375,6 +376,9 @@ install -dm 755 $RPM_BUILD_ROOT%{codecdir} %changelog * Thu Oct 04 2018 Sérgio Basto - 1.3.0-26.20180620svn - Mass rebuild for x264 and/or x265 +- Fix sources +- Add BuildRequires: gcc-c++ +- Fix ambiguous python shebang * Fri Jul 27 2018 RPM Fusion Release Engineering - 1.3.0-25.20180620svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 4b39f0f40c496b62c43d06f6cceaf6de77d5be5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 11 Oct 2018 05:18:25 +0100 Subject: [PATCH 53/54] fix typo --- mplayer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mplayer.spec b/mplayer.spec index 9435fe0..c7cffd6 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -304,7 +304,7 @@ desktop-file-install \ # Codec dir install -dm 755 $RPM_BUILD_ROOT%{codecdir} -find %{buildroot}%{_bindir}/mythtv/ -type f -name "*.py" -exec sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' {} ';' +sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir}/vobshift %files From dc7f1a7afcfc5a2a8f2f5239bced60c9d9539b19 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 6 Dec 2018 22:06:37 +0100 Subject: [PATCH 54/54] Rebuild for ffmpeg-3.4.5 on el7 --- mplayer.spec | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/mplayer.spec b/mplayer.spec index c7cffd6..04c49bd 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -7,9 +7,9 @@ Name: mplayer Version: 1.3.0 %if 0%{?svn} -Release: 26.%{?pre}%{?dist} +Release: 27.%{?pre}%{?dist} %else -Release: 26%{?dist} +Release: 27%{?dist} %endif Summary: Movie player playing most video formats and DVDs @@ -105,7 +105,7 @@ BuildRequires: libxml2 BuildRequires: libxslt %endif Obsoletes: mplayer-fonts -Requires: faad2-libs >= %{faad2min} +Requires: faad2-libs%{?_isa} >= %{faad2min} Requires: mplayer-common = %{version}-%{release} Provides: mplayer-backend @@ -161,8 +161,8 @@ MPlayer documentation in various languages. %package tools Summary: Useful scripts for MPlayer -Requires: mencoder = %{version}-%{release} -Requires: mplayer = %{version}-%{release} +Requires: mencoder%{?_isa} = %{version}-%{release} +Requires: mplayer%{?_isa} = %{version}-%{release} %description tools This package contains various scripts from MPlayer TOOLS directory. @@ -234,24 +234,28 @@ cp -a `ls -1|grep -v GUI` GUI/ %build pushd GUI +export CC=gcc +export CXX=g++ %{mp_configure}--enable-gui --disable-mencoder -%{__make} V=1 %{?_smp_mflags} +%make_build V=1 popd +export CC=gcc +export CXX=g++ %{mp_configure} -%{__make} V=1 %{?_smp_mflags} +%make_build V=1 %if 0%{?svn} # build HTML documentation from XML files -%{__make} html-chunked +%make_build V=1 html-chunked %endif %install rm -rf $RPM_BUILD_ROOT doc -make install DESTDIR=$RPM_BUILD_ROOT INSTALLSTRIP= +%make_install INSTALLSTRIP= for file in aconvert.sh divx2svcd.sh mencvcd.sh midentify.sh mpconsole.sh qepdvcd.sh subsearch.sh ; do install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .sh` done @@ -306,6 +310,19 @@ desktop-file-install \ install -dm 755 $RPM_BUILD_ROOT%{codecdir} sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir}/vobshift +%if 0%{?rhel} +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +%endif %files %{_bindir}/mplayer @@ -374,6 +391,11 @@ sed -i '1s:#!/usr/bin/env python:#!/usr/bin/env python2:' %{buildroot}%{_bindir} %{_datadir}/mplayer/*.fp %changelog +* Mon Nov 12 2018 Antonio Trande - 1.3.0-27.20180620svn +- Rebuild for ffmpeg-3.4.5 on el7 +- Rebuild for x264-0.148 on el7 +- Add icon-cache scriptlets for epel only + * Thu Oct 04 2018 Sérgio Basto - 1.3.0-26.20180620svn - Mass rebuild for x264 and/or x265 - Fix sources