[vlc-commits] Contribs: use dvdnav fork on github

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Sep  4 11:25:39 2012 +0200| [5d555372fa5382e461965512a79d07f1fba4b105] | committer: Jean-Baptiste Kempf

Contribs: use dvdnav fork on github

Bored as hell of those crashes...
(cherry picked from commit d84b8db93bce76f078f190505226924c0c4cd3cc)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=5d555372fa5382e461965512a79d07f1fba4b105
---

 contrib/src/dvdnav/rules.mak |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index 2482aed..663c85d 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,7 +1,9 @@
 # DVDNAV
 
-LIBDVDNAV_VERSION := 4.2.0
-LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+# LIBDVDNAV_VERSION := 4.2.0
+# LIBDVDNAV_URL := http://dvdnav.mplayerhq.hu/releases/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+DVDNAV_GITURL := git://github.com/microe/libdvdnav
+LIBDVDNAV_VERSION := git
 
 ifdef BUILD_DISCS
 PKGS += dvdnav
@@ -10,12 +12,17 @@ ifeq ($(call need_pkg,"dvdnav"),)
 PKGS_FOUND += dvdnav
 endif
 
-$(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
-	$(call download,$(LIBDVDNAV_URL))
+$(TARBALLS)/libdvdnav-git.tar.xz:
+	$(call download_git,$(DVDNAV_GITURL))
 
-.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
+# $(TARBALLS)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2:
+# 	$(call download,$(LIBDVDNAV_URL))
 
-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 .sum-dvdnav
+.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz
+	$(warning $@ not implemented)
+	touch $@
+
+dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
 	$(UNPACK)
 	$(APPLY) $(SRC)/dvdnav/dvdnav.patch
 	$(MOVE)