CVS commit: pkgsrc/multimedia/ffmpeg3

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun May 28 02:09:18 UTC 2017

Modified Files:
        pkgsrc/multimedia/ffmpeg3: options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg3/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.6 pkgsrc/multimedia/ffmpeg3/options.mk:1.7
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.6    Sat Apr 15 09:26:47 2017
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Sun May 28 02:09:18 2017
@@ -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