svn commit: r431464 - head/multimedia/mplayer
Thomas Zander
riggs at FreeBSD.org
Sat Jan 14 12:48:31 UTC 2017
Author: riggs
Date: Sat Jan 14 12:48:30 2017
New Revision: 431464
URL: https://svnweb.freebsd.org/changeset/ports/431464
Log:
Convert remaining X-related OPTIONs to option helpers + deps via IMPLIES
MFH: 2017Q1
Modified:
head/multimedia/mplayer/Makefile
head/multimedia/mplayer/Makefile.optvars
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Sat Jan 14 10:37:09 2017 (r431463)
+++ head/multimedia/mplayer/Makefile Sat Jan 14 12:48:30 2017 (r431464)
@@ -49,7 +49,7 @@ USES+= iconv pkgconfig
OPTIONS_SUB= yes
.include "${.CURDIR}/../../multimedia/mplayer/Makefile.optvars"
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
CONFIGURE_ARGS+= --disable-arts \
--disable-directfb \
@@ -65,42 +65,6 @@ CONFIGURE_ARGS+= --disable-arts \
--disable-musepack \
--disable-theora
-.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11 xext xproto xscrnsaver
-.if ${PORT_OPTIONS:MXVIDEO}
-USE_XORG+= xv
-.else
-CONFIGURE_ARGS+=--disable-xv
-.endif
-.if ${PORT_OPTIONS:MX11DGA}
-USE_XORG+= xxf86dga
-.else
-CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
-.endif
-.if ${PORT_OPTIONS:MOPENGL}
-USE_GL+= gl
-.else
-CONFIGURE_ARGS+=--disable-gl
-.endif
-.if ${PORT_OPTIONS:MXINERAMA}
-USE_XORG+= xinerama xineramaproto
-.else
-CONFIGURE_ARGS+=--disable-xinerama
-.endif
-.if ${PORT_OPTIONS:MX11VM}
-USE_XORG+= xxf86vm
-.else
-CONFIGURE_ARGS+=--disable-vm
-.endif
-.if ${PORT_OPTIONS:MXVMC}
-USE_XORG+= xvmc
-CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
-.endif
-.else #X11
-CONFIGURE_ARGS+=--disable-x11
-.endif
-
-.include <bsd.port.pre.mk>
.include "${.CURDIR}/../../multimedia/mplayer/Makefile.options"
BROKEN_armv6= Fails to compile: Error: garbage following instruction -- vmov s16,SCALE
Modified: head/multimedia/mplayer/Makefile.optvars
==============================================================================
--- head/multimedia/mplayer/Makefile.optvars Sat Jan 14 10:37:09 2017 (r431463)
+++ head/multimedia/mplayer/Makefile.optvars Sat Jan 14 12:48:30 2017 (r431464)
@@ -81,6 +81,10 @@ NAS_CONFIGURE_OFF= --disable-nas
OPENAL_USES= openal:soft
OPENAL_CONFIGURE_OFF= --disable-openal
+OPENGL_USE= GL=gl
+OPENGL_CONFIGURE_OFF= --disable-gl
+OPENGL_IMPLIES= X11
+
OPENJPEG_LIB_DEPENDS= libopenjpeg.so:graphics/openjpeg15
OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg
@@ -138,8 +142,31 @@ VDPAU_CONFIGURE_OFF= --disable-vdpau
VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx
VPX_CONFIGURE_OFF= --disable-libvpx-lavc
+X11_USE= XORG=x11,xext,xproto,xscrnsaver
+X11_CONFIGURE_OFF= --disable-x11
+
+X11DGA_USE= XORG=xxf86dga
+X11DGA_CONFIGURE_OFF= --disable-dga1 --disable-dga2
+X11DGA_IMPLIES= X11
+
+X11VM_USE= XORG=xxf86vm
+X11VM_CONFIGURE_OFF= --disable-vm
+X11VM_IMPLIES= X11
+
X264_LIB_DEPENDS= libx264.so:multimedia/libx264
X264_CONFIGURE_OFF= --disable-x264
+XINERAMA_USE= XORG=xinerama,xineramaproto
+XINERAMA_CONFIGURE_OFF= --disable-xinerama
+XINERAMA_IMPLIES= X11
+
XVID_LIB_DEPENDS= libxvidcore.so:multimedia/xvid
XVID_CONFIGURE_OFF= --disable-xvid
+
+XVIDEO_USE= XORG=xv
+XVIDEO_CONFIGURE_OFF= --disable-xv
+XVIDEO_IMPLIES= X11
+
+XVMC_USE= XORG=xvmc
+XVMC_CONFIGURE_ON= --enable-xvmc --with-xvmclib=XvMCW
+XVMC_IMPLIES= X11
More information about the svn-ports-all
mailing list