timo.my...@bittivirhe.fi (Timo Myyrä) writes:
> Hi,
>
> Gzdoom seems to have few releases since last ports update.
> Is anyone interested in having legacy release of 3.8.0 which requires OpenGL
> 2.0+ or would it be best to use the current 4.2.1 version requiring OpenGL
> 3.3+?
>
> I'm leaning towards the latter, there are other doom ports for older hw so I'd
> say we could switch to using the modern branch.
>
> Here's update to 4.1.2 for review. Quickly tested on amd64 but I'm using the
> amdgpu which isn't stable yet so this could use some further testing with
> other hw.
>
> Timo
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/gzdoom/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile 2 Apr 2019 13:56:40 -0000 1.5
> +++ Makefile 25 May 2019 08:43:16 -0000
> @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = i386 amd64
>
> COMMENT = OpenGL engine for idTech 1 games like
> doom,hexen,heretic...
>
> -V = 3.7.2
> +V = 4.1.2
> PKGNAME = gzdoom-${V}
> DISTNAME = gzdoom-src-g${V}
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/gzdoom/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo 27 Feb 2019 23:35:17 -0000 1.2
> +++ distinfo 25 May 2019 08:43:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (gzdoom-src-g3.7.2.zip) = BzdegCYKsjPC6VMhy4iWfaRvd2+DS+7tYKChCkxwAgU=
> -SIZE (gzdoom-src-g3.7.2.zip) = 12189731
> +SHA256 (gzdoom-src-g4.1.2.zip) = PlpypHGf8jEBwTGL+dSlZ0rWgj9s4GfDC/J/nuS1uPY=
> +SIZE (gzdoom-src-g4.1.2.zip) = 15297100
> Index: patches/patch-src_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/gzdoom/patches/patch-src_CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 patch-src_CMakeLists_txt
> --- patches/patch-src_CMakeLists_txt 6 Feb 2019 09:32:21 -0000 1.1.1.1
> +++ patches/patch-src_CMakeLists_txt 25 May 2019 08:43:16 -0000
> @@ -14,8 +14,8 @@ Index: src/CMakeLists.txt
> if( WIN32 )
> if( X64 )
> set( WIN_TYPE Win64 )
> -@@ -1301,7 +1305,13 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
> - set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket)
> +@@ -1369,7 +1373,13 @@ if( UNIX )
> + endif()
> endif()
>
> +find_package( Backtrace )
> Index: patches/patch-src_scripting_vm_vmframe_cpp
> ===================================================================
> RCS file: /cvs/ports/games/gzdoom/patches/patch-src_scripting_vm_vmframe_cpp,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-src_scripting_vm_vmframe_cpp
> --- patches/patch-src_scripting_vm_vmframe_cpp 12 Feb 2019 18:07:11
> -0000 1.1
> +++ patches/patch-src_scripting_vm_vmframe_cpp 25 May 2019 08:43:16
> -0000
> @@ -1,14 +1,14 @@
> -$OpenBSD: patch-src_scripting_vm_vmframe_cpp,v 1.1 2019/02/12 18:07:11
> solene Exp $
> +$OpenBSD$
>
> disable JIT so it's W^X compatible
>
> Index: src/scripting/vm/vmframe.cpp
> --- src/scripting/vm/vmframe.cpp.orig
> +++ src/scripting/vm/vmframe.cpp
> -@@ -49,7 +49,7 @@
> - #endif
> +@@ -45,7 +45,7 @@
> + #include "version.h"
>
> - #ifdef ARCH_X64
> + #ifdef HAVE_VM_JIT
> -CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL)
> +CUSTOM_CVAR(Bool, vm_jit, false, CVAR_NOINITCALL)
> {
> Index: patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp
> ===================================================================
> RCS file:
> /cvs/ports/games/gzdoom/patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1
> patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp
> --- patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp
> 6 Feb 2019 09:32:21 -0000 1.1.1.1
> +++ patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp
> 25 May 2019 08:43:16 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-src_sound_mididevices_mu
> Index: src/sound/mididevices/music_fluidsynth_mididevice.cpp
> --- src/sound/mididevices/music_fluidsynth_mididevice.cpp.orig
> +++ src/sound/mididevices/music_fluidsynth_mididevice.cpp
> -@@ -49,12 +49,11 @@
> +@@ -50,12 +50,11 @@
> // do this without including windows.h for this one single prototype
> extern "C" unsigned __stdcall GetSystemDirectoryA(char *lpBuffer, unsigned
> uSize);
>
> @@ -17,7 +17,7 @@ Index: src/sound/mididevices/music_fluid
> #endif
> #else
> #include <dlfcn.h>
> -@@ -64,6 +63,15 @@ extern "C" unsigned __stdcall GetSystemDirectoryA(char
> +@@ -65,6 +64,15 @@ extern "C" unsigned __stdcall GetSystemDirectoryA(char
> #else // !__APPLE__
> #define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
> #endif // __APPLE__
> Index: patches/patch-src_textures_animations_cpp
> ===================================================================
> RCS file: patches/patch-src_textures_animations_cpp
> diff -N patches/patch-src_textures_animations_cpp
> --- patches/patch-src_textures_animations_cpp 6 Feb 2019 09:32:21 -0000
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-src_textures_animations_cpp,v 1.1.1.1 2019/02/06 09:32:21
> solene Exp $
> -
> -Index: src/textures/animations.cpp
> ---- src/textures/animations.cpp.orig
> -+++ src/textures/animations.cpp
> -@@ -73,7 +73,7 @@ FAnimDef *FTextureManager::AddAnim (FAnimDef *anim)
> - if (mAnimations[i]->BasePic == anim->BasePic)
> - {
> - // Found one!
> -- free (mAnimations[i]);
> -+ //free (mAnimations[i]);
> - mAnimations[i] = anim;
> - return anim;
> - }
Here's revised diff to fixing resource leak as spotted by David Carlier:
Timo
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/gzdoom/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile 2 Apr 2019 13:56:40 -0000 1.5
+++ Makefile 25 May 2019 10:31:54 -0000
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT = OpenGL engine for idTech 1 games like
doom,hexen,heretic...
-V = 3.7.2
+V = 4.1.2
PKGNAME = gzdoom-${V}
DISTNAME = gzdoom-src-g${V}
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/gzdoom/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo 27 Feb 2019 23:35:17 -0000 1.2
+++ distinfo 25 May 2019 10:31:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (gzdoom-src-g3.7.2.zip) = BzdegCYKsjPC6VMhy4iWfaRvd2+DS+7tYKChCkxwAgU=
-SIZE (gzdoom-src-g3.7.2.zip) = 12189731
+SHA256 (gzdoom-src-g4.1.2.zip) = PlpypHGf8jEBwTGL+dSlZ0rWgj9s4GfDC/J/nuS1uPY=
+SIZE (gzdoom-src-g4.1.2.zip) = 15297100
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/gzdoom/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 6 Feb 2019 09:32:21 -0000 1.1.1.1
+++ patches/patch-src_CMakeLists_txt 25 May 2019 10:31:54 -0000
@@ -14,8 +14,8 @@ Index: src/CMakeLists.txt
if( WIN32 )
if( X64 )
set( WIN_TYPE Win64 )
-@@ -1301,7 +1305,13 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
- set( ZDOOM_LIBS ${ZDOOM_LIBS} nsl socket)
+@@ -1369,7 +1373,13 @@ if( UNIX )
+ endif()
endif()
+find_package( Backtrace )
Index: patches/patch-src_gamedata_textures_animations_cpp
===================================================================
RCS file: patches/patch-src_gamedata_textures_animations_cpp
diff -N patches/patch-src_gamedata_textures_animations_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_gamedata_textures_animations_cpp 25 May 2019 10:31:54
-0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+backport fix as noted by David Carlier:
+https://github.com/coelckers/gzdoom/commit/57a0a4c06635783ff6f48874b131e95fe9ab35c8
+
+Index: src/gamedata/textures/animations.cpp
+--- src/gamedata/textures/animations.cpp.orig
++++ src/gamedata/textures/animations.cpp
+@@ -73,7 +73,7 @@ FAnimDef *FTextureManager::AddAnim (FAnimDef *anim)
+ if (mAnimations[i]->BasePic == anim->BasePic)
+ {
+ // Found one!
+- free (mAnimations[i]);
++ M_Free (mAnimations[i]);
+ mAnimations[i] = anim;
+ return anim;
+ }
Index: patches/patch-src_scripting_vm_vmframe_cpp
===================================================================
RCS file: /cvs/ports/games/gzdoom/patches/patch-src_scripting_vm_vmframe_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_scripting_vm_vmframe_cpp
--- patches/patch-src_scripting_vm_vmframe_cpp 12 Feb 2019 18:07:11 -0000
1.1
+++ patches/patch-src_scripting_vm_vmframe_cpp 25 May 2019 10:31:54 -0000
@@ -1,14 +1,14 @@
-$OpenBSD: patch-src_scripting_vm_vmframe_cpp,v 1.1 2019/02/12 18:07:11 solene
Exp $
+$OpenBSD$
disable JIT so it's W^X compatible
Index: src/scripting/vm/vmframe.cpp
--- src/scripting/vm/vmframe.cpp.orig
+++ src/scripting/vm/vmframe.cpp
-@@ -49,7 +49,7 @@
- #endif
+@@ -45,7 +45,7 @@
+ #include "version.h"
- #ifdef ARCH_X64
+ #ifdef HAVE_VM_JIT
-CUSTOM_CVAR(Bool, vm_jit, true, CVAR_NOINITCALL)
+CUSTOM_CVAR(Bool, vm_jit, false, CVAR_NOINITCALL)
{
Index: patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp
===================================================================
RCS file:
/cvs/ports/games/gzdoom/patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1
patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp
--- patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp 6 Feb
2019 09:32:21 -0000 1.1.1.1
+++ patches/patch-src_sound_mididevices_music_fluidsynth_mididevice_cpp 25 May
2019 10:31:54 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_sound_mididevices_mu
Index: src/sound/mididevices/music_fluidsynth_mididevice.cpp
--- src/sound/mididevices/music_fluidsynth_mididevice.cpp.orig
+++ src/sound/mididevices/music_fluidsynth_mididevice.cpp
-@@ -49,12 +49,11 @@
+@@ -50,12 +50,11 @@
// do this without including windows.h for this one single prototype
extern "C" unsigned __stdcall GetSystemDirectoryA(char *lpBuffer, unsigned
uSize);
@@ -17,7 +17,7 @@ Index: src/sound/mididevices/music_fluid
#endif
#else
#include <dlfcn.h>
-@@ -64,6 +63,15 @@ extern "C" unsigned __stdcall GetSystemDirectoryA(char
+@@ -65,6 +64,15 @@ extern "C" unsigned __stdcall GetSystemDirectoryA(char
#else // !__APPLE__
#define FLUIDSYNTHLIB1 "libfluidsynth.so.1"
#endif // __APPLE__
Index: patches/patch-src_textures_animations_cpp
===================================================================
RCS file: patches/patch-src_textures_animations_cpp
diff -N patches/patch-src_textures_animations_cpp
--- patches/patch-src_textures_animations_cpp 6 Feb 2019 09:32:21 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_textures_animations_cpp,v 1.1.1.1 2019/02/06 09:32:21
solene Exp $
-
-Index: src/textures/animations.cpp
---- src/textures/animations.cpp.orig
-+++ src/textures/animations.cpp
-@@ -73,7 +73,7 @@ FAnimDef *FTextureManager::AddAnim (FAnimDef *anim)
- if (mAnimations[i]->BasePic == anim->BasePic)
- {
- // Found one!
-- free (mAnimations[i]);
-+ //free (mAnimations[i]);
- mAnimations[i] = anim;
- return anim;
- }
