contrib: ncurses: configure doesn't understand --datarootdir

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

diff --git a/contrib/src/dvdread/rules.mak b/contrib/src/dvdread/rules.mak
index a14acee7b4a071bc8bb89c14dedaada31e7acde7..66c1f66bad22c08b9de2568143d01b5bbc0845f6 100644 (file)
--- a/contrib/src/dvdread/rules.mak
+++ b/contrib/src/dvdread/rules.mak
@@ -1,12 +1,13 @@
 # DVDREAD
-
-LIBDVDREAD_VERSION := 4.2.0
-LIBDVDREAD_URL := http://dvdnav.mplayerhq.hu/releases/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
+LIBDVDREAD_VERSION := 5.0.0
+LIBDVDREAD_URL := $(VIDEOLAN)/libdvdread/$(LIBDVDREAD_VERSION)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 
 ifdef BUILD_DISCS
+ifdef GPL
 PKGS += dvdread
 endif
-ifeq ($(call need_pkg,"dvdread"),)
+endif
+ifeq ($(call need_pkg,"dvdread > 4.9.0 "),)
 PKGS_FOUND += dvdread
 endif
 
@@ -17,19 +18,16 @@ $(TARBALLS)/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
 
 dvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 .sum-dvdread
        $(UNPACK)
-       $(APPLY) $(SRC)/dvdread/dvdread-css-static.patch
-ifdef HAVE_MACOSX
-       $(APPLY) $(SRC)/dvdread/dvdread-css-static-osx.patch
-endif
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/dvdread/dvdread-win32.patch
 endif
+       cd $(UNPACK_DIR) && sed -i -e 's,Requires.private,Requires,g' misc/*.pc.in
+       cd $(UNPACK_DIR) && autoreconf -ivf
        $(MOVE)
 
 DEPS_dvdread = dvdcss
 
 .dvdread: dvdread .dvdcss
-       cd $< && sh autogen.sh noconfig
-       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-libdvdcss=$(PREFIX)
+       cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --with-libdvdcss
        cd $< && $(MAKE) install
        touch $@