Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7061
Modified Files:
mplayer-snapshot.sh 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-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
_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-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) +=
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 \
@@ -677,7 +672,6 @@ DIRS = . \
libavcodec/sparc \
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
$(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)
libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H
$(CFLAGS_FAAD_FIXED)
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-snapshot.sh 10 Sep 2008 18:58:49 -0000 1.2
+++ mplayer-snapshot.sh 16 Oct 2008 20:03:52 -0000 1.3
@@ -18,6 +18,7 @@
cd "$tmp"
svn checkout -r {$svn} svn://svn.mplayerhq.hu/mplayer/trunk $dirname
cd $dirname
+rm -rf libdvdcss
for dir in libav* libpostproc ; do
cd $dir
svn update -r {$svn}
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer.spec 12 Oct 2008 20:52:06 -0000 1.6
+++ mplayer.spec 16 Oct 2008 20:03:52 -0000 1.7
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.100.%{pre}%{?dist}
+Release: 0.101.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -26,6 +26,7 @@
Patch10: %{name}-qcelp.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
@@ -147,6 +148,7 @@
%patch10 -p1 -b .qclp
%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 && \
@@ -388,6 +390,9 @@
%changelog
+* Thu Oct 16 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.101.20080903svn
+- remove libdvdcss copy from the source tarball
+
* Sun Oct 12 2008 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.100.20080903svn
- backport the fix for CVE-2008-3827
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 10 Sep 2008 19:37:04 -0000 1.6
+++ sources 16 Oct 2008 20:03:52 -0000 1.7
@@ -1,2 +1,2 @@
-65263306ab6ea771758a9dbeabeb2773 mplayer-export-2008-09-03.tar.bz2
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
+756a884bb62230cdc7a0736b5c60d723 mplayer-export-2008-09-03.tar.bz2