Date: Mon, 17 Apr 2017 11:35:39 +0000 (UTC) From: Barbara Guida <bar@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438687 - in head/games/vavoom: . files Message-ID: <201704171135.v3HBZd3M070762@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bar Date: Mon Apr 17 11:35:39 2017 New Revision: 438687 URL: https://svnweb.freebsd.org/changeset/ports/438687 Log: Revert to r437875. Sorry...it turned out I did the test using my default make.conf, so it was building with default 10-STABLE clang (3.4.1). After testing again, still no luck with llvm40. Modified: head/games/vavoom/Makefile head/games/vavoom/files/pkg-message.in head/games/vavoom/pkg-plist Modified: head/games/vavoom/Makefile ============================================================================== --- head/games/vavoom/Makefile Mon Apr 17 11:02:20 2017 (r438686) +++ head/games/vavoom/Makefile Mon Apr 17 11:35:39 2017 (r438687) @@ -15,12 +15,16 @@ LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png USES= cmake dos2unix jpeg tar:bzip2 - +# Force GCC because llvm (starting from 4.0) generates +# non working binary for vcc +USE_GCC= yes DOS2UNIX_REGEX= ((.*\.(c|cpp|h|s|asm|inc|vc|ls|acs|cfg|txt|vs|mak|mgw"))$$|\/(makefile\..*|makefile|Makefile)$$) -OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS -OPTIONS_DEFAULT= LAUNCHER OPENGL SDL -LAUNCHER_DESC= Build GUI launcher +# Removed LAUNCHER because it segfaults +#OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS +OPTIONS_DEFINE= FLAC MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS +OPTIONS_DEFAULT= OPENGL SDL +#LAUNCHER_DESC= Build GUI launcher OPENAL_DESC= Enable OpenAL support SDL_DESC= Use SDL for OpenGL support @@ -37,10 +41,13 @@ FLAC_LIB_DEPENDS= libFLAC.so:audio/fla FLAC_CMAKE_ON= -DWITH_FLAC:BOOL=ON FLAC_CMAKE_OFF= -DWITH_FLAC:BOOL=OFF -LAUNCHER_USE= WX=2.8+ -LAUNCHER_CMAKE_ON= -DENABLE_LAUNCHER:BOOL=ON \ - -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" -LAUNCHER_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF +# Removed LAUNCHER because it segfaults - check also pkg-plist +#LAUNCHER_USE= WX=2.8+ +#LAUNCHER_CMAKE_ON= -DENABLE_LAUNCHER:BOOL=ON \ +# -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" +#LAUNCHER_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF +# Force disable LAUNCHER +CMAKE_ARGS+= -DENABLE_LAUNCHER:BOOL=OFF MAD_LIB_DEPENDS= libmad.so:audio/libmad MAD_CMAKE_ON= -DWITH_LIBMAD:BOOL=ON Modified: head/games/vavoom/files/pkg-message.in ============================================================================== --- head/games/vavoom/files/pkg-message.in Mon Apr 17 11:02:20 2017 (r438686) +++ head/games/vavoom/files/pkg-message.in Mon Apr 17 11:35:39 2017 (r438687) @@ -16,6 +16,5 @@ need VORBIS (build options). Refer to %%DOCSDIR%%/vavoom.txt for other options such as game selection, network options and so on. -If you enabled LAUNCHER (build option), run "vlaunch" for a launcher GUI. ============================================================================== Modified: head/games/vavoom/pkg-plist ============================================================================== --- head/games/vavoom/pkg-plist Mon Apr 17 11:02:20 2017 (r438686) +++ head/games/vavoom/pkg-plist Mon Apr 17 11:35:39 2017 (r438687) @@ -2,7 +2,7 @@ bin/vavoom bin/vavoom.bin bin/vavoom-dedicated bin/vavoom-dedicated.bin -%%LAUNCHER%%bin/vlaunch +@comment %%LAUNCHER%%bin/vlaunch %%PORTDOCS%%%%DOCSDIR%%/vavoom.txt %%DATADIR%%/basev/common/basepak.pk3 %%DATADIR%%/basev/doom/basepak.pk3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704171135.v3HBZd3M070762>