rpms/mplayer/devel .cvsignore, 1.46, 1.47 mplayer-snapshot.sh, 1.28, 1.29 mplayer.spec, 1.93, 1.94 sources, 1.47, 1.48 mplayer-nodvdcss.patch, 1.12, NONE

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/mplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2080

Modified Files:
	.cvsignore mplayer-snapshot.sh mplayer.spec sources 
Removed Files:
	mplayer-nodvdcss.patch 
Log Message:
* Sat Jan 31 2015 Julian Sikorski <belegdol at fedoraproject.org> - 1.1-32.20150123svn
- 20150123 snapshot
- Internal libdvd* are no more, cleaned up the spec accordingly



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	21 Oct 2014 20:41:22 -0000	1.46
+++ .cvsignore	31 Jan 2015 08:45:06 -0000	1.47
@@ -1,2 +1,2 @@
 Blue-1.10.tar.bz2
-mplayer-export-2014-10-20.tar.bz2
+mplayer-export-2015-01-23.tar.bz2


Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mplayer-snapshot.sh	21 Oct 2014 20:41:22 -0000	1.28
+++ mplayer-snapshot.sh	31 Jan 2015 08:45:06 -0000	1.29
@@ -13,17 +13,15 @@
 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


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- mplayer.spec	21 Oct 2014 20:41:22 -0000	1.93
+++ mplayer.spec	31 Jan 2015 08:45:06 -0000	1.94
@@ -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 @@
 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 @@
 %endif \
     --enable-unrarexec \\\
     \\\
-    --disable-dvdread-internal \\\
-    --disable-libdvdcss-internal \\\
     %{!?_with_nemesi:--disable-nemesi} \\\
     %{!?_with_samba:--disable-smb} \\\
     \\\
@@ -219,11 +215,9 @@
 %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 @@
 %{_datadir}/mplayer/*.fp
 
 %changelog
+* Sat Jan 31 2015 Julian Sikorski <belegdol at fedoraproject.org> - 1.1-32.20150123svn
+- 20150123 snapshot
+- Internal libdvd* are no more, cleaned up the spec accordingly
+
 * Tue Oct 21 2014 Julian Sikorski <belegdol at fedoraproject.org> - 1.1-31.20141020svn
 - 20141020 snapshot
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	21 Oct 2014 20:41:22 -0000	1.47
+++ sources	31 Jan 2015 08:45:07 -0000	1.48
@@ -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


--- mplayer-nodvdcss.patch DELETED ---