[vlc-commits] Contribs: update dvdnav to 5.0.0 release

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Aug  2 22:16:38 2014 +0200| [4a00f1b233cafd7d79eb68a2224a163609a21365] | committer: Jean-Baptiste Kempf

Contribs: update dvdnav to 5.0.0 release

(cherry picked from commit acb6a96407495ebaad1c9797257b0c43cb80c394)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=4a00f1b233cafd7d79eb68a2224a163609a21365
---

 contrib/src/dvdnav/SHA512SUMS |    2 +-
 contrib/src/dvdnav/rules.mak  |   21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/contrib/src/dvdnav/SHA512SUMS b/contrib/src/dvdnav/SHA512SUMS
index 9f79b1d..3286568 100644
--- a/contrib/src/dvdnav/SHA512SUMS
+++ b/contrib/src/dvdnav/SHA512SUMS
@@ -1 +1 @@
-f9b9c52af870bc088bc8bbc7a64285dc55906dcfd11d6849d8a7b4046b083472c3e898609ec399a45059e10cffce0ef67ec2dec2ec4f0a1c904b9b6d2a85185f  libdvdnav-4.2.0.tar.bz2
+f7e7977bf2c502ce88e7c3bc6c9f04ab176e3e613be8375074c19c536ecb57675ae6719d035797570c4a9123d207e4152adb23ef0a69eea8cad40e1aca397b6b  libdvdnav-5.0.0.tar.bz2
diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 9a4fc7b..2b2bf79 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,30 +1,23 @@
 # DVDNAV
 
-# LIBDVDNAV_VERSION := 4.2.0
-# LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-DVDNAV_GITURL := git://git.videolan.org/libdvdnav.git
-LIBDVDNAV_VERSION := git
+LIBDVDNAV_VERSION := 5.0.0
+LIBDVDNAV_URL := http://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
 ifdef GPL
 PKGS += dvdnav
 endif
 endif
-ifeq ($(call need_pkg,"dvdnav"),)
+ifeq ($(call need_pkg,"dvdnav > 4.9.9"),)
 PKGS_FOUND += dvdnav
 endif
 
-$(TARBALLS)/libdvdnav-git.tar.xz:
-	$(call download_git,$(DVDNAV_GITURL))
+$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+	$(call download,$(LIBDVDNAV_URL))
 
-# $(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
-# 	$(call download,$(LIBDVDNAV_URL))
+.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
-.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz
-	$(warning $@ not implemented)
-	touch $@
-
-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
+dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
 	$(UNPACK)
 	cd $(UNPACK_DIR) && sed -i -e 's,Requires.private,Requires,g' misc/*.pc.in
 	cd $(UNPACK_DIR) && autoreconf -ivf