Add USES=xorg USES=gl, ports categories l and m

Add USES=xorg and USES=gl to ports in categories starting with 'l' and 'm'.
While here, try to sprinkle other USES (mostly gnome and sdl) as needed.

9 files changed, 14 insertions, 5 deletions

diff --git a/multimedia/audacious-plugins-gtk3/Makefile b/multimedia/audacious-plugins-gtk3/Makefile
index 6bbcafdd65ec..82138c35afb5 100644
--- a/multimedia/audacious-plugins-gtk3/Makefile
+++ b/multimedia/audacious-plugins-gtk3/Makefile
@@ -69,6 +69,7 @@ ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 AMIDI_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 AMIDI_CONFIGURE_ENABLE=	amidiplug
+AOSD_USES=		gnome xorg
 AOSD_USE=		gnome=pango xorg=xrender
 AOSD_LIB_DEPENDS=	libXcomposite.so:x11/libXcomposite
 AOSD_CONFIGURE_ENABLE=	aosd
@@ -103,7 +104,7 @@ NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=notify
-OPENGL_USES=		gl
+OPENGL_USES=		gl xorg
 OPENGL_USE=		xorg=x11 gl=gl
 OPENGL_CONFIGURE_ENABLE=glspectrum
 OSS_CONFIGURE_ENABLE=	oss4
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index b19be814877b..e88b30e8ea18 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -58,6 +58,7 @@ ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 AMIDI_LIB_DEPENDS=	libfluidsynth.so:audio/fluidsynth
 AMIDI_CONFIGURE_ENABLE=	amidiplug
+AOSD_USES=		xorg
 AOSD_USE=		gnome=pango xorg=xrender
 AOSD_LIB_DEPENDS=	libXcomposite.so:x11/libXcomposite
 AOSD_CONFIGURE_ENABLE=	aosd
@@ -92,7 +93,7 @@ NLS_USES=		gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
 NOTIFY_CONFIGURE_ENABLE=notify
-OPENGL_USES=		gl
+OPENGL_USES=		gl xorg
 OPENGL_USE=		xorg=x11 gl=gl
 OPENGL_CONFIGURE_ENABLE=glspectrum
 OSS_CONFIGURE_ENABLE=	oss4
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index 08b13131d1d9..7c4a2b707a4c 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -107,6 +107,7 @@ LAME_LIB_DEPENDS=	libmp3lame.so:audio/lame
 SMB_CONFIGURE_ENABLE=	libsmbclient
 SMB_USES=		samba:lib
 
+X11_USES=		xorg
 X11_USE=		xorg=x11
 X11_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick6
 X11_LIB_DEPENDS_OFF=	libMagickWand-6.so:graphics/ImageMagick6-nox11
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 16b19199e1ef..71fc2d420da5 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -38,7 +38,7 @@ NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 WEBPLUGIN_USE=			xorg=xaw
-WEBPLUGIN_USES=			webplugin:native
+WEBPLUGIN_USES=			webplugin:native xorg
 WEBPLUGIN_CONFIGURE_WITH=	browser-plugin
 WEBPLUGIN_DIR=			${PREFIX}/lib/gxine
 WEBPLUGIN_FILES=		gxineplugin.so
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 4a90cf5870a0..e0e7bd83ac07 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -39,6 +39,7 @@ GLX_IMPLIES=		X11
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_MESON_YES=	with_wayland
 
+X11_USES=		xorg
 X11_USE=		XORG=x11,xorgproto,xext,xfixes
 X11_MESON_YES=		with_x11
 
diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars
index 788c82b35613..26e94a9eed79 100644
--- a/multimedia/mplayer/Makefile.optvars
+++ b/multimedia/mplayer/Makefile.optvars
@@ -138,13 +138,16 @@ VDPAU_CONFIGURE_OFF=	--disable-vdpau
 VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
 VPX_CONFIGURE_OFF=	--disable-libvpx-lavc
 
+X11_USES=		xorg
 X11_USE=		XORG=x11,xext,xorgproto,xscrnsaver
 X11_CONFIGURE_OFF=	--disable-x11
 
+X11DGA_USES=		xorg
 X11DGA_USE=		XORG=xxf86dga
 X11DGA_CONFIGURE_OFF=	--disable-dga1 --disable-dga2
 X11DGA_IMPLIES=		X11
 
+X11VM_USES=		xorg
 X11VM_USE=		XORG=xxf86vm
 X11VM_CONFIGURE_OFF=	--disable-vm
 X11VM_IMPLIES=		X11
@@ -152,6 +155,7 @@ X11VM_IMPLIES=		X11
 X264_LIB_DEPENDS=	libx264.so:multimedia/libx264
 X264_CONFIGURE_OFF=	--disable-x264
 
+XINERAMA_USES=		xorg
 XINERAMA_USE=		XORG=xinerama,xorgproto
 XINERAMA_CONFIGURE_OFF=	--disable-xinerama
 XINERAMA_IMPLIES=	X11
diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 9c45917de256..7c14b430369f 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -157,7 +157,7 @@ WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libxkbcommon.so:x11/libxkbcommon
 WAYLAND_CONFIGURE_OFF=		--disable-wayland
 
-X11_USES=			gnome
+X11_USES=			gnome xorg
 X11_USE=			XORG=x11,xext,xinerama,xorgproto,xrandr,xscrnsaver,xv,xxf86vm
 X11_VARS=			INSTALLS_ICONS=yes
 X11_CONFIGURE_OFF=		--disable-x11
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index dd2295b13004..2d53b44e23da 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -31,6 +31,7 @@ POSTPROC_DESC=		Libpostproc support
 DVDREAD_DESC=		Libdvdread support
 LZO_DESC=		LZO compression support
 
+X11_USES=			xorg
 X11_USE=			xorg=xv,xaw,xpm
 X11_CONFIGURE_WITH=		x
 
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 292aee7b46f7..4239f5d18206 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -345,7 +345,7 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 WAYLAND_CONFIGURE_ENABLE=	wayland
 
 X11_USE=		GL=gl XORG=xcb,xorgproto,sm,ice,x11
-X11_USES=		gl
+X11_USES=		gl xorg
 X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 X11_CONFIGURE_ENABLE=	xcb xvideo
 X11_CONFIGURE_WITH=	x