Contribs: fix compilation for Android

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

diff --git a/contrib/src/dvdnav/rules.mak b/contrib/src/dvdnav/rules.mak
index a579724611b80125bda8f3a54672226e4c9476e9..c6ac8b48bb8cccb8509ad2de877c8e14b00011a0 100644 (file)
--- a/contrib/src/dvdnav/rules.mak
+++ b/contrib/src/dvdnav/rules.mak
@@ -1,35 +1,31 @@
 # DVDNAV
 
-# 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
+LIBDVDNAV_VERSION := 5.0.1
+LIBDVDNAV_URL := $(VIDEOLAN)/libdvdnav/$(LIBDVDNAV_VERSION)/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
+ifdef GPL
 PKGS += dvdnav
 endif
-ifeq ($(call need_pkg,"dvdnav"),)
+endif
+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.xz
-       $(warning $@ not implemented)
-       touch $@
+.sum-dvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 
-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
        $(MOVE)
 
 DEPS_dvdnav = dvdcss dvdread
 
 .dvdnav: dvdnav .dvdcss .dvdread
-       cd $< && sh autogen.sh noconfig
        cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-examples
        cd $< && $(MAKE) install
        touch $@