Contribs: update dvdread to 4.9.9

Ref #6649

diff --git a/contrib/src/dvdread/SHA512SUMS b/contrib/src/dvdread/SHA512SUMS
index 421c032cec2bacbe6fc15819c312254d706a2685..e7fb247180eb1e2837730cdca6fa40f63ffb6439 100644 (file)
--- a/contrib/src/dvdread/SHA512SUMS
+++ b/contrib/src/dvdread/SHA512SUMS
@@ -1 +1 @@
-192802a05f4b6561bd3d85ea54a29861d98ec947a5eeaa45a8d53389744c31570ee5dbdf3fbd0645ea8e6b254795e39d0948d54849dad99252155db00501b21f  libdvdread-4.2.0.tar.bz2
+ff304009808e7697a88c7bc4249484668f05bcc58e560d255a7c6d1320bb40bf81a289b58d287d9f14b4df7c37456902957133e589763ad282812521905048b9  libdvdread-4.9.9.tar.bz2

diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index 03c5a3f8b29e462699d281269ab5c4aa935bdc56..a542b1d780b18c49b5e7664dfe910b1b422839cc 100644 (file)
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,30 +1,30 @@
 # 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