rpms/mplayer/F-10 .cvsignore, 1.7, 1.8 mplayer-nodvdcss.patch, 1.1, 1.2 mplayer.spec, 1.11, 1.12 sources, 1.8, 1.9 mplayer-man-zh_CN.patch, 1.1, NONE

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/mplayer/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26165

Modified Files:
	.cvsignore mplayer-nodvdcss.patch mplayer.spec sources 
Removed Files:
	mplayer-man-zh_CN.patch 
Log Message:
- 20090204 snapshot
- dropped obsolete/upstreamed patches
- BR: yasm for more asm optimizations



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-10/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Jan 2009 22:25:22 -0000	1.7
+++ .cvsignore	11 Feb 2009 17:42:43 -0000	1.8
@@ -1,2 +1,2 @@
-mplayer-export-2008-12-18.tar.bz2
 Blue-1.7.tar.bz2
+mplayer-export-2009-02-04.tar.bz2

mplayer-nodvdcss.patch:

Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-10/mplayer-nodvdcss.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-nodvdcss.patch	16 Oct 2008 20:03:52 -0000	1.1
+++ mplayer-nodvdcss.patch	11 Feb 2009 17:42:43 -0000	1.2
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2008-09-03/configure.nodvdcss mplayer-export-2008-09-03/configure
---- mplayer-export-2008-09-03/configure.nodvdcss	2008-10-16 21:22:23.000000000 +0200
-+++ mplayer-export-2008-09-03/configure	2008-10-16 21:30:47.000000000 +0200
-@@ -589,7 +589,7 @@ _dvdnavconfig=dvdnav-config
+diff -up mplayer-export-2009-02-02/configure.nodvdcss mplayer-export-2009-02-02/configure
+--- mplayer-export-2009-02-02/configure.nodvdcss	2009-02-02 01:15:29.000000000 +0100
++++ mplayer-export-2009-02-02/configure	2009-02-02 01:15:29.000000000 +0100
+@@ -617,7 +617,7 @@ _dvdnavconfig=dvdnav-config
  _dvdreadconfig=dvdread-config
  _dvdread=auto
  _dvdread_internal=auto
@@ -10,10 +10,10 @@
  _xanim=auto
  _real=auto
  _live=auto
-diff -up mplayer-export-2008-09-03/Makefile.nodvdcss mplayer-export-2008-09-03/Makefile
---- mplayer-export-2008-09-03/Makefile.nodvdcss	2008-10-16 21:22:23.000000000 +0200
-+++ mplayer-export-2008-09-03/Makefile	2008-10-16 21:27:12.000000000 +0200
-@@ -336,11 +336,6 @@ SRCS_COMMON-$(LIBDCA)                += 
+diff -up mplayer-export-2009-02-02/Makefile.nodvdcss mplayer-export-2009-02-02/Makefile
+--- mplayer-export-2009-02-02/Makefile.nodvdcss	2009-02-02 01:15:29.000000000 +0100
++++ mplayer-export-2009-02-02/Makefile	2009-02-02 01:15:56.000000000 +0100
+@@ -347,11 +347,6 @@ SRCS_COMMON-$(LIBDCA)                += 
  SRCS_COMMON-$(LIBDV)                 += libmpcodecs/ad_libdv.c \
                                          libmpcodecs/vd_libdv.c \
                                          libmpdemux/demux_rawdv.c
@@ -25,19 +25,19 @@
  
  SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
  SRCS_COMMON-$(LIBMPEG2)              += libmpcodecs/vd_libmpeg2.c \
-@@ -677,7 +672,6 @@ DIRS =  . \
-         libavcodec/sparc \
+@@ -743,7 +738,6 @@ DIRS =  . \
+         libavcodec/x86 \
          libavformat \
          libavutil \
 -        libdvdcss \
-         libdvdread \
-         libfaad2 \
-         libmenu \
-@@ -783,7 +777,6 @@ codec-cfg.d: codecs.conf.h
- mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
+         libdvdnav \
+         libdvdnav/vm \
+         libdvdread4 \
+@@ -851,7 +845,6 @@ codec-cfg.d: codecs.conf.h
+ mpcommon.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h
  $(DEPS): help_mp.h
  
 -libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
- libdvdread/%.o libdvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
+ libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\"
+ libdvdread4/%.o libdvdread4/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
  libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
- 


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-10/mplayer.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mplayer.spec	6 Jan 2009 22:25:22 -0000	1.11
+++ mplayer.spec	11 Feb 2009 17:42:43 -0000	1.12
@@ -1,7 +1,7 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20081218svn
+%define         pre 20090204svn
 %define         svn 1
-%define         svnbuild 2008-12-18
+%define         svnbuild 2009-02-04
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
@@ -24,7 +24,6 @@
 Patch5:         %{name}-x86_32-compile.patch
 Patch8:         %{name}-manlinks.patch
 Patch10:        %{name}-qcelp.patch
-Patch12:        %{name}-man-zh_CN.patch
 Patch14:        %{name}-nodvdcss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,7 +54,7 @@
 BuildRequires:  libcaca-devel
 BuildRequires:  libdca-devel
 BuildRequires:  libdv-devel
-BuildRequires:  libdvdnav-devel >= 4.1.3-0.4
+BuildRequires:  libdvdnav-devel >= 4.1.3-1
 BuildRequires:  libjpeg-devel
 BuildRequires:  libmpcdec-devel
 BuildRequires:  libtheora-devel
@@ -68,6 +67,9 @@
 BuildRequires:  twolame-devel
 BuildRequires:  x264-devel >= 0.0.0-0.14.20080613
 BuildRequires:  xvidcore-devel >= 0.9.2
+%ifarch %{ix86} x86_64
+BuildRequires:  yasm
+%endif
 %{?_with_arts:BuildRequires: arts-devel}
 %{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
 %{?_with_directfb:BuildRequires: directfb-devel}
@@ -194,7 +196,6 @@
 %patch5 -p1 -b .compile
 %patch8 -p1 -b .manlinks
 %patch10 -p1 -b .qclp
-%patch12 -p1 -b .man-zh_CN
 %patch14 -p1 -b .nodvdcss
 
 doconv() {
@@ -205,8 +206,6 @@
 for lang in hu pl ; do doconv iso-8859-2 utf-8 $lang ; done
 for lang in ru ; do doconv koi8-r utf-8 $lang ; done
 
-mv DOCS/man/zh DOCS/man/zh_CN
-
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ffast-math --std=gnu99"
 %ifarch ppc
@@ -346,10 +345,11 @@
 
 
 %changelog
-* Tue Jan 06 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.104.20081218svn
-- 20081218 snapshot
+* Tue Feb 10 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.104.20090204svn
+- 20090204 snapshot
 - dropped obsolete/upstreamed patches
 - dropped .sh extension from shell scripts in %%{_bindir}
+- BR: yasm for more asm optimizations
 
 * Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.103.20080903svn
 - fix broken terminal after using dvb input (bug #117)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-10/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	6 Jan 2009 22:25:22 -0000	1.8
+++ sources	11 Feb 2009 17:42:43 -0000	1.9
@@ -1,2 +1,2 @@
 e4e2020d11b681aac898103b3ba723c4  Blue-1.7.tar.bz2
-a1034c489750f70af6e7696a0cd509c7  mplayer-export-2008-12-18.tar.bz2
+de38e1fcf6eb4666d80b3db0561de7b0  mplayer-export-2009-02-04.tar.bz2


--- mplayer-man-zh_CN.patch DELETED ---