kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Convert remaining X-related OPTIONs to option helpers + deps via IMPLIES

Browse source 
MFH:		2017Q1
This commit is contained in:
Thomas Zander 2017-01-14 12:48:30 +00:00
parent d41f933bc5
commit 72923f111f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=431464
2 changed files with 28 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
multimedia/mplayer/Makefile
View file

@ -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

27
multimedia/mplayer/Makefile.optvars
View file

@ -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