rpms/mplayer/F-8 mplayer-nodvdcss.patch, NONE, 1.1 mplayer.spec, 1.4, 1.5 sources, 1.2, 1.3

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	mplayer.spec sources 
Added Files:
	mplayer-nodvdcss.patch 
Log Message:
- remove libdvdcss copy from the source tarball

mplayer-nodvdcss.patch:

--- NEW FILE mplayer-nodvdcss.patch ---
diff -up mplayer-export-2008-08-18/configure.nodvdcss mplayer-export-2008-08-18/configure
--- mplayer-export-2008-08-18/configure.nodvdcss	2008-10-17 10:01:45.000000000 +0200
+++ mplayer-export-2008-08-18/configure	2008-10-17 10:01:45.000000000 +0200
@@ -587,7 +587,7 @@ _dvdnavconfig=dvdnav-config
 _dvdreadconfig=dvdread-config
 _dvdread=auto
 _dvdread_internal=auto
-_libdvdcss_internal=auto
+_libdvdcss_internal=no
 _xanim=auto
 _real=auto
 _live=auto
diff -up mplayer-export-2008-08-18/Makefile.nodvdcss mplayer-export-2008-08-18/Makefile
--- mplayer-export-2008-08-18/Makefile.nodvdcss	2008-10-17 10:01:45.000000000 +0200
+++ mplayer-export-2008-08-18/Makefile	2008-10-17 10:02:13.000000000 +0200
@@ -336,11 +336,6 @@ SRCS_COMMON-$(LIBDCA)                += 
 SRCS_COMMON-$(LIBDV)                 += libmpcodecs/ad_libdv.c \
                                         libmpcodecs/vd_libdv.c \
                                         libmpdemux/demux_rawdv.c
-SRCS_COMMON-$(LIBDVDCSS_INTERNAL)    += libdvdcss/css.c \
-                                        libdvdcss/device.c \
-                                        libdvdcss/error.c \
-                                        libdvdcss/ioctl.c \
-                                        libdvdcss/libdvdcss.c \
 
 SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
 SRCS_COMMON-$(LIBMPEG2)              += libmpcodecs/vd_libmpeg2.c \
@@ -678,7 +673,6 @@ DIRS =  . \
         libavcodec/sparc \
         libavformat \
         libavutil \
-        libdvdcss \
         libfaad2 \
         libmenu \
         libmpcodecs \
@@ -784,7 +778,6 @@ mencoder.d mplayer.d vobsub.d gui/win32/
 $(DEPS): help_mp.h
 
 dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD)
-libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS)
 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED)
 
 loader/% loader/%: CFLAGS += -Iloader -fno-omit-frame-pointer $(CFLAGS_NO_OMIT_LEAF_FRAME_POINTER)


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-8/mplayer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mplayer.spec	12 Oct 2008 20:52:05 -0000	1.4
+++ mplayer.spec	17 Oct 2008 08:27:59 -0000	1.5
@@ -7,7 +7,7 @@
 
 Name:           mplayer
 Version:        1.0
-Release:        0.97.%{pre}%{?dist}
+Release:        0.97.%{pre}%{?dist}.1
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
@@ -19,6 +19,7 @@
 Source0:        http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre}.tar.bz2
 %endif
 Source1:        http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
+Source10:       mplayer-snapshot.sh
 Patch2:         %{name}-config.patch
 Patch5:         %{name}-x86_32-compile.patch
 Patch8:         %{name}-manlinks.patch
@@ -26,6 +27,7 @@
 Patch11:        %{name}-dvdread.patch
 Patch12:        %{name}-man-zh_CN.patch
 Patch13:        %{name}-CVE-2008-3827.patch
+Patch14:        %{name}-nodvdcss.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -150,6 +152,7 @@
 %patch11 -p1 -b .dvdread
 %patch12 -p1 -b .man-zh_CN
 %patch13 -p0 -b .cve
+%patch14 -p1 -b .nodvdcss
 
 doconv() {
     iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -406,6 +409,9 @@
 
 
 %changelog
+* Thu Oct 16 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn.1
+- remove libdvdcss copy from the source tarball
+
 * Sun Oct 12 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.97.20080818svn
 - backport the fix for CVE-2008-3827
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	19 Aug 2008 15:17:48 -0000	1.2
+++ sources	17 Oct 2008 08:27:59 -0000	1.3
@@ -1,2 +1,2 @@
 e4e2020d11b681aac898103b3ba723c4  Blue-1.7.tar.bz2
-f09caa71435c9c8818c2f681722042a7  mplayer-export-2008-08-18.tar.bz2
+25725d45060aae8e15f06d05d004b758  mplayer-export-2008-08-18.tar.bz2