CVS commit: pkgsrc/multimedia/ffmpeg2

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Mon May 29 08:38:16 UTC 2017

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ffmpeg2/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/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.11 pkgsrc/multimedia/ffmpeg2/options.mk:1.12
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.11   Thu May  5 07:03:47 2016
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Mon May 29 08:38:16 2017
@@ -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 @@ 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
@@ -170,7 +170,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