vlc | branch: master | Konstantin Pavlov <[email protected]> | Sun Mar 11 12:39:07 2012 +0400| [8d37aa9aeaa2f62f626e861dd8dd1b0842830270] | committer: Konstantin Pavlov
contribs: build libbluray with libxml2. Required for metadata support. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8d37aa9aeaa2f62f626e861dd8dd1b0842830270 --- contrib/src/bluray/pkg-static.patch | 2 +- contrib/src/bluray/rules.mak | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/src/bluray/pkg-static.patch b/contrib/src/bluray/pkg-static.patch index 8612148..e677b0d 100644 --- a/contrib/src/bluray/pkg-static.patch +++ b/contrib/src/bluray/pkg-static.patch @@ -6,5 +6,5 @@ diff -ru libbluray/src/libbluray.pc.in libbluray2/src/libbluray.pc.in Description: library supporting Blu-ray playback Version: @PACKAGE_VERSION@ -Libs: -L${libdir} -lbluray -+Libs: -L${libdir} -lbluray @DLOPEN_LDFLAGS@ ++Libs: -L${libdir} -lbluray @DLOPEN_LDFLAGS@ @LIBXML2_LIBS@ Cflags: -I${includedir} diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index 7e88b26..d0fc43d 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -7,6 +7,8 @@ ifeq ($(call need_pkg,"libbluray >= 0.2.1"),) PKGS_FOUND += bluray endif +DEPS_bluray = libxml2 $(DEPS_libxml2) + BLURAY_VERSION := 0.2.1 BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2 @@ -22,6 +24,6 @@ bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray .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 $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
