Contribs: update libdvdnav patches

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 2dd7bd5bbbaf4b01d883b6c638fe30be34814bf6..5b2bd2ad85a8e01c036b3ac432d5e389d7bffa53 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1004,16 +1004,15 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p0 < ./Patches/libmatroska-kaxblock.patch
 ifdef HAVE_WIN32
-       (cd $@; patch -p0 < ../Patches/libmatroska-win32.patch)
+       patch -p0 < Patches/libmatroska-win32.patch
 endif
 
 .matroska: libmatroska .ebml
 ifdef HAVE_WIN32
-       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC2) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC2))
+       (cd $<; make -C make/mingw32 prefix=$(PREFIX) $(HOSTCC) SHARED=no EBML_DLL=no libmatroska.a && make -C make/linux install_staticlib install_headers prefix=$(PREFIX) $(HOSTCC))
 else
-       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
+       (cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC) staticlib && make -C make/linux install_staticlib install_headers prefix=$(PREFIX))
        $(RANLIB) $(PREFIX)/lib/libmatroska.a
 endif
        touch $@
@@ -1207,7 +1206,6 @@ ifdef SVN
 libdvdnav:
        $(SVN) co $(LIBDVDNAV_SVN)  libdvdnav
        patch -d libdvdnav -p0 < Patches/libdvdnav.patch
-       patch -d libdvdnav -p0 < Patches/libdvdnav-resolution.patch
        (cd $@; ./autogen.sh noconfig)
 else
 libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
@@ -2273,7 +2271,7 @@ ifdef HAVE_CYGWIN
 endif
 
 .tag: taglib
-       (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+       (cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --enable-mp4 --enable-asf --prefix=$(PREFIX) && make && make install)
        $(INSTALL_NAME)
        touch $@