rpms/mplayer/devel .cvsignore, 1.27, 1.28 mplayer-ffmpeg.patch, 1.6, 1.7 mplayer.spec, 1.55, 1.56 sources, 1.28, 1.29

Fri Jun 15 00:34:06 CEST 2012

Author: belegdol

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

Modified Files:
	.cvsignore mplayer-ffmpeg.patch mplayer.spec sources 
Log Message:
* Thu Jun 14 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.1-1
- Updated to 1.1
- Made %pre, %svn and %svnbuild defines optional
- Switched to .xz sources
- Updated the ffmpeg patch



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28

--- .cvsignore	29 Feb 2012 16:45:42 -0000	1.27
+++ .cvsignore	14 Jun 2012 22:34:06 -0000	1.28
@@ -1,2 +1,2 @@
 Blue-1.8.tar.bz2
-mplayer-export-2012-02-05.tar.bz2
+MPlayer-1.1.tar.xz

mplayer-ffmpeg.patch:
 Makefile                      |    2 
 configure                     |    4 -
 ffmpeg/libavformat/internal.h |   32 +++++++++++++
 ffmpeg/libavutil/x86_cpu.h    |   98 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 133 insertions(+), 3 deletions(-)

Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer-ffmpeg.patch	11 Mar 2012 23:28:14 -0000	1.6
+++ mplayer-ffmpeg.patch	14 Jun 2012 22:34:06 -0000	1.7
@@ -1,16 +1,16 @@
-diff -up mplayer-export-2012-02-05/configure.ffmpeg mplayer-export-2012-02-05/configure
---- mplayer-export-2012-02-05/configure.ffmpeg	2012-03-12 00:18:05.000000000 +0100
-+++ mplayer-export-2012-02-05/configure	2012-03-12 00:18:05.000000000 +0100
-@@ -6718,7 +6718,7 @@ elif test "$ffmpeg_so" = auto ; then
-     inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
-     ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
+diff -up MPlayer-1.1/configure.ffmpeg MPlayer-1.1/configure
+--- MPlayer-1.1/configure.ffmpeg	2012-06-12 19:54:45.573647100 +0200
++++ MPlayer-1.1/configure	2012-06-12 19:55:00.444732663 +0200
+@@ -6755,7 +6755,7 @@ elif test "$ffmpeg_so" = auto ; then
+     inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil)
+     ld_tmp=$($_pkg_config --libs libswscale libavformat libavcodec libavutil)
      header_check libavutil/avutil.h $inc_ffmpeg $ld_tmp &&
 -      extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes
 +      extra_ldflags="$extra_ldflags $ld_tmp" && ffmpeg_so=yes && ffmpeg=yes && extra_cflags="$extra_cflags $inc_ffmpeg"
-   elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil ; then
-     extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
+   elif header_check libavutil/avutil.h -lswscale -lavformat -lavcodec -lavutil ; then
+     extra_ldflags="$extra_ldflags -lswscale -lavformat -lavcodec -lavutil"
      ffmpeg_so=yes
-@@ -7407,7 +7407,7 @@ if test "$_gui" = yes ; then
+@@ -7464,7 +7464,7 @@ if test "$_gui" = yes ; then
  
    # Required libraries
    if test "$ffmpeg" != yes ||
@@ -19,9 +19,9 @@
      die "The GUI requires libavcodec with PNG support (needs zlib)."
    fi
    test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h
---- mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h.ffmpeg	2012-03-12 00:20:43.000000000 +0100
-+++ mplayer-export-2012-02-05/ffmpeg/libavformat/internal.h	2012-03-12 00:23:13.000000000 +0100
+diff -up MPlayer-1.1/ffmpeg/libavformat/internal.h.ffmpeg MPlayer-1.1/ffmpeg/libavformat/internal.h
+--- MPlayer-1.1/ffmpeg/libavformat/internal.h.ffmpeg	2012-06-12 19:54:45.578647128 +0200
++++ MPlayer-1.1/ffmpeg/libavformat/internal.h	2012-06-12 19:54:45.578647128 +0200
 @@ -0,0 +1,32 @@
 +/*
 + * copyright (c) 2001 Fabrice Bellard
@@ -55,9 +55,9 @@
 +} AVCodecTag;
 +
 +#endif /* AVFORMAT_INTERNAL_H */
