diff options
| author | maya <maya@pkgsrc.org> | 2017-05-28 02:09:18 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2017-05-28 02:09:18 +0000 |
| commit | 45293d1e1aa670bf9188a4a283c8c58877f03d82 (patch) | |
| tree | e6211e77047df922c6eaa9b9e78dd838b68997de /multimedia | |
| parent | 93998d1dc90ed905cb4b026f0ab7079b86f722ed (diff) | |
| download | pkgsrc-45293d1e1aa670bf9188a4a283c8c58877f03d82.tar.gz | |
ffmpeg3: introduce x11 option (default on) and wrap vaapi/vdpau
options with it- makes it easier for non-x11 users to disable those.
may want to make vdpau/vaapi just an option again, limited (if any)
benefit. but this fixes the immediate problem of pulling in Xorg
unnecessarily.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg3/options.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/multimedia/ffmpeg3/options.mk b/multimedia/ffmpeg3/options.mk index 4ae5cd8d95f..bcd1572d29f 100644 --- a/multimedia/ffmpeg3/options.mk +++ b/multimedia/ffmpeg3/options.mk @@ -1,13 +1,13 @@ -# $NetBSD: options.mk,v 1.6 2017/04/15 09:26:47 adam Exp $ +# $NetBSD: options.mk,v 1.7 2017/05/28 02:09:18 maya Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg3 PKG_SUPPORTED_OPTIONS= ass doc fdk-aac fontconfig freetype \ gnutls lame libvpx opencore-amr openssl opus theora \ - vorbis x264 x265 xcb xvid + vorbis x11 x264 x265 xcb xvid PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \ - theora vorbis x264 xvid + theora vorbis x11 x264 xvid PLIST_VARS+= doc @@ -158,7 +158,7 @@ CONFIGURE_ARGS+= --disable-libx265 .endif # VDPAU support -.if !empty(PKG_OPTIONS:Mvdpau) +.if !empty(PKG_OPTIONS:Mvdpau) && !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-vdpau .include "../../multimedia/libvdpau/buildlink3.mk" .else @@ -166,7 +166,7 @@ CONFIGURE_ARGS+= --disable-vdpau .endif # VAAPI support -.if !empty(PKG_OPTIONS:Mvaapi) +.if !empty(PKG_OPTIONS:Mvaapi) && !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-vaapi .include "../../multimedia/libva/buildlink3.mk" .else |