X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=contrib%2Fsrc%2Fdvdnav%2Frules.mak;h=2d248932ef37f94c2712a33e8035d5b73b59873a;hb=e7403cbe50277f356469deb4bb361681d44684a0;hp=c58cf3a2a452073ccd534c2196aa5f5173eeb90c;hpb=ff208b73f4a9d5913cc7f4b170a98945d620b638;p=vlc

diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index c58cf3a2a4..2d248932ef 100644
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,30 +1,37 @@
 # 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
+ifdef GPL
 PKGS += dvdnav
 endif
+endif
 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))
+
+# $(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.bz2 .sum-dvdnav
+dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.xz .sum-dvdnav
 	$(UNPACK)
-	$(APPLY) $(SRC)/dvdnav/dvdnav.patch
-	$(APPLY) $(SRC)/dvdnav/libdvdnav-searching.c-check-cellnr-before-indexing.patch
 	$(MOVE)
 
 DEPS_dvdnav = dvdcss dvdread
 
 .dvdnav: dvdnav .dvdcss .dvdread
 	cd $< && sh autogen.sh noconfig
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples
 	cd $< && $(MAKE) install
 	touch $@