From c646c0eb513b0a8b7c760cba494cd144db5c73f2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 30 Jan 2014 14:33:05 +0100 Subject: [PATCH] ffmpeg: rework PKG_DEPENDS, replace and merge PKG_BUILD_DEPENDS_* with PKG_DEPENDS_* Signed-off-by: Stephan Raue --- packages/multimedia/ffmpeg/package.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/multimedia/ffmpeg/package.mk b/packages/multimedia/ffmpeg/package.mk index 8e1a84b11b..35c99976e3 100644 --- a/packages/multimedia/ffmpeg/package.mk +++ b/packages/multimedia/ffmpeg/package.mk @@ -23,8 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="LGPL" PKG_SITE="http://ffmpeg.org" PKG_URL="http://ffmpeg.org/releases/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS_TARGET="zlib bzip2 libvorbis gnutls" -PKG_BUILD_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis gnutls" +PKG_DEPENDS_TARGET="toolchain yasm:host zlib bzip2 libvorbis gnutls" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video." @@ -34,15 +33,16 @@ PKG_IS_ADDON="no" PKG_AUTORECONF="no" if [ "$VAAPI" = yes ]; then - PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libva" - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva" +# configure GPU drivers and dependencies: + get_graphicdrivers + + PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $LIBVA" FFMPEG_VAAPI="--enable-vaapi" else FFMPEG_VAAPI="--disable-vaapi" fi if [ "$VDPAU" = yes ]; then - PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libvdpau" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau" FFMPEG_VDPAU="--enable-vdpau" else