-diff -up mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h.ffmpeg	2012-03-12 00:18:05.000000000 +0100
-+++ mplayer-export-2012-02-05/ffmpeg/libavutil/x86_cpu.h	2012-03-12 00:18:05.000000000 +0100
+diff -up MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h.ffmpeg MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h
+--- MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h.ffmpeg	2012-06-12 19:54:45.615647342 +0200
++++ MPlayer-1.1/ffmpeg/libavutil/x86_cpu.h	2012-06-12 19:54:45.615647342 +0200
 @@ -0,0 +1,98 @@
 +/*
 + * copyright (c) 2006 Michael Niedermayer <michaelni at gmx.at>
@@ -157,10 +157,10 @@
 +#endif
 +
 +#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2012-02-05/Makefile.ffmpeg mplayer-export-2012-02-05/Makefile
---- mplayer-export-2012-02-05/Makefile.ffmpeg	2012-03-12 00:18:05.000000000 +0100
-+++ mplayer-export-2012-02-05/Makefile	2012-03-12 00:18:05.000000000 +0100
-@@ -787,7 +787,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up MPlayer-1.1/Makefile.ffmpeg MPlayer-1.1/Makefile
+--- MPlayer-1.1/Makefile.ffmpeg	2012-06-12 19:54:45.573647100 +0200
++++ MPlayer-1.1/Makefile	2012-06-12 19:54:45.616647347 +0200
+@@ -788,7 +788,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
  	$(CC) -o $@ $^ $(EXTRALIBS)
  
  codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- mplayer.spec	13 Jun 2012 14:00:50 -0000	1.55
+++ mplayer.spec	14 Jun 2012 22:34:06 -0000	1.56
@@ -1,12 +1,12 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20120205svn
-%define         svn 1
-%define         svnbuild 2012-02-05
+#define         pre 20120205svn
+#define         svn 1
+#define         svnbuild 2012-02-05
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
-Version:        1.0
-Release:        0.139.%{pre}%{?dist}
+Version:        1.1
+Release:        1%{?pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 %if 0%{!?_without_amr:1}
@@ -15,11 +15,11 @@
 License:        GPLv2+
 %endif
 URL:            http://www.mplayerhq.hu/
-%if %{svn}
+%if 0%{?svn}
 # run ./mplayer-snapshot.sh to get this
 Source0:        mplayer-export-%{svnbuild}.tar.bz2
 %else
-Source0:        http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2
+Source0:        http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz
 %endif
 Source1:        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
 Source10:       mplayer-snapshot.sh
@@ -94,7 +94,7 @@
 %{?_with_samba:BuildRequires: libsmbclient-devel}
 %{?_with_svgalib:BuildRequires: svgalib-devel}
 %{?_with_xmms:BuildRequires: xmms-devel}
-%if %{svn}
+%if 0%{?svn}
 # for XML docs, SVN only
 BuildRequires:  docbook-dtds
 BuildRequires:  docbook-style-xsl
@@ -216,10 +216,11 @@
 
 
 %prep
-%if %{svn}
+%if 0%{?svn}
 %setup -q -n mplayer-export-%{svnbuild}
 %else
-%setup -q -n MPlayer-%{version}%{pre}
+%setup -q -n MPlayer-%{version}%{?pre}
+rm -rf ffmpeg libdvdcss libdvdnav libdvdread4
 %endif
 %patch0 -p0 -b .gmplayer-subtitles
 %patch2 -p1 -b .config
@@ -241,7 +242,7 @@
 
 %{__make} V=1 %{?_smp_mflags}
 
-%if %{svn}
+%if 0%{?svn}
 # build HTML documentation from XML files 
 %{__make} html-chunked
 %endif
@@ -381,6 +382,12 @@
 %{_datadir}/mplayer/*.fp
 
 %changelog
+* Thu Jun 14 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.1-1
+- Updated to 1.1
+- Made %%pre, %%svn and %%svnbuild defines optional
+- Switched to .xz sources
+- Updated the ffmpeg patch
+
 * Wed Jun 13 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-0.139.20120205svn
 - Restored the ability to disable subtitles in gmplayer (RPM Fusion bug #2373)
 - Rebuilt for ffmpeg-0.10.4


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	29 Feb 2012 16:45:42 -0000	1.28
+++ sources	14 Jun 2012 22:34:06 -0000	1.29
@@ -1,2 +1,2 @@
 340368f4e33f767d9df109990fb29c02  Blue-1.8.tar.bz2
-3f7055dd51cc3f5e95a555dd655924ad  mplayer-export-2012-02-05.tar.bz2
+ac7bf1cfedc1c5c24bfc83107eefb1d9  MPlayer-1.1.tar.xz
