From c4bfd34d6804db14db9aa87800aa8fcf1aa0fa73 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Tue, 6 Oct 2015 20:07:09 +0000
Subject: ffmpeg: fix the linker errors of libvpx on -current (which already
 has an older version of libvpx)

---
 ffmpeg/build/ffmpeg.SlackBuild | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'ffmpeg')

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index d301675f..9c6ea666 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -1268,18 +1268,22 @@ case "$ARCH" in
     ;;
 esac
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="$SLKLDFLAGS" \
+CFLAGS="-I$FFMPEGDEPSDIR/usr/include $SLKCFLAGS" \
+CXXFLAGS="-I$FFMPEGDEPSDIR/usr/include $SLKCFLAGS" \
+LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
+PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure \
   --prefix=$FFMPEGDEPSDIR/usr \
   --libdir=$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} \
   --disable-examples \
   --disable-debug-libs \
   --disable-debug \
+  --disable-unit-tests \
   --enable-postproc \
   --enable-runtime-cpu-detect \
   --enable-vp8 \
+  --enable-vp9 \
+  --enable-vp9-postproc \
   $ARCHOPTS \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_vpx.log
 make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vpx.log
-- 
cgit v1.2.3