Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/multimedia/ffmpeg2/options.mk,v
retrieving revision 1.12
diff -u -p -r1.12 options.mk
--- options.mk	29 May 2017 08:38:16 -0000	1.12
+++ options.mk	29 May 2017 09:21:41 -0000
@@ -13,14 +13,14 @@ PLIST_VARS+=		doc
 
 # Add VDPAU if it is available
 .include "../../multimedia/libvdpau/available.mk"
-.if ${VDPAU_AVAILABLE} == "yes"
+.if ${VDPAU_AVAILABLE} == "yes" && !empty(PKG_OPTIONS:Mx11)
 PKG_SUPPORTED_OPTIONS+= vdpau
 PKG_SUGGESTED_OPTIONS+=	vdpau
 .endif
 
 # Add VAAPI if it is available
 .include "../../multimedia/libva/available.mk"
-.if ${VAAPI_AVAILABLE} == "yes"
+.if ${VAAPI_AVAILABLE} == "yes" && !empty(PKG_OPTIONS:Mx11)
 PKG_SUPPORTED_OPTIONS+= vaapi
 PKG_SUGGESTED_OPTIONS+=	vaapi
 .endif
@@ -162,7 +162,7 @@ CONFIGURE_ARGS+=	--disable-libx265
 .endif
 
 # VDPAU support
-.if !empty(PKG_OPTIONS:Mvdpau) && !empty(PKG_OPTIONS:Mx11)
+.if !empty(PKG_OPTIONS:Mvdpau)
 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) && !empty(PKG_OPTIONS:Mx11)
+.if !empty(PKG_OPTIONS:Mvaapi)
 CONFIGURE_ARGS+=	--enable-vaapi
 .include "../../multimedia/libva/buildlink3.mk"
 .else