vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Dec 1 00:34:46 2011 +0100| [ea75543d465356ce3e246501aeb686002bb7a40d] | committer: Jean-Baptiste Kempf
Contribs: update libbluray to 0.2.1 (cherry picked from commit 40c4a544452fb233bb3ffe6f4dcdb84018db44b4) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=ea75543d465356ce3e246501aeb686002bb7a40d --- contrib/src/bluray/SHA512SUMS | 1 + contrib/src/bluray/rules.mak | 17 ++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/src/bluray/SHA512SUMS b/contrib/src/bluray/SHA512SUMS new file mode 100644 index 0000000..f34136e --- /dev/null +++ b/contrib/src/bluray/SHA512SUMS @@ -0,0 +1 @@ +b938ca838d6e4ceaac74ca8850efb9d8c312638b70a9b42ebffd63bf703341eab3ce98b6edeea9b3284ba1d0f8b46fe803db1f668e72752e1e23e96435ac77dc libbluray-0.2.1.tar.bz2 diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index ff42ee8..5eb2884 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -3,26 +3,25 @@ ifdef BUILD_DISCS PKGS += libbluray endif -ifeq ($(call need_pkg,"libbluray"),) +ifeq ($(call need_pkg,"libbluray >= 0.2.1"),) PKGS_FOUND += libbluray endif -BLURAY_GITURL := git://git.videolan.org/libbluray.git +BLURAY_VERSION := 0.2.1 +BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/0.2.1/libbluray-0.2.1.tar.bz2 -$(TARBALLS)/libbluray-git.tar.xz: - $(call download_git,$(BLURAY_GITURL)) +$(TARBALLS)/libbluray-0.2.1.tar.bz2: + $(call download,$(BLURAY_URL)) -.sum-libbluray: libbluray-git.tar.xz - $(warning Integrity check skipped.) - touch $@ +.sum-bluray: libbluray-0.2.1.tar.bz2 -libbluray: libbluray-git.tar.xz .sum-libbluray +libbluray: libbluray-0.2.1.tar.bz2 .sum-bluray $(UNPACK) $(APPLY) $(SRC)/bluray/pkg-static.patch $(MOVE) .libbluray: libbluray cd $< && ./bootstrap - cd $< && $(HOSTVARS) ./configure --disable-examples --disable-debug $(HOSTCONF) + cd $< && $(HOSTVARS) ./configure --disable-examples --disable-debug --disable-libxml2 $(HOSTCONF) cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
