[vlc-commits] Contribs: update libvpx to 'Bali'

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Mar 15 00:04:35 2011 +0100| [e3f3421deaea20261b95e0086db65a846d86449c] | committer: Jean-Baptiste Kempf

Contribs: update libvpx to 'Bali'

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

 extras/contrib/src/contrib-src.mak |   10 +++++-----
 extras/contrib/src/packages.mak    |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index 38e0ec2..914a1b9 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -871,11 +871,11 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 # libvp8
 # ***************************************************************************
 
-#ibvpx-$(VPX_VERSION).tar.bz2:
-#$(WGET) $(VPX_URL)
+libvpx-$(VPX_VERSION).tar.bz2:
+	$(WGET) $(VPX_URL)
 
-libvpx:
-	$(GIT) clone git://review.webmproject.org/libvpx.git
+libvpx: libvpx-$(VPX_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
 
 ifdef HAVE_WIN32
 CROSS=$(HOST)-
@@ -898,7 +898,7 @@ VPX_DEPS-$(HAVE_MACOSX_ON_INTEL) += .yasm
 
 CLEAN_FILE += .libvpx
 CLEAN_PKG += libvpx
-#DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2
+DISTCLEAN_PKG += libvpx-$(VPX_VERSION).tar.bz2
 
 # ***************************************************************************
 # lame
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 063db57..5027518 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -245,7 +245,7 @@ SQLITE_VERSION=3.6.20
 SQLITE_URL=http://www.sqlite.org/sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
 DXVA2_URL=$(CONTRIB_VIDEOLAN)/dxva2api.h
 D2D_URL=http://nodeload.github.com/2of1/d2d1headers/tarball/master
-VPX_VERSION=0.9.2
+VPX_VERSION=v0.9.6
 VPX_URL=http://webm.googlecode.com/files/libvpx-$(VPX_VERSION).tar.bz2
 GME_VERSION=0.5.5
 GME_URL=http://game-music-emu.googlecode.com/files/game-music-emu-$(GME_VERSION).tbz2