Contribs: update dvdread to 4.9.9

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

diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 340dca1784e004694e405b78daacb2d6cf298acb..a542b1d780b18c49b5e7664dfe910b1b422839cc 100644 (file)
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,41 +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
+LIBDVDREAD_VERSION := 4.9.9
+LIBDVDREAD_URL := http://download.videolan.org/pub/videolan/libdvdread/4.9.9/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"),)
+ifeq ($(call need_pkg,"dvdread > 4.9.0 "),)
 PKGS_FOUND += dvdread
 endif
 
-$(TARBALLS)/libdvdread-git.tar.xz:
-       $(call download_git,$(DVDREAD_GITURL))
+# $(TARBALLS)/libdvdread-git.tar.xz:
+#      $(call download_git,$(DVDREAD_GITURL))
 
-# $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
-#      $(call download,$(LIBDVDREAD_URL))
+$(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
+       $(call download,$(LIBDVDREAD_URL))
 
-.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz
-       $(warning $@ not implemented)
-       touch $@
+#.sum-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz
+#      $(warning $@ not implemented)
+#      touch $@
 
-dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.xz .sum-dvdread
+dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
        $(UNPACK)
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/dvdread/dvdread-win32.patch
 endif
-       $(APPLY) $(SRC)/dvdread/osx.patch
        cd $(UNPACK_DIR) && autoreconf -ivf
        $(MOVE)
 
 DEPS_dvdread = dvdcss
 
 .dvdread: dvdread .dvdcss
-       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-libdvdcss
+       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-libdvdcss
        cd $< && $(MAKE) install
        touch $@