svn commit: r437875 - in head/games/vavoom: . files
Barbara Guida
bar at FreeBSD.org
Thu Apr 6 20:14:23 UTC 2017
Author: bar
Date: Thu Apr 6 20:14:21 2017
New Revision: 437875
URL: https://svnweb.freebsd.org/changeset/ports/437875
Log:
- USE_GCC because llvm (starting from llvm40) generates not working binary for vcc causing failure during the build
- Remove the LAUNCHER option because current GCC generates not working binary for vlaunch
- Modernize OPTIONS
Added:
head/games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp (contents, props changed)
Deleted:
head/games/vavoom/files/patch-utils__vlaunch__vlaunch.cpp
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 Thu Apr 6 19:40:24 2017 (r437874)
+++ head/games/vavoom/Makefile Thu Apr 6 20:14:21 2017 (r437875)
@@ -3,7 +3,7 @@
PORTNAME= vavoom
PORTVERSION= 1.33
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Vavoom-source/${PORTVERSION}
@@ -15,85 +15,63 @@ 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
+# 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
+#LAUNCHER_DESC= Build GUI launcher
OPENAL_DESC= Enable OpenAL support
SDL_DESC= Use SDL for OpenGL support
SUB_FILES= pkg-message
-.include <bsd.port.options.mk>
-
# The `-fno-strict-aliasing' flag (default on FreeBSD 6.0+) produces
# non-working code for `vcc', so we remove it here if present.
CFLAGS:= ${CFLAGS:N-fno-strict-aliasing}
CXXFLAGS:= ${CFLAGS:N-fno-strict-aliasing}
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+= libFLAC.so:audio/flac
-CMAKE_ARGS+= -DWITH_FLAC=Y
-.else
-CMAKE_ARGS+= -DWITH_FLAC=N
-.endif
-
-.if ${PORT_OPTIONS:MLAUNCHER}
-USE_WX= 2.8+
-WX_UNICODE= yes
-CMAKE_ARGS+= -DENABLE_LAUNCHER=Y \
- -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}"
-PLIST_SUB+= LAUNCHER=""
-.else
-CMAKE_ARGS+= -DENABLE_LAUNCHER=N
-PLIST_SUB+= LAUNCHER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+= libmad.so:audio/libmad
-CMAKE_ARGS+= -DWITH_LIBMAD=Y
-.else
-CMAKE_ARGS+= -DWITH_LIBMAD=N
-.endif
-
-.if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+= libmikmod.so:audio/libmikmod
-CMAKE_ARGS+= -DWITH_MIKMOD=Y
-.else
-CMAKE_ARGS+= -DWITH_MIKMOD=N
-.endif
+OPTIONS_SUB= yes
-.if ${PORT_OPTIONS:MOPENAL}
-USES+= openal:al
-CMAKE_ARGS+= -DWITH_OPENAL=Y
-.else
-CMAKE_ARGS+= -DWITH_OPENAL=N
-.endif
+FLAC_LIB_DEPENDS= libFLAC.so:audio/flac
+FLAC_CMAKE_ON= -DWITH_FLAC:BOOL=ON
+FLAC_CMAKE_OFF= -DWITH_FLAC: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
+MAD_CMAKE_OFF= -DWITH_LIBMAD:BOOL=OFF
+
+MIKMOD_LIB_DEPENDS= libmikmod.so:audio/libmikmod
+MIKMOD_CMAKE_ON= -DWITH_MIKMOD:BOOL=ON
+MIKMOD_CMAKE_OFF= -DWITH_MIKMOD:BOOL=OFF
+
+OPENAL_USES= openal:al
+OPENAL_CMAKE_ON= -DWITH_OPENAL:BOOL=ON
+OPENAL_CMAKE_OFF= -DWITH_OPENAL:BOOL=OFF
+
+VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis
+VORBIS_CMAKE_ON= -DWITH_VORBIS:BOOL=ON
+VORBIS_CMAKE_OFF= -DWITH_VORBIS:BOOL=OFF
+
+SDL_USE= SDL=mixer,sdl GL=yes
+SDL_CMAKE_ON= -DWITH_SDL:BOOL=ON -DWITH_OPENGL:BOOL=ON
+SDL_CMAKE_OFF= -DWITH_SDL:BOOL=OFF -DWITH_OPENGL:BOOL=OFF
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+= libvorbis.so:audio/libvorbis
-CMAKE_ARGS+= -DWITH_VORBIS=Y
-.else
-CMAKE_ARGS+= -DWITH_VORBIS=N
-.endif
+OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math -fomit-frame-pointer
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL= mixer sdl
-CMAKE_ARGS+= -DWITH_SDL=Y
-USE_GL= yes
-CMAKE_ARGS+= -DWITH_OPENGL=Y
-.else
-CMAKE_ARGS+= -DWITH_SDL=N
-CMAKE_ARGS+= -DWITH_OPENGL=N
-.endif
-
-.if ${PORT_OPTIONS:MWXUNICODE}
-.endif
+.include <bsd.port.options.mk>
post-patch:
@${REINPLACE_CMD} -e 's|$$\* ||; s|$${IWADDIR}|-iwaddir ${DMDIR} $$*|' \
Added: head/games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp Thu Apr 6 20:14:21 2017 (r437875)
@@ -0,0 +1,78 @@
+--- utils/vlaunch/vlaunch.cpp.orig 2011-01-01 12:51:56.000000000 +0100
++++ utils/vlaunch/vlaunch.cpp 2017-04-06 16:15:41.198381000 +0200
+@@ -145,7 +145,7 @@
+ wxNotebook* nbook = new wxNotebook(panel, -1, wxPoint(0, 105), wxSize(447, 270));
+ mainsizer->Add(nbook);
+
+- wxPanel* page = new wxPanel(nbook);
++ wxScrolledWindow* page = new wxScrolledWindow(nbook);
+ nbook->AddPage(page, wxT("Main"));
+ wxFlexGridSizer* gsizer = new wxFlexGridSizer(2);
+
+@@ -185,12 +185,17 @@
+ gsizer->Add(EditMisc, 0, wxALL, 4);
+ page->SetSizer(gsizer);
+ gsizer->Layout();
++ gsizer->FitInside(page);
++ page->SetScrollRate(10, 10);
+
+ // Video options
+- page = new wxPanel(nbook);
++ page = new wxScrolledWindow(nbook);
+ nbook->AddPage(page, wxT("Video"));
+ wxFlexGridSizer* vsizer = new wxFlexGridSizer(2);
+
++ vsizer->Add(new wxStaticText(page, -1, wxT(" ")), 0, wxALL, 4);
++ vsizer->Add(new wxStaticText(page, -1, wxT(" ")), 0, wxALL, 4);
++
+ vsizer->Add(new wxStaticText(page, -1, wxT("Renderer:")), 0, wxALL, 4);
+ wxString RendChoices[2];
+ RendChoices[0] = wxT("OpenGL");
+@@ -237,9 +242,11 @@
+ vsizer->Add(Particles, 0, wxALL, 4);
+ page->SetSizer(vsizer);
+ vsizer->Layout();
++ vsizer->FitInside(page);
++ page->SetScrollRate(10, 10);
+
+ // Sound options
+- page = new wxPanel(nbook);
++ page = new wxScrolledWindow(nbook);
+ nbook->AddPage(page, wxT("Sound"));
+ wxFlexGridSizer* ssizer = new wxFlexGridSizer(2);
+
+@@ -272,9 +279,11 @@
+ ssizer->Add(PatchFiles, 0, wxALL, 4);
+ page->SetSizer(ssizer);
+ ssizer->Layout();
++ ssizer->FitInside(page);
++ page->SetScrollRate(10, 10);
+
+ // Input options
+- page = new wxPanel(nbook);
++ page = new wxScrolledWindow(nbook);
+ nbook->AddPage(page, wxT("Input"));
+ wxFlexGridSizer* isizer = new wxFlexGridSizer(2);
+
+@@ -297,9 +306,11 @@
+ isizer->Add(MouseY, 0, wxALL, 4);
+ page->SetSizer(isizer);
+ isizer->Layout();
++ isizer->FitInside(page);
++ page->SetScrollRate(10, 10);
+
+ // Network options
+- page = new wxPanel(nbook);
++ page = new wxScrolledWindow(nbook);
+ nbook->AddPage(page, wxT("Network"));
+ gsizer = new wxFlexGridSizer(2);
+ gsizer->AddSpacer(1);
+@@ -331,6 +342,8 @@
+ gsizer->Add(EditMasterIPAddress, 0, wxALL, 4);
+ page->SetSizer(gsizer);
+ gsizer->Layout();
++ gsizer->FitInside(page);
++ page->SetScrollRate(10, 10);
+
+ wxBoxSizer* bsizer = new wxBoxSizer(wxHORIZONTAL);
+ bsizer->Add(new wxButton(panel, VLaunch_Run, wxT("Run")), 0, wxALL, 4);
Modified: head/games/vavoom/files/pkg-message.in
==============================================================================
--- head/games/vavoom/files/pkg-message.in Thu Apr 6 19:40:24 2017 (r437874)
+++ head/games/vavoom/files/pkg-message.in Thu Apr 6 20:14:21 2017 (r437875)
@@ -5,6 +5,8 @@ Vavoom has been installed.
There are 2 wrapper scripts: "vavoom" and "vavoom-dedicated", calling the real
executables (suffixed with ".bin") from the data directory, and using the
common WAD directory.
+If you have extra WAD files, specify the full path of the containing directory
+as the first argument of the wrapper script.
To run in OpenGL mode add the "-opengl" parameter, and "-openal" for OpenAL.
@@ -12,6 +14,7 @@ If you want to install enhanced textures
"games/vavoom-extras" port. Note that textures require OPENGL and soundtracks
need VORBIS (build options).
-If you enabled LAUNCHER (build option), run "vlaunch" for a launcher GUI.
+Refer to %%DOCSDIR%%/vavoom.txt for other options such as
+game selection, network options and so on.
==============================================================================
Modified: head/games/vavoom/pkg-plist
==============================================================================
--- head/games/vavoom/pkg-plist Thu Apr 6 19:40:24 2017 (r437874)
+++ head/games/vavoom/pkg-plist Thu Apr 6 20:14:21 2017 (r437875)
@@ -2,7 +2,7 @@ bin/vavoom
bin/vavoom.bin
bin/vavoom-dedicated
bin/vavoom-dedicated.bin
-%%LAUNCHER%%bin/vlaunch
+ at comment %%LAUNCHER%%bin/vlaunch
%%PORTDOCS%%%%DOCSDIR%%/vavoom.txt
%%DATADIR%%/basev/common/basepak.pk3
%%DATADIR%%/basev/doom/basepak.pk3
More information about the svn-ports-all
mailing list