[vlc-commits] contrib: vpx: autodetect libvpx

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug  6 10:43:15 2016 +0300| [5a08752c730fab1e590acfd9b753846e947b4ddf] | committer: Rémi Denis-Courmont

contrib: vpx: autodetect libvpx

VPX used to be an indirect dependency only. Now VLC has a codec plugin
though.

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

 contrib/src/vpx/rules.mak | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index adb550e..d501c52 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -3,6 +3,11 @@
 VPX_VERSION := 1.4.0
 VPX_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-$(VPX_VERSION).tar.bz2
 
+PKGS += vpx
+ifeq ($(call need_pkg,"vpx"),)
+PKGS_FOUND += vpx
+endif
+
 $(TARBALLS)/libvpx-$(VPX_VERSION).tar.bz2:
 	$(call download,$(VPX_URL))
 
@@ -85,7 +90,7 @@ VPX_CONF := \
 	--disable-dependency-tracking
 
 ifndef BUILD_ENCODERS
-	VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder
+VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder
 endif
 
 ifndef HAVE_WIN32