diff options
| author | leot <leot@pkgsrc.org> | 2017-05-29 08:38:16 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2017-05-29 08:38:16 +0000 |
| commit | fbbb0f2272b1918acc410029c9ebcc3971741749 (patch) | |
| tree | fd1236c9765f0b0f85e86d711b26d0f9240baed2 /multimedia/ffmpeg2 | |
| parent | b02feae8f8ae245809a7360dae49d003f1cbb3cd (diff) | |
| download | pkgsrc-fbbb0f2272b1918acc410029c9ebcc3971741749.tar.gz | |
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 (limited to 'multimedia/ffmpeg2')
| -rw-r--r-- | multimedia/ffmpeg2/options.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/multimedia/ffmpeg2/options.mk b/multimedia/ffmpeg2/options.mk index 930600d8e30..ea5971677cf 100644 --- a/multimedia/ffmpeg2/options.mk +++ b/multimedia/ffmpeg2/options.mk @@ -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 |