Here is an update to GZDoom 4.11.3. It works to run mods like the
recently released Beyond Sunset.

Of note, you may need to switch the video backend to opengl as I
outlined after previous concerns:

https://marc.info/?l=openbsd-ports&m=169132550927983&w=2

Of note, we are several versions behind upstream - the current version
in ports is 4.8.2.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/gzdoom/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile    18 Jul 2022 08:27:45 -0000      1.17
+++ Makefile    9 Nov 2023 20:12:53 -0000
@@ -6,11 +6,10 @@ ONLY_FOR_ARCHS =      i386 amd64
 
 COMMENT =              OpenGL engine for idTech 1 games like 
doom,hexen,heretic...
 
-V =                    4.8.2
-GH_ACCOUNT =           coelckers
-GH_PROJECT =           gzdoom
-GH_TAGNAME =           g${V}
-DISTNAME =             gzdoom-${V}
+V =                    4.11.3
+
+DIST_TUPLE =           github ZDoom gzdoom g${V} .
+PKGNAME =              gzdoom-${V}
 
 CATEGORIES=            games
 
@@ -21,8 +20,8 @@ MAINTAINER =          Timo Myyra <timo.myyra@bit
 # GPLv3
 PERMIT_PACKAGE =       Yes
 
-WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo jpeg m
-WANTLIB += openal vpx z zmusic
+WANTLIB += ${COMPILER_LIBCXX} SDL2 bz2 c execinfo m
+WANTLIB += openal vpx webp webpdemux webpmux zmusic
 
 # C++17
 COMPILER =             base-clang ports-gcc
@@ -34,13 +33,14 @@ CONFIGURE_ARGS +=   -DDYN_OPENAL=NO
 CONFIGURE_ARGS +=      -DHAVE_STDINT_H=1
 CONFIGURE_ARGS +=      -DNO_OPENMP=ON
 
-CXXFLAGS +=             -I. -I${LOCALBASE}/include
+CFLAGS +=              -I${X11BASE}/include
+CXXFLAGS +=            -I. -I${LOCALBASE}/include
 
 LIB_DEPENDS =          archivers/bzip2 \
                        audio/openal \
                        audio/zmusic \
                        devel/sdl2 \
-                       graphics/jpeg \
+                       graphics/libwebp \
                        multimedia/libvpx
 
 NO_TEST =              Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/gzdoom/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo    18 Jul 2022 08:27:45 -0000      1.7
+++ distinfo    9 Nov 2023 20:12:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (gzdoom-4.8.2.tar.gz) = Tt1g+AlMncPft0AL28DrsKXldLCmdH7uTI2fH2r3cSc=
-SIZE (gzdoom-4.8.2.tar.gz) = 24247668
+SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) = 
WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU=
+SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/gzdoom/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt        18 Jul 2022 08:27:46 -0000      1.3
+++ patches/patch-CMakeLists_txt        9 Nov 2023 20:12:53 -0000
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -272,7 +272,7 @@ else()
+@@ -301,7 +301,7 @@ else()
  
        if ( UNIX )
                include(CheckSymbolExists)
Index: patches/patch-libraries_ZVulkan_CMakeLists_txt
===================================================================
RCS file: patches/patch-libraries_ZVulkan_CMakeLists_txt
diff -N patches/patch-libraries_ZVulkan_CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-libraries_ZVulkan_CMakeLists_txt      9 Nov 2023 20:12:53 
-0000
@@ -0,0 +1,12 @@
+Index: libraries/ZVulkan/CMakeLists.txt
+--- libraries/ZVulkan/CMakeLists.txt.orig
++++ libraries/ZVulkan/CMakeLists.txt
+@@ -188,7 +188,7 @@ if(WIN32)
+       add_definitions(-DUNICODE -D_UNICODE)
+ else()
+       set(ZVULKAN_SOURCES ${ZVULKAN_SOURCES} ${ZVULKAN_UNIX_SOURCES})
+-      set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
++      #set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
+       add_definitions(-DUNIX -D_UNIX)
+       add_link_options(-pthread)
+ endif()
Index: patches/patch-libraries_discordrpc_CMakeLists_txt
===================================================================
RCS file: patches/patch-libraries_discordrpc_CMakeLists_txt
diff -N patches/patch-libraries_discordrpc_CMakeLists_txt
--- patches/patch-libraries_discordrpc_CMakeLists_txt   31 Jul 2022 20:50:40 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-don't pick up clang-format is present
-
-Index: libraries/discordrpc/CMakeLists.txt
---- libraries/discordrpc/CMakeLists.txt.orig
-+++ libraries/discordrpc/CMakeLists.txt
-@@ -10,7 +10,8 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
- )
- 
- # Set CLANG_FORMAT_SUFFIX if you are using custom clang-format, e.g. 
clang-format-5.0
--find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
-+#find_program(CLANG_FORMAT_CMD clang-format${CLANG_FORMAT_SUFFIX})
-+set(CLANG_FORMAT_CMD, FALSE)
- 
- if (CLANG_FORMAT_CMD)
-     add_custom_target(
Index: patches/patch-src_d_main_cpp
===================================================================
RCS file: patches/patch-src_d_main_cpp
diff -N patches/patch-src_d_main_cpp
--- patches/patch-src_d_main_cpp        18 Jul 2022 08:27:46 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-fix gzdoom.pk3 not found error, backport of
-https://github.com/coelckers/gzdoom/pull/1665
-
-Index: src/d_main.cpp
---- src/d_main.cpp.orig
-+++ src/d_main.cpp
-@@ -3534,6 +3534,8 @@ static int D_DoomMain_Internal (void)
-       
-       std::set_new_handler(NewFailure);
-       const char *batchout = Args->CheckValue("-errorlog");
-+
-+      D_DoomInit();
-       
-       // [RH] Make sure zdoom.pk3 is always loaded,
-       // as it contains magic stuff we need.
-@@ -3567,8 +3569,6 @@ static int D_DoomMain_Internal (void)
-       }
- 
-       if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, 
GetVersionString());
--
--      D_DoomInit();
- 
-       extern void D_ConfirmSendStats();
-       D_ConfirmSendStats();

Reply via email to