contrib: dvdread: remove patch applied upstream

[vlc] / contrib / src / dvdread / rules.mak

diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 0412c425c136db6811b1d81d445885170d54d8dd..a3b37a86402c5b4cb3d8383280bd8b7931aefce0 100644 (file)
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,33 +1,40 @@
 # DVDREAD
 
+# LIBDVDREAD_VERSION := 4.2.0
+# LIBDVDREAD_URL := http://dvdnav.mplayerhq.hu/releases/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+DVDREAD_GITURL := git://git.videolan.org/libdvdread
+LIBDVDREAD_VERSION := git
+
 ifdef BUILD_DISCS
+ifdef GPL
 PKGS += dvdread
 endif
+endif
 ifeq ($(call need_pkg,"dvdread"),)
 PKGS_FOUND += dvdread
 endif
 
-$(TARBALLS)/dvdread-svn.tar.xz:
-       rm -Rf dvdread-svn
-       $(SVN) export svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread dvdread-svn
-       tar cvJ dvdread-svn > $@
+$(TARBALLS)/libdvdread-git.tar.xz:
+       $(call download_git,$(DVDREAD_GITURL))
+
+# $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
+#      $(call download,$(LIBDVDREAD_URL))
 
-.sum-dvdread: dvdread-svn.tar.xz
-       $(warning Integrity check skipped.)
+.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz
+       $(warning $@ not implemented)
        touch $@
 
-dvdread: dvdread-svn.tar.xz .sum-dvdread
+dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz .sum-dvdread
        $(UNPACK)
-       $(APPLY) $(SRC)/dvdread/dvdread-css-static.patch
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/dvdread/dvdread-win32.patch
 endif
+       cd $(UNPACK_DIR) && autoreconf -ivf
        $(MOVE)
 
 DEPS_dvdread = dvdcss
 
 .dvdread: dvdread .dvdcss
-       cd $< && sh autogen.sh noconfig
-       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-libdvdcss=$(PREFIX)
+       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-libdvdcss
        cd $< && $(MAKE) install
        touch $@