cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When setting USE_XORG via OPTION helper, use comma syntax universally; in

Browse Source 
`devel/sdl12', `graphics/blender', and `multimedia/libav' ports they were
set incorrectly, which caused build failures of `devel/sdl12' without the
OpenGL, for example.

Also, while at it, in `multimedia/libmpeg2', fix sed(1) based patching to
produce more neat results, and use official spelling of MPEG abbreviation
in COMMENT (port description still needs cleaning up).
This commit is contained in:
Alexey Dokuchaev 2014-03-15 12:27:11 +00:00
parent 62d4106cc2
commit 58d0c7a77c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=348319
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/sdl12/Makefile
View File

@ -59,7 +59,7 @@ SVGALIB_CONFIGURE_ENABLE= video-svga
SVGALIB_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib
VGL_CONFIGURE_ENABLE= video-vgl
X11_CONFIGURE_ENABLE= video-x11
X11_USE= XORG= x11 xrender xrandr xextproto
X11_USE= XORG=x11,xrender,xrandr,xextproto
.include <bsd.port.options.mk>

2
graphics/blender/Makefile
View File

@ -122,7 +122,7 @@ XINPUT_CMAKE_OFF= -DWITH_X11_XINPUT:BOOL=OFF
XINPUT_USE= XORG=xi
XF86VMODE_CMAKE_ON= -DWITH_X11_XF86VMODE:BOOL=ON
XF86VMODE_CMAKE_OFF= -DWITH_X11_XF86VMODE:BOOL=OFF
XF86VMODE_USE= XORG=xi xxf86vm
XF86VMODE_USE= XORG=xi,xxf86vm
.include <bsd.port.options.mk>

2
multimedia/libav/Makefile
View File

@ -137,7 +137,7 @@ VORBIS_CONFIGURE_ENABLE= libvorbis
VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
VPX_CONFIGURE_ENABLE= libvpx
X11GRAB_USE= XORG=x11 xext xfixes
X11GRAB_USE= XORG=x11,xext,xfixes
X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264
X264_CONFIGURE_ENABLE= libx264

8
multimedia/libmpeg2/Makefile
View File

@ -8,7 +8,7 @@ CATEGORIES= multimedia
MASTER_SITES= http://libmpeg2.sourceforge.net/files/
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Free library for decoding mpeg-2 and mpeg-1 video streams
COMMENT= Free library for decoding MPEG-2 and MPEG-1 video streams
USES= libtool pathfix
GNU_CONFIGURE= yes
@ -22,17 +22,17 @@ OPTIONS_DEFINE= DOCS SDL X11
SDL_USE= SDL=yes
SDL_CONFIGURE_ENABLE= sdl
X11_USE= XORG=sm XORG=xv
X11_USE= XORG=sm,xv
X11_CONFIGURE_WITH= x
.include <bsd.port.options.mk>
post-patch:
@${REINPLACE_CMD} -e 's|-O3||;s|<termio.h>|<termios.h>|' \
@${REINPLACE_CMD} -e 's| -O3|| ; s|<termio|&s|' \
${WRKSRC}/configure
# AMD64 prefers position independent code
.if ${ARCH:L} == "amd64"
@${REINPLACE_CMD} -e 's|-prefer-non-pic||' \
@${REINPLACE_CMD} -e '/CFLAGS/s| -prefer-non-pic||' \
${WRKSRC}/configure
.endif