6:49 p.m.
Author: belegdol
Update of /cvs/free/rpms/mplayer/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28027
Modified Files:
.cvsignore mplayer-snapshot.sh mplayer.spec sources
Added Files:
mplayer-streamswitch.patch
Log Message:
* Wed Feb 29 2012 Julian Sikorski <belegdol(a)fedoraproject.org> -
1.0-0.129.20110917svn
- 20110917 snapshot
- Fixed audio streams switching using a patch from SVN
mplayer-streamswitch.patch:
main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- NEW FILE mplayer-streamswitch.patch ---
diff -up mplayer-export-2011-09-24/gui/ui/main.c.streamswitch
mplayer-export-2011-09-24/gui/ui/main.c
--- mplayer-export-2011-09-24/gui/ui/main.c.streamswitch 2012-02-29 00:48:32.000000000
+0100
+++ mplayer-export-2011-09-24/gui/ui/main.c 2012-02-29 15:53:10.021379433 +0100
@@ -154,13 +154,15 @@ void uiEventHandling( int msg,float para
case evSetAudio:
if ( !mpctx_get_demuxer(guiInfo.mpcontext) || audio_id == iparam ) break;
+ mp_property_do("switch_audio",M_PROPERTY_SET,&iparam,guiInfo.mpcontext);
audio_id=iparam;
- goto play;
+ break;
case evSetVideo:
if ( !mpctx_get_demuxer(guiInfo.mpcontext) || video_id == iparam ) break;
+ mp_property_do("switch_video",M_PROPERTY_SET,&iparam,guiInfo.mpcontext);
video_id=iparam;
- goto play;
+ break;
case evSetSubtitle:
mp_property_do("sub",M_PROPERTY_SET,&iparam,guiInfo.mpcontext);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 23 Sep 2011 21:30:14 -0000 1.24
+++ .cvsignore 1 Mar 2012 18:49:32 -0000 1.25
@@ -1,6 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2011-01-10.tar.bz2
-mplayer-export-2011-02-27.tar.bz2
-mplayer-export-2011-04-04.tar.bz2
-mplayer-export-2011-04-12.tar.bz2
-mplayer-export-2011-08-16.tar.bz2
+mplayer-export-2011-09-17.tar.bz2
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/mplayer-snapshot.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer-snapshot.sh 10 Jan 2011 18:48:43 -0000 1.7
+++ mplayer-snapshot.sh 1 Mar 2012 18:49:32 -0000 1.8
@@ -13,7 +13,7 @@
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-#svn=2010-12-05
+svn=2011-09-17
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/mplayer.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- mplayer.spec 28 Feb 2012 19:14:41 -0000 1.42
+++ mplayer.spec 1 Mar 2012 18:49:32 -0000 1.43
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20110816svn
+%define pre 20110917svn
%define svn 1
-%define svnbuild 2011-08-16
+%define svnbuild 2011-09-17
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.128.%{pre}%{?dist}
+Release: 0.129.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -23,6 +23,8 @@
%endif
Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
Source10: mplayer-snapshot.sh
+# http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2001
+Patch1: %{name}-streamswitch.patch
# set defaults for Fedora
Patch2: %{name}-config.patch
# use roff include statements instead of symlinks
@@ -218,6 +220,7 @@
%else
%setup -q -n MPlayer-%{version}%{pre}
%endif
+%patch1 -p1 -b .streamswitch
%patch2 -p1 -b .config
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
@@ -376,6 +379,10 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Wed Feb 29 2012 Julian Sikorski <belegdol(a)fedoraproject.org> -
1.0-0.129.20110917svn
+- 20110917 snapshot
+- Fixed audio streams switching using a patch from SVN
+
* Tue Feb 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> -
1.0-0.128.20110816svn
- Added libbs2b-devel to BuildRequires (RPM Fusion bug #2157)
- Fixed --with directfb (RPM Fusion bug #2141)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-15/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 23 Sep 2011 21:30:15 -0000 1.25
+++ sources 1 Mar 2012 18:49:32 -0000 1.26
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-a63483caa8a603ccefbb8e29bf94b4c7 mplayer-export-2011-08-16.tar.bz2
+eb85e737efede638540af5f7eca938e0 mplayer-export-2011-09-17.tar.bz2