From 4503d938649c700086d5ee4169beeeb54d1f0e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 3 Apr 2015 00:52:40 -0400
Subject: [PATCH] contrib: fix android libav deps

Refs #70083

Change-Id: Iba3305ee2e4dc634c6879db7e92ed9dd484a9336
---
 contrib/src/libav/rules.mak | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/contrib/src/libav/rules.mak b/contrib/src/libav/rules.mak
index f010f45532..94a762bdda 100644
--- a/contrib/src/libav/rules.mak
+++ b/contrib/src/libav/rules.mak
@@ -28,15 +28,13 @@ LIBAVCONF += \
 		--enable-parser=h263 \
 		--enable-parser=h264 \
 		--enable-parser=mpeg4video \
-		--enable-parser=opus \
-		--enable-parser=vp8
+		--enable-parser=opus
 
 #librairies
 LIBAVCONF += \
 		--enable-libx264 \
 		--enable-libopus \
-		--enable-libspeex \
-		--enable-libvpx
+		--enable-libspeex
 
 #encoders/decoders
 LIBAVCONF += \
@@ -54,20 +52,24 @@ LIBAVCONF += \
 		--enable-decoder=libopus \
 		--enable-encoder=mpeg4 \
 		--enable-decoder=mpeg4 \
-		--enable-encoder=libvpx_vp8 \
-		--enable-decoder=vp8 \
 		--enable-encoder=h263 \
 		--enable-decoder=h263 \
 		--enable-encoder=libspeex \
 		--enable-decoder=libspeex
 
 # Linux
-ifdef HAVE_LINUX
+ifndef HAVE_ANDROID
 LIBAVCONF += \
-	--enable-x11grab
+		--enable-parser=vp8 \
+		--enable-libvpx \
+		--enable-encoder=libvpx_vp8 \
+		--enable-decoder=vp8
 endif
 
-DEPS_libav = zlib x264 vpx $(DEPS_vpx)
+DEPS_libav = zlib x264 opus speex
+ifndef HAVE_ANDROID
+DEPS_libav += vpx $(DEPS_vpx)
+endif
 
 ifdef HAVE_CROSS_COMPILE
 LIBAVCONF += --enable-cross-compile
-- 
GitLab