Date: Sat, 31 Dec 2022 03:46:45 GMT From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f273887cfe23 - main - games/vavoom: Refactor after wxgtk28 removal Message-ID: <202212310346.2BV3kjNw023157@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=f273887cfe2341c4af9df98bd4cb24f78bcf95e1 commit f273887cfe2341c4af9df98bd4cb24f78bcf95e1 Author: Muhammad Moinur Rahman <bofh@FreeBSD.org> AuthorDate: 2022-12-31 03:45:50 +0000 Commit: Muhammad Moinur Rahman <bofh@FreeBSD.org> CommitDate: 2022-12-31 03:45:50 +0000 games/vavoom: Refactor after wxgtk28 removal - Pet portclippy - Generate make makepatch compliant patches --- games/vavoom/Makefile | 34 +++++++------- games/vavoom/files/patch-libs_core_zone.cpp | 9 ++-- games/vavoom/files/patch-libs_core_zone.h | 54 +++++++++++----------- games/vavoom/files/patch-source_host.cpp | 8 ++-- games/vavoom/files/patch-source_misc.cpp | 8 ++-- games/vavoom/files/patch-source_pr__exec.cpp | 6 +-- games/vavoom/files/patch-source_r__sky.cpp | 8 ++-- ...ource_sys_bsd.cpp => patch-source_sys__bsd.cpp} | 6 +-- games/vavoom/files/patch-source_sys__sdl.cpp | 6 +-- ...rce_sys_wind.cpp => patch-source_sys__wind.cpp} | 6 +-- .../files/patch-source_timidity_readmidi.cpp | 6 +-- games/vavoom/files/patch-source_vc__dehacked.cpp | 8 ++-- games/vavoom/files/patch-source_vc__object.cpp | 6 +-- games/vavoom/files/patch-utils_acc_acc.c | 6 +-- .../vavoom/files/patch-utils_glbsp_CMakeLists.txt | 4 +- games/vavoom/files/patch-utils_glvis_glvis.cpp | 6 +-- games/vavoom/files/patch-utils_vcc_vcc.cpp | 8 ++-- games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp | 16 +++---- 18 files changed, 103 insertions(+), 102 deletions(-) diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index aeb19d2849c4..c08c206b8e6c 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -15,26 +15,26 @@ LIB_DEPENDS= libpng.so:graphics/png USES= cmake:noninja cpe dos2unix jpeg tar:bzip2 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= OPENGL SDL -LAUNCHER_DESC= Build GUI launcher -OPENAL_DESC= Enable OpenAL support -SDL_DESC= Use SDL for OpenGL support - -SUB_FILES= pkg-message - # 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} +SUB_FILES= pkg-message + +OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS +OPTIONS_DEFAULT= OPENGL SDL OPTIONS_SUB= yes +LAUNCHER_DESC= Build GUI launcher +OPENAL_DESC= Enable OpenAL support +SDL_DESC= Use SDL for OpenGL support + FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_ON= -DWITH_FLAC:BOOL=ON FLAC_CMAKE_OFF= -DWITH_FLAC:BOOL=OFF -LAUNCHER_USE= WX=2.8+ +LAUNCHER_USE= WX=3.0+ LAUNCHER_CMAKE_ON= -DENABLE_LAUNCHER:BOOL=ON \ -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" LAUNCHER_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF @@ -51,15 +51,15 @@ 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_USES= gl sdl SDL_USE= GL=glu SDL=mixer,sdl SDL_CMAKE_ON= -DWITH_SDL:BOOL=ON -DWITH_OPENGL:BOOL=ON SDL_CMAKE_OFF= -DWITH_SDL:BOOL=OFF -DWITH_OPENGL:BOOL=OFF +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis +VORBIS_CMAKE_ON= -DWITH_VORBIS:BOOL=ON +VORBIS_CMAKE_OFF= -DWITH_VORBIS:BOOL=OFF + OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math -fomit-frame-pointer .include <bsd.port.options.mk> @@ -73,13 +73,13 @@ post-patch: ${WRKSRC}/utils/acc/strlist.c post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${STAGEDIR}${DOCSDIR} -.endif ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vavoom.bin ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vavoom-dedicated.bin +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${STAGEDIR}${DOCSDIR} + .include "${PORTSDIR}/games/doom-data/Makefile.include" .include <bsd.port.mk> diff --git a/games/vavoom/files/patch-libs_core_zone.cpp b/games/vavoom/files/patch-libs_core_zone.cpp index 4b537a9c6fb0..a5d40b4675c3 100644 --- a/games/vavoom/files/patch-libs_core_zone.cpp +++ b/games/vavoom/files/patch-libs_core_zone.cpp @@ -1,5 +1,5 @@ ---- libs/core/zone.cpp.orig 2017-06-04 12:56:34.206304000 +0200 -+++ libs/core/zone.cpp 2017-06-04 13:02:53.920038000 +0200 +--- libs/core/zone.cpp.orig 2022-12-31 03:37:53 UTC ++++ libs/core/zone.cpp @@ -33,6 +33,8 @@ #include "core.h" @@ -9,8 +9,9 @@ // MACROS ------------------------------------------------------------------ #define SMALLID 0x22 -@@ -516,3 +518,4 @@ +@@ -515,4 +517,5 @@ void Z_Free(void* ptr) + unguard; } - #endif +#endif + #endif diff --git a/games/vavoom/files/patch-libs_core_zone.h b/games/vavoom/files/patch-libs_core_zone.h index c4a9a46cafb8..2d78c640ac0e 100644 --- a/games/vavoom/files/patch-libs_core_zone.h +++ b/games/vavoom/files/patch-libs_core_zone.h @@ -1,5 +1,5 @@ ---- libs/core/zone.h.orig 2017-06-04 12:56:34.206722000 +0200 -+++ libs/core/zone.h 2017-06-04 13:08:27.959596000 +0200 +--- libs/core/zone.h.orig 2022-12-31 03:37:53 UTC ++++ libs/core/zone.h @@ -27,88 +27,21 @@ //** //************************************************************************** @@ -15,20 +15,27 @@ -void Z_Free(void* ptr, const char* FileName, int LineNumber); - -inline void* operator new(size_t Size, const char* FileName, int LineNumber) --{ ++static inline void* Z_Malloc(int size) + { - return Z_Malloc(Size, FileName, LineNumber); --} -- ++ return static_cast<void *>(operator new(size)); + } + -inline void operator delete(void* Ptr, const char* FileName, int LineNumber) --{ ++static inline void* Z_Calloc(int size) + { - Z_Free(Ptr, FileName, LineNumber); --} -- ++ return memset(Z_Malloc(size), 0, size); + } + -inline void* operator new[](size_t Size, const char* FileName, int LineNumber) --{ ++static inline void Z_Free(void* ptr) + { - return Z_Malloc(Size, FileName, LineNumber); --} -- ++ char *p = (char *)ptr; ++ delete p; + } + -inline void operator delete[](void* Ptr, const char* FileName, int LineNumber) -{ - Z_Free(Ptr, FileName, LineNumber); @@ -74,25 +81,18 @@ -} - -inline void operator delete(void* Ptr) -+static inline void* Z_Malloc(int size) - { +-{ - Z_Free(Ptr); -+ return static_cast<void *>(operator new(size)); - } - +-} +- -inline void* operator new[](size_t Size) -+static inline void* Z_Calloc(int size) - { +-{ - return Z_Malloc(int(Size)); -+ return memset(Z_Malloc(size), 0, size); - } - +-} +- -inline void operator delete[](void* Ptr) -+static inline void Z_Free(void* ptr) - { +-{ - Z_Free(Ptr); -+ char *p = (char *)ptr; -+ delete p; - } - +-} +- -#endif diff --git a/games/vavoom/files/patch-source_host.cpp b/games/vavoom/files/patch-source_host.cpp index d4b7c159310d..933c870961c8 100644 --- a/games/vavoom/files/patch-source_host.cpp +++ b/games/vavoom/files/patch-source_host.cpp @@ -1,6 +1,6 @@ ---- source/host.cpp.orig 2018-03-18 07:16:51.331022000 +0100 -+++ source/host.cpp 2018-03-18 07:17:13.897333000 +0100 -@@ -523,7 +523,7 @@ +--- source/host.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/host.cpp +@@ -523,7 +523,7 @@ void Host_Error(const char *error, ...) COMMAND(Version) { GCon->Log("VAVOOM version " VERSION_TEXT" (r" SVN_REVISION_STRING ")."); @@ -9,7 +9,7 @@ } //========================================================================== -@@ -706,5 +706,5 @@ +@@ -706,5 +706,5 @@ void Host_Shutdown() SAFE_SHUTDOWN(VObject::StaticExit, ()) SAFE_SHUTDOWN(VName::StaticExit, ()) diff --git a/games/vavoom/files/patch-source_misc.cpp b/games/vavoom/files/patch-source_misc.cpp index 339813351dac..c992764b92ce 100644 --- a/games/vavoom/files/patch-source_misc.cpp +++ b/games/vavoom/files/patch-source_misc.cpp @@ -1,6 +1,6 @@ ---- source/misc.cpp.orig 2010-09-01 20:26:05.000000000 +0200 -+++ source/misc.cpp 2017-06-04 09:42:27.118366000 +0200 -@@ -119,7 +119,7 @@ +--- source/misc.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/misc.cpp +@@ -119,7 +119,7 @@ void FOutputDevice::Logf(EName Type, const char* Fmt, void VLogSysError::Serialise(const char* V, EName) { @@ -9,7 +9,7 @@ } //========================================================================== -@@ -130,7 +130,7 @@ +@@ -130,7 +130,7 @@ void VLogSysError::Serialise(const char* V, EName) void VLogHostError::Serialise(const char* V, EName) { diff --git a/games/vavoom/files/patch-source_pr__exec.cpp b/games/vavoom/files/patch-source_pr__exec.cpp index 99564ee4cce0..e103a81626af 100644 --- a/games/vavoom/files/patch-source_pr__exec.cpp +++ b/games/vavoom/files/patch-source_pr__exec.cpp @@ -1,6 +1,6 @@ ---- source/pr_exec.cpp.orig 2010-06-04 23:20:21.000000000 +0200 -+++ source/pr_exec.cpp 2017-06-04 10:26:40.272597000 +0200 -@@ -1112,7 +1112,7 @@ +--- source/pr_exec.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/pr_exec.cpp +@@ -1112,7 +1112,7 @@ func_loop: { Sys_Error("Division by 0"); } diff --git a/games/vavoom/files/patch-source_r__sky.cpp b/games/vavoom/files/patch-source_r__sky.cpp index f63da1bc152e..f834498de1a3 100644 --- a/games/vavoom/files/patch-source_r__sky.cpp +++ b/games/vavoom/files/patch-source_r__sky.cpp @@ -1,6 +1,6 @@ ---- source/r_sky.cpp.orig 2017-06-04 15:57:26.347510000 +0200 -+++ source/r_sky.cpp 2017-06-04 16:05:26.710124000 +0200 -@@ -223,9 +223,9 @@ +--- source/r_sky.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/r_sky.cpp +@@ -223,9 +223,9 @@ void VSky::InitOldSky(int Sky1Texture, int Sky2Texture s.surf.verts[0] = TVec(cosa0 * vradius, sina0 * vradius, bheight); s.surf.verts[1] = TVec(cosa0 * tradius, sina0 * tradius, theight); s.surf.verts[2] = TVec(cosa1 * tradius, sina1 * tradius, theight); @@ -12,7 +12,7 @@ s.surf.verts[2] - s.surf.verts[1]; TVec vdir = s.surf.verts[0] - s.surf.verts[1]; TVec normal = Normalise(CrossProduct(vdir, hdir)); -@@ -336,32 +336,32 @@ +@@ -336,32 +336,32 @@ void VSky::InitSkyBox(VName Name1, VName Name2) sky[0].surf.verts[0] = TVec(128, 128, -128); sky[0].surf.verts[1] = TVec(128, 128, 128); sky[0].surf.verts[2] = TVec(128, -128, 128); diff --git a/games/vavoom/files/patch-source_sys_bsd.cpp b/games/vavoom/files/patch-source_sys__bsd.cpp similarity index 59% rename from games/vavoom/files/patch-source_sys_bsd.cpp rename to games/vavoom/files/patch-source_sys__bsd.cpp index 65a315b82e01..e706799a5f5d 100644 --- a/games/vavoom/files/patch-source_sys_bsd.cpp +++ b/games/vavoom/files/patch-source_sys__bsd.cpp @@ -1,6 +1,6 @@ ---- source/sys_bsd.cpp.orig 2018-03-20 22:47:18.469528000 +0100 -+++ source/sys_bsd.cpp 2018-03-20 22:52:41.627543000 +0100 -@@ -336,7 +336,7 @@ +--- source/sys_bsd.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/sys_bsd.cpp +@@ -336,7 +336,7 @@ int main(int argc, char** argv) { try { diff --git a/games/vavoom/files/patch-source_sys__sdl.cpp b/games/vavoom/files/patch-source_sys__sdl.cpp index 6df0163ae6c3..529723cba7ba 100644 --- a/games/vavoom/files/patch-source_sys__sdl.cpp +++ b/games/vavoom/files/patch-source_sys__sdl.cpp @@ -1,6 +1,6 @@ ---- source/sys_sdl.cpp.orig 2017-06-04 12:56:34.438609000 +0200 -+++ source/sys_sdl.cpp 2017-06-04 13:11:31.567597000 +0200 -@@ -530,7 +530,7 @@ +--- source/sys_sdl.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/sys_sdl.cpp +@@ -530,7 +530,7 @@ int main(int argc,char** argv) catch (VavoomError &e) { Host_Shutdown(); diff --git a/games/vavoom/files/patch-source_sys_wind.cpp b/games/vavoom/files/patch-source_sys__wind.cpp similarity index 59% rename from games/vavoom/files/patch-source_sys_wind.cpp rename to games/vavoom/files/patch-source_sys__wind.cpp index 28bfd31829fe..9e66225e95e1 100644 --- a/games/vavoom/files/patch-source_sys_wind.cpp +++ b/games/vavoom/files/patch-source_sys__wind.cpp @@ -1,6 +1,6 @@ ---- source/sys_wind.cpp.orig 2018-03-20 22:47:18.413282000 +0100 -+++ source/sys_wind.cpp 2018-03-20 22:51:38.847080000 +0100 -@@ -307,7 +307,7 @@ +--- source/sys_wind.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/sys_wind.cpp +@@ -307,7 +307,7 @@ int main(int argc, char **argv) { try { diff --git a/games/vavoom/files/patch-source_timidity_readmidi.cpp b/games/vavoom/files/patch-source_timidity_readmidi.cpp index ec52733effa4..2077bcd3702b 100644 --- a/games/vavoom/files/patch-source_timidity_readmidi.cpp +++ b/games/vavoom/files/patch-source_timidity_readmidi.cpp @@ -1,6 +1,6 @@ ---- source/timidity/readmidi.cpp.orig 2017-06-04 15:57:26.317968000 +0200 -+++ source/timidity/readmidi.cpp 2017-06-04 16:07:48.260735000 +0200 -@@ -569,7 +569,7 @@ +--- source/timidity/readmidi.cpp.orig 2022-12-31 03:37:53 UTC ++++ source/timidity/readmidi.cpp +@@ -569,7 +569,7 @@ MidiEvent* read_midi_mem(MidiSong* song, void* mimage, int32 len, divisions; int16 format, tracks, divisions_tmp; int i; diff --git a/games/vavoom/files/patch-source_vc__dehacked.cpp b/games/vavoom/files/patch-source_vc__dehacked.cpp index 5a953910111d..3d6e332f0731 100644 --- a/games/vavoom/files/patch-source_vc__dehacked.cpp +++ b/games/vavoom/files/patch-source_vc__dehacked.cpp @@ -1,6 +1,6 @@ ---- source/vc_dehacked.cpp.orig 2017-06-04 08:35:41.777968000 +0200 -+++ source/vc_dehacked.cpp 2017-06-04 09:13:52.864992000 +0200 -@@ -128,8 +128,8 @@ +--- source/vc_dehacked.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/vc_dehacked.cpp +@@ -128,8 +128,8 @@ static const VDehFlag DehFlags[] = { 0, "TRANSLUC75", 0x20000000 }, { 0, "STEALTH", 0x40000000 }, { 0, "UNUSED4", 0x40000000 }, @@ -11,7 +11,7 @@ { 1, "LOGRAV", 0x00000001 }, { 1, "WINDTHRUST", 0x00000002 }, { 1, "FLOORBOUNCE", 0x00000004 }, -@@ -161,7 +161,7 @@ +@@ -161,7 +161,7 @@ static const VDehFlag DehFlags[] = { 1, "DORMANT", 0x10000000 }, { 1, "ICEDAMAGE", 0x20000000 }, { 1, "SEEKERMISSILE", 0x40000000 }, diff --git a/games/vavoom/files/patch-source_vc__object.cpp b/games/vavoom/files/patch-source_vc__object.cpp index 51695fd1584d..b5249661dc38 100644 --- a/games/vavoom/files/patch-source_vc__object.cpp +++ b/games/vavoom/files/patch-source_vc__object.cpp @@ -1,6 +1,6 @@ ---- source/vc_object.cpp.orig 2010-06-04 23:20:21.000000000 +0200 -+++ source/vc_object.cpp 2017-06-04 09:43:20.120992000 +0200 -@@ -477,12 +477,12 @@ +--- source/vc_object.cpp.orig 2022-12-31 03:37:54 UTC ++++ source/vc_object.cpp +@@ -477,12 +477,12 @@ IMPLEMENT_FUNCTION(VObject, IsDestroyed) IMPLEMENT_FUNCTION(VObject, Error) { diff --git a/games/vavoom/files/patch-utils_acc_acc.c b/games/vavoom/files/patch-utils_acc_acc.c index b56f40931d69..739adbb4fb22 100644 --- a/games/vavoom/files/patch-utils_acc_acc.c +++ b/games/vavoom/files/patch-utils_acc_acc.c @@ -1,6 +1,6 @@ ---- utils/acc/acc.c.orig 2018-03-17 07:31:45.763803000 +0100 -+++ utils/acc/acc.c 2018-03-17 07:34:25.591067000 +0100 -@@ -120,7 +120,7 @@ +--- utils/acc/acc.c.orig 2022-12-31 03:37:54 UTC ++++ utils/acc/acc.c +@@ -120,7 +120,7 @@ static void DisplayBanner(void) fprintf(stderr, "\nOriginal ACC Version 1.10 by Ben Gokey\n"); fprintf(stderr, "Copyright (c) "COPYRIGHT_YEARS_TEXT " Raven Software, Corp.\n\n"); diff --git a/games/vavoom/files/patch-utils_glbsp_CMakeLists.txt b/games/vavoom/files/patch-utils_glbsp_CMakeLists.txt index 57ffcf93fa6b..dd3349e8cb11 100644 --- a/games/vavoom/files/patch-utils_glbsp_CMakeLists.txt +++ b/games/vavoom/files/patch-utils_glbsp_CMakeLists.txt @@ -1,5 +1,5 @@ ---- utils/glbsp/CMakeLists.txt.orig 2017-06-04 12:56:34.555084000 +0200 -+++ utils/glbsp/CMakeLists.txt 2017-06-04 13:15:12.279215000 +0200 +--- utils/glbsp/CMakeLists.txt.orig 2022-12-31 03:37:54 UTC ++++ utils/glbsp/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(${ZLIB_INCLUDE_DIR}) add_definitions(-DGLBSP_PLUGIN -DUNIX -DINLINE_G=inline) diff --git a/games/vavoom/files/patch-utils_glvis_glvis.cpp b/games/vavoom/files/patch-utils_glvis_glvis.cpp index ea9457b957f2..9d17a0ea567d 100644 --- a/games/vavoom/files/patch-utils_glvis_glvis.cpp +++ b/games/vavoom/files/patch-utils_glvis_glvis.cpp @@ -1,6 +1,6 @@ ---- utils/glvis/glvis.cpp.orig 2010-12-23 20:47:55.000000000 +0100 -+++ utils/glvis/glvis.cpp 2018-03-15 03:06:38.264012000 +0100 -@@ -158,7 +158,7 @@ +--- utils/glvis/glvis.cpp.orig 2022-12-31 03:37:54 UTC ++++ utils/glvis/glvis.cpp +@@ -158,7 +158,7 @@ void TConsoleGLVis::DisplayMapDone(int accepts, int to static void ShowUsage() { fprintf(stderr, "\nGLVIS version 1.6, Copyright (c)2000-2006 Janis " diff --git a/games/vavoom/files/patch-utils_vcc_vcc.cpp b/games/vavoom/files/patch-utils_vcc_vcc.cpp index 36a1f8724a3e..766216fef9e9 100644 --- a/games/vavoom/files/patch-utils_vcc_vcc.cpp +++ b/games/vavoom/files/patch-utils_vcc_vcc.cpp @@ -1,6 +1,6 @@ ---- utils/vcc/vcc.cpp.orig 2018-03-17 07:31:45.795910000 +0100 -+++ utils/vcc/vcc.cpp 2018-03-17 07:37:38.864263000 +0100 -@@ -122,7 +122,7 @@ +--- utils/vcc/vcc.cpp.orig 2022-12-31 03:37:54 UTC ++++ utils/vcc/vcc.cpp +@@ -122,7 +122,7 @@ int main(int argc, char **argv) } catch (VException& e) { @@ -9,7 +9,7 @@ } return 0; } -@@ -171,7 +171,7 @@ +@@ -171,7 +171,7 @@ static void DisplayUsage() { // Print usage. printf("\n"); diff --git a/games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp b/games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp index 01600cf8d144..1cb4f52147f5 100644 --- a/games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp +++ b/games/vavoom/files/patch-utils_vlaunch_vlaunch.cpp @@ -1,6 +1,6 @@ ---- 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 @@ +--- utils/vlaunch/vlaunch.cpp.orig 2022-12-31 03:37:54 UTC ++++ utils/vlaunch/vlaunch.cpp +@@ -145,7 +145,7 @@ VMain::VMain() wxNotebook* nbook = new wxNotebook(panel, -1, wxPoint(0, 105), wxSize(447, 270)); mainsizer->Add(nbook); @@ -9,7 +9,7 @@ nbook->AddPage(page, wxT("Main")); wxFlexGridSizer* gsizer = new wxFlexGridSizer(2); -@@ -185,12 +185,17 @@ +@@ -185,12 +185,17 @@ VMain::VMain() gsizer->Add(EditMisc, 0, wxALL, 4); page->SetSizer(gsizer); gsizer->Layout(); @@ -28,7 +28,7 @@ vsizer->Add(new wxStaticText(page, -1, wxT("Renderer:")), 0, wxALL, 4); wxString RendChoices[2]; RendChoices[0] = wxT("OpenGL"); -@@ -237,9 +242,11 @@ +@@ -237,9 +242,11 @@ VMain::VMain() vsizer->Add(Particles, 0, wxALL, 4); page->SetSizer(vsizer); vsizer->Layout(); @@ -41,7 +41,7 @@ nbook->AddPage(page, wxT("Sound")); wxFlexGridSizer* ssizer = new wxFlexGridSizer(2); -@@ -272,9 +279,11 @@ +@@ -272,9 +279,11 @@ VMain::VMain() ssizer->Add(PatchFiles, 0, wxALL, 4); page->SetSizer(ssizer); ssizer->Layout(); @@ -54,7 +54,7 @@ nbook->AddPage(page, wxT("Input")); wxFlexGridSizer* isizer = new wxFlexGridSizer(2); -@@ -297,9 +306,11 @@ +@@ -297,9 +306,11 @@ VMain::VMain() isizer->Add(MouseY, 0, wxALL, 4); page->SetSizer(isizer); isizer->Layout(); @@ -67,7 +67,7 @@ nbook->AddPage(page, wxT("Network")); gsizer = new wxFlexGridSizer(2); gsizer->AddSpacer(1); -@@ -331,6 +342,8 @@ +@@ -331,6 +342,8 @@ VMain::VMain() gsizer->Add(EditMasterIPAddress, 0, wxALL, 4); page->SetSizer(gsizer); gsizer->Layout();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202212310346.2BV3kjNw023157>