* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn

- updated to latest SVN snapshot
- dropped obsolete patches
- installed aconvert.sh to bindir
- fixed zh_CN manpage installation

.gitignore

@@ -1,2 +1,2 @@
 Blue-1.7.tar.bz2
-mplayer-export-2008-06-13.tar.bz2
+mplayer-export-2008-08-18.tar.bz2

mplayer-man-zh_CN.patch

@@ -0,0 +1,12 @@
+diff -up mplayer-export-2008-08-18/configure.man-zh_CN mplayer-export-2008-08-18/configure
+--- mplayer-export-2008-08-18/configure.man-zh_CN	2008-08-18 22:53:34.000000000 +0200
++++ mplayer-export-2008-08-18/configure	2008-08-18 23:33:58.000000000 +0200
+@@ -185,7 +185,7 @@ case `echo -n` in
+ esac
+ 
+ msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"`
+-man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"`
++man_lang_all=`echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g"`
+ doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"`
+ 
+ show_help(){

mplayer-r27449.patch

@@ -1,12 +0,0 @@
-Index: libmpdemux/demux_rtp_codec.cpp
-===================================================================
---- libmpdemux/demux_rtp_codec.cpp	(revision 27448)
-+++ libmpdemux/demux_rtp_codec.cpp	(revision 27449)
-@@ -198,6 +198,7 @@
-   sh_audio->wf = wf;
-   demux_stream_t* d_audio = demuxer->audio;
-   d_audio->sh = sh_audio; sh_audio->ds = d_audio;
-+  d_audio->id = sh_audio->aid;
-   
-   wf->nChannels = subsession->numChannels();
- 

mplayer.spec

@@ -1,13 +1,13 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20080613svn
+%define         pre 20080818svn
 %define         svn 1
-%define         svnbuild 2008-06-13
+%define         svnbuild 2008-08-18
-%define         svnrev 27055
+%define         svnrev 27470
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
 Version:        1.0
-Release:        0.96.%{pre}%{?dist}
+Release:        0.97.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
@@ -23,7 +23,7 @@ Patch2:         %{name}-config.patch
 Patch5:         %{name}-x86_32-compile.patch
 Patch8:         %{name}-manlinks.patch
 Patch10:        %{name}-qcelp.patch
-Patch11:        %{name}-r27449.patch
+Patch12:        %{name}-man-zh_CN.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -144,7 +144,7 @@ MPlayer documentation in various languages.
 %patch5 -p1 -b .compile
 %patch8 -p1 -b .manlinks
 %patch10 -p1 -b .qclp
-%patch11 -p0
+%patch12 -p1 -b .man-zh_CN
 
 doconv() {
     iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -172,9 +172,9 @@ export CFLAGS="$CFLAGS -maltivec -mabi=altivec"
     --libdir=%{_libdir} \
     --codecsdir=%{codecdir} \
     \
-    --disable-encoder=FAAC \
+    --disable-faac-lavc \
-    --disable-encoder=MP3LAME \
+    --disable-mp3lame-lavc \
-    --disable-encoder=X264 \
+    --disable-x264-lavc \
     \
     --enable-gui \
     --enable-largefiles \
@@ -226,9 +226,9 @@ mv -f mplayer gmplayer
     --libdir=%{_libdir} \
     --codecsdir=%{codecdir} \
     \
-    --disable-encoder=FAAC \
+    --disable-faac-lavc \
-    --disable-encoder=MP3LAME \
+    --disable-mp3lame-lavc \
-    --disable-encoder=X264 \
+    --disable-x264-lavc \
     \
     --enable-largefiles \
     --enable-unrarexec \
@@ -278,7 +278,9 @@ popd
 rm -rf $RPM_BUILD_ROOT doc
 
 make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
-install -pm 755 TOOLS/midentify $RPM_BUILD_ROOT%{_bindir}/
+for file in aconvert.sh midentify.sh ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/
+done
 
 # Clean up documentation
 mkdir doc
@@ -341,7 +343,8 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
 %config(noreplace) %{_sysconfdir}/mplayer/input.conf
 %config(noreplace) %{_sysconfdir}/mplayer/menu.conf
-%{_bindir}/midentify
+%{_bindir}/aconvert.sh
+%{_bindir}/midentify.sh
 %{_bindir}/mplayer
 %dir %{codecdir}/
 %dir %{_datadir}/mplayer/
@@ -391,6 +394,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 18 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn
+- updated to latest SVN snapshot
+- dropped obsolete patches
+- installed aconvert.sh to bindir
+- fixed zh_CN manpage installation
+
 * Sun Aug 17 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.96.20080613svn
 - live-devel is now live555-devel
 - added missing libXScrnSaver-devel BR

sources

@@ -1,2 +1,2 @@
 e4e2020d11b681aac898103b3ba723c4  Blue-1.7.tar.bz2
-86fe793e1f0dccc48b97cf39c8e232c3  mplayer-export-2008-06-13.tar.bz2
+f09caa71435c9c8818c2f681722042a7  mplayer-export-2008-08-18.tar.bz2