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