Hi,

This fixes the segfault in odamex for me. OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/odamex/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile    25 Oct 2022 11:02:44 -0000      1.12
+++ Makefile    25 Oct 2022 19:06:14 -0000
@@ -1,11 +1,9 @@
-BROKEN =       segfaults since SDL2 was updated
-
 COMMENT =      online multiplayer doom
 
 V =            0.9.5
 DISTNAME =     odamex-src-${V}
 PKGNAME =      odamex-${V}
-REVISION =     0
+REVISION =     1
 
 CATEGORIES =   games
 HOMEPAGE =     https://odamex.net/
Index: patches/patch-client_sdl_i_sdl_h
===================================================================
RCS file: patches/patch-client_sdl_i_sdl_h
diff -N patches/patch-client_sdl_i_sdl_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-client_sdl_i_sdl_h    25 Oct 2022 19:20:34 -0000
@@ -0,0 +1,17 @@
+Workaround to build with SDL 2.24.1+ until upstream catches up to new
+SDL versioning
+
+https://github.com/odamex/odamex/commit/84b88e156fd81cf74b70bc6c0129bde5d9588e1a
+
+Index: client/sdl/i_sdl.h
+--- client/sdl/i_sdl.h.orig
++++ client/sdl/i_sdl.h
+@@ -26,7 +26,7 @@
+ 
+ #include <SDL.h>
+ 
+-#if (SDL_MAJOR_VERSION == 2 && SDL_MINOR_VERSION == 0)
++#if (SDL_MAJOR_VERSION == 2)
+       #define SDL20
+ #elif (SDL_MAJOR_VERSION == 1 && SDL_MINOR_VERSION == 2)
+       #define SDL12
Index: patches/patch-libraries_textscreen_txt_sdl_h
===================================================================
RCS file: /cvs/ports/games/odamex/patches/patch-libraries_textscreen_txt_sdl_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-libraries_textscreen_txt_sdl_h
--- patches/patch-libraries_textscreen_txt_sdl_h        23 Oct 2022 14:09:28 
-0000      1.1
+++ patches/patch-libraries_textscreen_txt_sdl_h        25 Oct 2022 19:20:59 
-0000
@@ -1,6 +1,8 @@
 Workaround to build with SDL 2.24.1+ until upstream catches up to new
 SDL versioning
 
+https://github.com/odamex/odamex/commit/84b88e156fd81cf74b70bc6c0129bde5d9588e1a
+
 Index: libraries/textscreen/txt_sdl.h
 --- libraries/textscreen/txt_sdl.h.orig
 +++ libraries/textscreen/txt_sdl.h

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk

Reply via email to