[packages/mplayer] - up to 20150126

[arekm]

commit f6862649500e2ad6687a284acb8fef426fe88863
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Jan 26 22:07:23 2015 +0100

    - up to 20150126

 mplayer-ldflags.patch         |  4 ++--
 mplayer-vstream.patch         |  6 ++----
 mplayer.spec                  | 10 ++++------
 vstream-format-security.patch | 14 --------------
 4 files changed, 8 insertions(+), 26 deletions(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index 086584d..e86402f 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -108,9 +108,9 @@
 %endif
 
 # date from directory inside of tarball (like mplayer-export-2014-04-29)
-%define	snap	2014-12-03
+%define	snap	2015-01-26
 %define	ssnap	%(echo %{snap} | tr -d -)
-%define	rel	3
+%define	rel	1
 Summary:	MPlayer - THE Movie Player for UN*X
 Summary(de.UTF-8):	MPlayer ist ein unter der freien GPL-Lizenz stehender Media-Player
 Summary(es.UTF-8):	Otro reproductor de películas
@@ -129,9 +129,9 @@ License:	GPL
 Group:		Applications/Multimedia
 # Source0:        http://mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz
 Source0:	ftp://ftp.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2
-# Source0-md5:	2f37d5e386a7ce98fec54636602e7a58
+# Source0-md5:	b6afbac7bd090ca9830f631a304ad03a
 Source1:	http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2
-# Source1-md5:	25e00ca99eda7bb54546ce7c10b78464
+# Source1-md5:	a23313c2b360ec77950417151d8de760
 Source3:	ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 # Source3-md5:	7b47904a925cf58ea546ca15f3df160c
 Source5:	g%{name}.desktop
@@ -155,7 +155,6 @@ Patch17:	%{name}-gsm.patch
 Patch18:	%{name}-openjpeg.patch
 Patch19:	%{name}-shared.patch
 Patch20:	%{name}-vstream.patch
-Patch23:	vstream-format-security.patch
 
 # codecs, outputs, demuxers:
 Patch21:	%{name}-auto-expand.patch
@@ -408,7 +407,6 @@ cp -f etc/codecs.conf etc/codecs.win32.conf
 %patch18 -p1
 %{?with_shared:%patch19 -p1}
 %patch20 -p1
-%patch23 -p0
 
 # codecs, outputs, demuxers:
 %patch21 -p1
diff --git a/mplayer-ldflags.patch b/mplayer-ldflags.patch
index eb271cd..64f88fb 100644
--- a/mplayer-ldflags.patch
+++ b/mplayer-ldflags.patch
@@ -29,13 +29,13 @@
    echores "yes"
  else
    echores "no"
-@@ -8390,6 +8390,8 @@
+@@ -8320,6 +8320,8 @@ CFLAGS_NO_OMIT_LEAF_FRAME_POINTER = $cfl
  CFLAGS_STACKREALIGN      = $cflags_stackrealign
  CFLAGS_SVGALIB_HELPER    = $cflags_svgalib_helper
  
 +LDFLAGS            = $real_ldflags
 +
- EXTRALIBS          = $extra_ldflags $ld_static $timer_libs $extra_libs
+ EXTRALIBS          = $ld_static $extra_ldflags $timer_libs $extra_libs
  EXTRALIBS_MPLAYER  = $libs_mplayer
  EXTRALIBS_MENCODER = $libs_mencoder
 --- mplayer-r32669/Makefile.orig	2010-10-27 19:55:45.000000000 +0200
diff --git a/mplayer-vstream.patch b/mplayer-vstream.patch
index 09bf233..df36adb 100644
--- a/mplayer-vstream.patch
+++ b/mplayer-vstream.patch
@@ -9,13 +9,11 @@
  else
    noinputmodules="vstream $noinputmodules"
    def_vstream='#undef CONFIG_VSTREAM'
-@@ -8415,7 +8415,7 @@
- 
+@@ -8344,6 +8344,7 @@ CFLAGS_SVGALIB_HELPER    = $cflags_svgal
  LDFLAGS            = $real_ldflags
  
--EXTRALIBS          = $extra_ldflags $ld_static $timer_libs $extra_libs
+ EXTRALIBS          = $ld_static $extra_ldflags $timer_libs $extra_libs
 +EXTRALIBS          = $extra_ldflags $ndextra_ldflags $ld_static $timer_libs $extra_libs
  EXTRALIBS_MPLAYER  = $libs_mplayer
  EXTRALIBS_MENCODER = $libs_mencoder
  
-
diff --git a/vstream-format-security.patch b/vstream-format-security.patch
deleted file mode 100644
index 7e9e2af..0000000
--- a/vstream-format-security.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://devel.mplayer2.org/ticket/163
-http://devel.mplayer2.org/changeset/8cd71527ade21ea27ea24cdcc66dc71dca460f85/
-
-Index: stream/stream_vstream.c
-===================================================================
---- stream/stream_vstream.c	(revision 1888e57af7e1ce51517ad9bdc2d201eaf84a98d2)
-+++ stream/stream_vstream.c	(revision 8cd71527ade21ea27ea24cdcc66dc71dca460f85)
-@@ -57,5 +57,5 @@
-     vsnprintf(buf, 1024, format, va);
-     va_end(va);
--    mp_msg(MSGT_STREAM, MSGL_ERR, buf);
-+    mp_msg(MSGT_STREAM, MSGL_ERR, "%s", buf);
- }
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/f6862649500e2ad6687a284acb8fef426fe88863