[vlc-commits] contrib: bluray: use bluray rather than libbluray

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Wed Nov 30 23:10:39 2011 -0500| [e6d4ac18d61d3d699bab589e2fa761fa3c46017c] | committer: Jean-Baptiste Kempf

contrib: bluray: use bluray rather than libbluray

it's confusing enough to cause typos (sum-bluray instead of sum-libbluray)
and break make fetch
(cherry picked from commit 5f0ed1bb1cf17716b67db9f9fb30f85906119775)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=e6d4ac18d61d3d699bab589e2fa761fa3c46017c
---

 contrib/src/bluray/rules.mak |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak
index 09cebfc..7e88b26 100644
--- a/contrib/src/bluray/rules.mak
+++ b/contrib/src/bluray/rules.mak
@@ -1,26 +1,26 @@
 # LIBBLURAY
 
 ifdef BUILD_DISCS
-PKGS += libbluray
+PKGS += bluray
 endif
 ifeq ($(call need_pkg,"libbluray >= 0.2.1"),)
-PKGS_FOUND += libbluray
+PKGS_FOUND += bluray
 endif
 
 BLURAY_VERSION := 0.2.1
-BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/0.2.1/libbluray-0.2.1.tar.bz2
+BLURAY_URL := http://ftp.videolan.org/pub/videolan/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
 
-$(TARBALLS)/libbluray-0.2.1.tar.bz2:
+$(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
 	$(call download,$(BLURAY_URL))
 
-.sum-bluray: libbluray-0.2.1.tar.bz2
+.sum-bluray: libbluray-$(BLURAY_VERSION).tar.bz2
 
-libbluray: libbluray-0.2.1.tar.bz2 .sum-bluray
+bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
 	$(UNPACK)
 	$(APPLY) $(SRC)/bluray/pkg-static.patch
 	$(MOVE)
 
-.libbluray: libbluray
+.bluray: bluray
 	cd $< && ./bootstrap
 	cd $< && $(HOSTVARS) ./configure --disable-examples --disable-debug --disable-libxml2 $(HOSTCONF)
 	cd $< && $(MAKE) install