From 77b38910f11488cfd136a0b03725831846b64c7d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Tue, 16 Feb 2010 18:52:31 +0100
Subject: [PATCH] contribs: use libdvdcss 1.2.10 instead of HEAD to prevent
 issues on Win32 and Darwin

---
 extras/contrib/src/Makefile     | 32 ++++++++++++++++----------------
 extras/contrib/src/packages.mak |  4 ++--
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f5d086b9ea..84cc972458 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1096,33 +1096,33 @@ DISTCLEAN_PKG += ffmpeg-$(FFMPEG_VERSION).tar.gz
 # libdvdcss
 # ***************************************************************************
 
-libdvdcss-$(LIBDVDCSS_VERSION).tar.gz:
+libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2:
 	$(WGET) $(LIBDVDCSS_URL)
 
-ifdef SVN
-libdvdcss:
-	$(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
-	cd $@ && sh bootstrap
-else
-libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
-	$(EXTRACT_GZ)
-endif
+# ifdef SVN
+# libdvdcss:
+#	$(SVN) co svn://svn.videolan.org/libdvdcss/trunk libdvdcss
+#	cd $@ && sh bootstrap
+# else
+libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
+# endif
 
 .dvdcss: libdvdcss
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-doc --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
-ifdef SVN
-libdvdcss-source: libdvdcss
-	tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
-
-SOURCE += libdvdcss-source
-endif
+# ifdef SVN
+# libdvdcss-source: libdvdcss
+# 	tar cv --exclude=.svn libdvdcss | bzip2 > libdvdcss-$(DATE).tar.bz2
+#
+# SOURCE += libdvdcss-source
+# endif
 
 CLEAN_FILE += .dvdcss
 CLEAN_PKG += libdvdcss
-DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
+DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 
 # ***************************************************************************
 # dummy dvdread to trigger the INSTALL_NAME script
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index cfbac0d417..9be282bd11 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -99,8 +99,8 @@ LIBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
 FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
-LIBDVDCSS_VERSION=1.2.9
-LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
+LIBDVDCSS_VERSION=1.2.10
+LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 LIBDVDNAV_VERSION=4.1.1
 LIBDVDNAV_URL=http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
 LIBDVDNAV_SVN=svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
-- 
2.39.2