Contribs: fix building libbluray 0.3.0 for Windows

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

diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak
index 7e88b267e1726a20a537440ce5085486d12d1dcf..645745b6107ff9a938492d814b68295c6177183c 100644 (file)
--- a/contrib/src/bluray/rules.mak
+++ b/contrib/src/bluray/rules.mak
@@ -7,7 +7,9 @@ ifeq ($(call need_pkg,"libbluray >= 0.2.1"),)
 PKGS_FOUND += bluray
 endif
 
-BLURAY_VERSION := 0.2.1
+DEPS_bluray = libxml2 $(DEPS_libxml2)
+
+BLURAY_VERSION := 0.3.0
 BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
 
 $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
@@ -17,11 +19,12 @@ $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
 
 bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
        $(UNPACK)
+       $(APPLY) $(SRC)/bluray/libbluray-win32.patch
        $(APPLY) $(SRC)/bluray/pkg-static.patch
        $(MOVE)
 
 .bluray: bluray
        cd $< && ./bootstrap
-       cd $< && $(HOSTVARS) ./configure --disable-examples --disable-debug --disable-libxml2 $(HOSTCONF)
+       cd $< && $(HOSTVARS) ./configure --disable-examples --disable-debug --enable-libxml2 $(HOSTCONF)
        cd $< && $(MAKE) install
        touch $@