From fd0b16df3f8f4f87db5d3da029e5d47c31040f26 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <dominik@greysector.net>
Date: Thu, 16 Oct 2008 20:03:52 +0000
Subject: [PATCH] - remove libdvdcss copy from the source tarball

---
 mplayer-nodvdcss.patch | 43 ++++++++++++++++++++++++++++++++++++++++++
 mplayer-snapshot.sh    |  1 +
 mplayer.spec           |  7 ++++++-
 sources                |  2 +-
 4 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 mplayer-nodvdcss.patch

diff --git a/mplayer-nodvdcss.patch b/mplayer-nodvdcss.patch
new file mode 100644
index 0000000..38d873c
--- /dev/null
+++ b/mplayer-nodvdcss.patch
@@ -0,0 +1,43 @@
+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)
+ 
diff --git a/mplayer-snapshot.sh b/mplayer-snapshot.sh
index b7e556a..fe29881 100755
--- a/mplayer-snapshot.sh
+++ b/mplayer-snapshot.sh
@@ -18,6 +18,7 @@ dirname=mplayer-export-$svn
 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}
diff --git a/mplayer.spec b/mplayer.spec
index 5adc0c4..0bed9fd 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -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 @@ Patch8:         %{name}-manlinks.patch
 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 @@ MPlayer documentation in various languages.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %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
 
diff --git a/sources b/sources
index 25adcf0..e906d81 100644
--- a/sources
+++ b/sources
@@ -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