[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg3 ffmpeg3: introduce x11 option (defa...

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/050c71894039
branches:  trunk
changeset: 362860:050c71894039
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun May 28 02:09:18 2017 +0000

description:
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:

 multimedia/ffmpeg3/options.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 41e79edbdafc -r 050c71894039 multimedia/ffmpeg3/options.mk
--- a/multimedia/ffmpeg3/options.mk     Sun May 28 01:43:14 2017 +0000
+++ b/multimedia/ffmpeg3/options.mk     Sun May 28 02:09:18 2017 +0000
@@ -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 @@
 .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 @@
 .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