[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg2 Add an `x11' option (disabled by de...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f23f6f12a94
branches:  trunk
changeset: 362901:8f23f6f12a94
user:      leot <leot%pkgsrc.org@localhost>
date:      Mon May 29 08:38:16 2017 +0000

description:
Add an `x11' option (disabled by default) similar to multimedia/ffmpeg2 in
order to avoid pulling x11 dependencies.

Should address PR pkg/52021 reported by J?rn Clausen.

Thanks to <maya>!

diffstat:

 multimedia/ffmpeg2/options.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r e62a29b425cb -r 8f23f6f12a94 multimedia/ffmpeg2/options.mk
--- a/multimedia/ffmpeg2/options.mk     Mon May 29 07:50:01 2017 +0000
+++ b/multimedia/ffmpeg2/options.mk     Mon May 29 08:38:16 2017 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.11 2016/05/05 07:03:47 leot Exp $
+# $NetBSD: options.mk,v 1.12 2017/05/29 08:38:16 leot Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg2
 PKG_SUPPORTED_OPTIONS= ass doc faac fdk-aac fontconfig freetype gnutls lame \
-                       libvpx opencore-amr openssl theora vorbis x264 x265 \
-                       xcb xvid
+                       libvpx opencore-amr openssl theora 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
 
@@ -162,7 +162,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
@@ -170,7 +170,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