diff options
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 26 |
2 files changed, 26 insertions, 4 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 397fb75efa6..bf7354964c5 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2013/03/17 15:18:11 wiz Exp $ +# $NetBSD: Makefile,v 1.105 2013/04/14 01:36:44 cheusov Exp $ PKGNAME= ffmpeg-20130315.${DISTVERSION} - +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ COMMENT= Decoding, encoding and streaming software diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index 1cc2f43f64f..fd5b1621f5c 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.27 2013/03/02 09:57:02 adam Exp $ +# $NetBSD: options.mk,v 1.28 2013/04/14 01:36:44 cheusov Exp $ # Global and legacy options @@ -9,13 +9,21 @@ PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid #PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder #PKG_OPTIONS_GROUP.aac-decoder= faac -### Add vdpau if it is available +### Add VDPAU if it is available .include "../../multimedia/libvdpau/available.mk" .if ${VDPAU_AVAILABLE} == "yes" PKG_SUPPORTED_OPTIONS+= vdpau PKG_SUGGESTED_OPTIONS+= vdpau .endif +### Add VAAPI if it is available +.include "../../multimedia/libva/available.mk" +.if ${VAAPI_AVAILABLE} == "yes" +PKG_SUPPORTED_OPTIONS+= vaapi +PKG_SUGGESTED_OPTIONS+= vaapi +.endif + +### .include "../../mk/bsd.options.mk" ### @@ -113,11 +121,25 @@ CONFIGURE_ARGS+= --disable-libx264 ### VDPAU support ### .if !empty(PKG_OPTIONS:Mvdpau) +CONFIGURE_ARGS+= --enable-vdpau .include "../../multimedia/libvdpau/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-vdpau .endif +### +### VAAPI support +### +.if !empty(PKG_OPTIONS:Mvaapi) +CONFIGURE_ARGS+= --enable-vaapi +.include "../../multimedia/libva/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-vaapi +.endif + +### +### VPX support +### .if !empty(PKG_OPTIONS:Mlibvpx) CONFIGURE_ARGS+= --enable-libvpx .include "../../multimedia/libvpx/buildlink3.mk" |