ffmpeg*: Make x11 option imply xcb.

This way x11grab works without rebuilding.

6 files changed, 21 insertions, 13 deletions

diff --git a/multimedia/ffmpeg2/Makefile b/multimedia/ffmpeg2/Makefile
index d553dc1f0ba..6d2dff07e25 100644
--- a/multimedia/ffmpeg2/Makefile
+++ b/multimedia/ffmpeg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2019/01/03 11:56:08 bsiegert Exp $
+# $NetBSD: Makefile,v 1.49 2019/06/18 14:41:09 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg2/}
-PKGREVISION=	7
+PKGREVISION=	8
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v2.x)
diff --git a/multimedia/ffmpeg2/options.mk b/multimedia/ffmpeg2/options.mk
index 9f7c0afcf3b..063bc8c3de9 100644
--- a/multimedia/ffmpeg2/options.mk
+++ b/multimedia/ffmpeg2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/01/03 11:56:08 bsiegert Exp $
+# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $
 
 # Global and legacy options
 
@@ -9,10 +9,12 @@ PKG_OPTIONS_GROUP.ssl=		gnutls openssl
 
 PKG_SUPPORTED_OPTIONS=	ass doc faac fdk-aac fontconfig freetype lame \
 			libvpx opencore-amr rtmp theora vorbis x11 x264 \
-			x265 xcb xvid
+			x265 xvid
 PKG_SUGGESTED_OPTIONS=	lame ass freetype fontconfig libvpx \
 			theora vorbis x11 x264 xvid
 
+PKG_OPTIONS_LEGACY_OPTS+=	xcb:x11
+
 PLIST_VARS+=		doc
 
 # Add VDPAU if it is available
@@ -196,7 +198,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 .endif
 
 # X11 screen capture support using libxcb
-.if !empty(PKG_OPTIONS:Mxcb)
+.if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--enable-libxcb
 CONFIGURE_ARGS+=	--enable-libxcb-shape
 CONFIGURE_ARGS+=	--enable-libxcb-shm
diff --git a/multimedia/ffmpeg3/Makefile b/multimedia/ffmpeg3/Makefile
index ad0de63676e..1b32967a0d7 100644
--- a/multimedia/ffmpeg3/Makefile
+++ b/multimedia/ffmpeg3/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2019/04/27 19:39:22 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2019/06/18 14:41:09 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg3/}
+PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v3.x)
diff --git a/multimedia/ffmpeg3/options.mk b/multimedia/ffmpeg3/options.mk
index 701c54b9dab..915eaf39d6a 100644
--- a/multimedia/ffmpeg3/options.mk
+++ b/multimedia/ffmpeg3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2018/10/09 11:04:10 leot Exp $
+# $NetBSD: options.mk,v 1.16 2019/06/18 14:41:09 nia Exp $
 
 # Global and legacy options
 
@@ -9,10 +9,12 @@ PKG_OPTIONS_GROUP.ssl=		gnutls openssl
 
 PKG_SUPPORTED_OPTIONS=	ass bluray doc fdk-aac fontconfig freetype \
 			lame libvpx opencore-amr opus rpi rtmp \
-			tesseract theora vorbis x11 x264 x265 xcb xvid
+			tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS=	lame ass bluray freetype fontconfig libvpx openssl \
 			theora vorbis x11 x264 xvid
 
+PKG_OPTIONS_LEGACY_OPTS+=	xcb:x11
+
 PLIST_VARS+=		doc
 
 # Add VDPAU if it is available
@@ -211,7 +213,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 .endif
 
 # X11 screen capture support using libxcb
-.if !empty(PKG_OPTIONS:Mxcb)
+.if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--enable-libxcb
 CONFIGURE_ARGS+=	--enable-libxcb-shape
 CONFIGURE_ARGS+=	--enable-libxcb-shm
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index 1d833cb4393..122bfd70a2a 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2019/02/11 09:24:22 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/06/18 14:41:09 nia Exp $
 
 PKGNAME=	${DISTNAME:S/ffmpeg/ffmpeg4/}
+PKGREVISION=	1
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
 COMMENT=	Decoding, encoding and streaming software (v4.x)
diff --git a/multimedia/ffmpeg4/options.mk b/multimedia/ffmpeg4/options.mk
index 48f04c10827..508725f2114 100644
--- a/multimedia/ffmpeg4/options.mk
+++ b/multimedia/ffmpeg4/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2018/12/02 17:11:16 tsutsui Exp $
+# $NetBSD: options.mk,v 1.10 2019/06/18 14:41:09 nia Exp $
 
 # Global and legacy options
 
@@ -8,10 +8,12 @@ PKG_OPTIONS_GROUP.ssl=		gnutls openssl
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg4
 PKG_SUPPORTED_OPTIONS=	ass av1 bluray doc fdk-aac fontconfig freetype \
 			gnutls lame libvpx opencore-amr opus pulseaudio rpi \
-			rtmp tesseract theora vorbis x11 x264 x265 xcb xvid
+			rtmp tesseract theora vorbis x11 x264 x265 xvid
 PKG_SUGGESTED_OPTIONS=	lame ass av1 bluray freetype fontconfig libvpx \
 			openssl theora vorbis x11 x264 xvid
 
+PKG_OPTIONS_LEGACY_OPTS+=	xcb:x11
+
 PLIST_VARS+=		doc
 
 # Add VDPAU if it is available
@@ -227,7 +229,7 @@ CONFIGURE_ARGS+=	--disable-libvpx
 .endif
 
 # X11 screen capture support using libxcb
-.if !empty(PKG_OPTIONS:Mxcb)
+.if !empty(PKG_OPTIONS:Mx11)
 CONFIGURE_ARGS+=	--enable-libxcb
 CONFIGURE_ARGS+=	--enable-libxcb-shape
 CONFIGURE_ARGS+=	--enable-libxcb-shm