rpms/mplayer/devel .cvsignore, 1.9, 1.10 mplayer-nodvdcss.patch, 1.2, 1.3 mplayer.spec, 1.14, 1.15 sources, 1.10, 1.11 mplayer-man-zh_CN.patch, 1.1, NONE

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	.cvsignore mplayer-nodvdcss.patch mplayer.spec sources 
Removed Files:
	mplayer-man-zh_CN.patch 
Log Message:
* Wed Feb 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.106.20090204svn
- 20090204 snapshot
- dropped obsolete patch
- dropped obsolete BR



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	8 Jan 2009 21:45:06 -0000	1.9
+++ .cvsignore	11 Feb 2009 17:46:38 -0000	1.10
@@ -1,2 +1,2 @@
-mplayer-export-2009-01-07.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/devel/mplayer-nodvdcss.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-nodvdcss.patch	8 Jan 2009 21:45:06 -0000	1.2
+++ mplayer-nodvdcss.patch	11 Feb 2009 17:46:38 -0000	1.3
@@ -1,6 +1,6 @@
-diff -up mplayer-export-2009-01-07/configure.nodvdcss mplayer-export-2009-01-07/configure
---- mplayer-export-2009-01-07/configure.nodvdcss	2009-01-07 00:27:10.000000000 +0100
-+++ mplayer-export-2009-01-07/configure	2009-01-07 00:27:10.000000000 +0100
+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
@@ -10,10 +10,10 @@
  _xanim=auto
  _real=auto
  _live=auto
-diff -up mplayer-export-2009-01-07/Makefile.nodvdcss mplayer-export-2009-01-07/Makefile
---- mplayer-export-2009-01-07/Makefile.nodvdcss	2009-01-07 00:27:10.000000000 +0100
-+++ mplayer-export-2009-01-07/Makefile	2009-01-07 00:27:10.000000000 +0100
-@@ -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 \
-@@ -732,7 +727,6 @@ DIRS =  . \
+@@ -743,7 +738,6 @@ DIRS =  . \
          libavcodec/x86 \
          libavformat \
          libavutil \
 -        libdvdcss \
-         libdvdread \
-         libfaad2 \
-         libmenu \
-@@ -838,7 +832,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/devel/mplayer.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mplayer.spec	8 Jan 2009 21:45:06 -0000	1.14
+++ mplayer.spec	11 Feb 2009 17:46:38 -0000	1.15
@@ -1,12 +1,12 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20090107svn
+%define         pre 20090204svn
 %define         svn 1
-%define         svnbuild 2009-01-07
+%define         svnbuild 2009-02-04
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
 Version:        1.0
-Release:        0.105.%{pre}%{?dist}
+Release:        0.106.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
@@ -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)
 
@@ -36,7 +35,6 @@
 BuildRequires:  em8300-devel
 BuildRequires:  enca-devel
 BuildRequires:  faac-devel
-BuildRequires:  faad2 >= %{faad2min}
 BuildRequires:  faad2-devel >= %{faad2min}
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel >= 2.0.9
@@ -195,7 +193,6 @@
 %patch5 -p1 -b .compile
 %patch8 -p1 -b .manlinks
 %patch10 -p1 -b .qclp
-%patch12 -p1 -b .man-zh_CN
 %patch14 -p1 -b .nodvdcss
 
 doconv() {
@@ -206,8 +203,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
@@ -347,6 +342,11 @@
 
 
 %changelog
+* Wed Feb 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.106.20090204svn
+- 20090204 snapshot
+- dropped obsolete patch
+- dropped obsolete BR
+
 * Wed Jan 07 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.105.20090107svn
 - 20090107 snapshot
 - dropped .sh extension from shell scripts in %%{_bindir}


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	8 Jan 2009 21:45:06 -0000	1.10
+++ sources	11 Feb 2009 17:46:38 -0000	1.11
@@ -1,2 +1,2 @@
 e4e2020d11b681aac898103b3ba723c4  Blue-1.7.tar.bz2
-e4ad749b4ad4d824fef4a333a0ef0680  mplayer-export-2009-01-07.tar.bz2
+de38e1fcf6eb4666d80b3db0561de7b0  mplayer-export-2009-02-04.tar.bz2


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