rpms/mplayer/devel .cvsignore, 1.12, 1.13 mplayer-snapshot.sh, 1.3, 1.4 mplayer.spec, 1.22, 1.23 sources, 1.13, 1.14 mplayer-cflags.patch, 1.1, NONE mplayer-manlinks.patch, 1.2, NONE mplayer-ppc-compile.patch, 1.1, NONE

[NicolasChauvet]

Author: kwizart

Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25667/devel

Modified Files:
	.cvsignore mplayer-snapshot.sh mplayer.spec sources 
Removed Files:
	mplayer-cflags.patch mplayer-manlinks.patch 
	mplayer-ppc-compile.patch 
Log Message:
- Update to snapshot 20091021
  mplayer svn rev: 29776
  ffmpeg : HEAD
  dvdnav : HEAD
- Move from amrnb amrwb to opencore-amr
- Conditionalize faac (moved to nonfree).



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	31 Mar 2009 17:37:39 -0000	1.12
+++ .cvsignore	21 Oct 2009 21:10:53 -0000	1.13
@@ -1,2 +1,2 @@
 Blue-1.7.tar.bz2
-mplayer-export-2009-03-29.tar.bz2
+mplayer-export-20091021.tar.bz2


Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mplayer-snapshot.sh	16 Oct 2008 20:03:52 -0000	1.3
+++ mplayer-snapshot.sh	21 Oct 2009 21:10:53 -0000	1.4
@@ -12,18 +12,25 @@
 
 unset CDPATH
 pwd=$(pwd)
-svn=$(date +%Y-%m-%d)
+svn=20091021
 dirname=mplayer-export-$svn
+mplayer_rev=29776
+ffmpeg_rev=HEAD
+dvdnav_rev=HEAD
 
 cd "$tmp"
-svn checkout -r {$svn} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
+svn checkout -r ${mplayer_rev} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
 cd $dirname
+
 rm -rf libdvdcss
 for dir in libav* libpostproc ; do
 	cd $dir
-	svn update -r {$svn}
+	svn update -r ${ffmpeg_rev}
 	cd ..
 done
+svn update -r ${dvdnav_rev} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread/src libdvdread4
+svn update -r ${dvdnav_rev} svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav/src libdvdnav
+
 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_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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- mplayer.spec	31 Mar 2009 18:14:20 -0000	1.22
+++ mplayer.spec	21 Oct 2009 21:10:53 -0000	1.23
@@ -1,12 +1,12 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20090329svn
+%define         pre 20091021svn
 %define         svn 1
-%define         svnbuild 2009-03-29
+%define         svnbuild 20091021
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
 Version:        1.0
-Release:        0.109.%{pre}%{?dist}
+Release:        0.110.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
@@ -20,10 +20,7 @@
 %endif
 Source1:        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
 Source10:       mplayer-snapshot.sh
-Patch1:         %{name}-ppc-compile.patch
 Patch2:         %{name}-config.patch
-Patch3:         %{name}-cflags.patch
-Patch8:         %{name}-manlinks.patch
 Patch10:        %{name}-qcelp.patch
 Patch14:        %{name}-nodvdcss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,7 +32,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  em8300-devel
 BuildRequires:  enca-devel
-BuildRequires:  faac-devel
+%{?_with_faac: BuildRequires:  faac-devel}
 BuildRequires:  faad2-devel >= %{faad2min}
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel >= 2.0.9
@@ -58,6 +55,7 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmpcdec-devel
 BuildRequires:  libtheora-devel
+BuildRequires:  libvdpau-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  lirc-devel
 BuildRequires:  live555-devel
@@ -69,7 +67,7 @@
 BuildRequires:  xvidcore-devel >= 0.9.2
 BuildRequires:  yasm
 %{?_with_arts:BuildRequires: arts-devel}
-%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
+%{!?_without_amr:BuildRequires: opencore-amr-devel}
 %{?_with_directfb:BuildRequires: directfb-devel}
 %{?_with_esound:BuildRequires: esound-devel}
 %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
@@ -163,7 +161,7 @@
     --disable-mp3lame-lavc \\\
     --disable-x264-lavc \\\
     \\\
-    %{!?_with_amr:--disable-libamr_nb --disable-libamr_wb} \\\
+    %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
     --disable-faad-internal \\\
     %{!?_with_libmad:--disable-mad} \\\
     --disable-tremor-internal \\\
@@ -190,12 +188,8 @@
 %else
 %setup -q -n MPlayer-%{version}%{pre}
 %endif
-%patch1 -p1 -b .ppc-compile
 %patch2 -p1 -b .config
-%patch3 -p1 -b .cflags
-%patch8 -p1 -b .manlinks
-%patch10 -p1 -b .qclp
-%patch14 -p1 -b .nodvdcss
+
 
 doconv() {
     iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -340,6 +334,14 @@
 
 
 %changelog
+* Wed Oct 21 2009 kwizart < kwizart at gmail.com > - 1.0-0.110.20091021svn
+- Update to snapshot 20091021
+  mplayer svn rev: 29776
+  ffmpeg : HEAD
+  dvdnav : HEAD
+- Move from amrnb amrwb to opencore-amr
+- Conditionalize faac (moved to nonfree).
+
 * Sun Mar 29 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.109.20090329svn
 - 20090329 snapshot from 1.0rc3 branch
 - fix RPM_OPT_FLAGS usage


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Mar 2009 17:37:39 -0000	1.13
+++ sources	21 Oct 2009 21:10:53 -0000	1.14
@@ -1,2 +1,2 @@
 e4e2020d11b681aac898103b3ba723c4  Blue-1.7.tar.bz2
-96ec2dfd73bbd2e2f5d3476870a9fbcb  mplayer-export-2009-03-29.tar.bz2
+416fa47da802f9aa256de0ce98371613  mplayer-export-20091021.tar.bz2


--- mplayer-cflags.patch DELETED ---


--- mplayer-manlinks.patch DELETED ---


--- mplayer-ppc-compile.patch DELETED ---