Hi,
Here is a diff to update games/ezquake to v3.6.5. A few things to
note:
* Build system has moved to CMake
* Removed CFLAGS_base-clang directive because CMake takes care of that
* Added patch to CMakelists.txt to keep the binary named 'ezquake'
* Brought over the external browser list and SDL patches from 3.6.4
* Release notes can be found here:
https://github.com/QW-Group/ezquake-source/releases/tag/3.6.5
I tested this on my 8th gen Intel i7 laptop with OpenBSD-CURRENT. Game
loads and plays well, it also connects to my games/mvdsv server and I
can also browser other external servers in the menu.
Thanks,
Tom
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/ezquake/Makefile,v
diff -u -p -r1.18 Makefile
--- Makefile 14 May 2024 02:39:05 -0000 1.18
+++ Makefile 26 Oct 2024 20:48:04 -0000
@@ -3,9 +3,8 @@ COMMENT = modern QuakeWorld client
CATEGORIES = games
N = ezquake
-V = 3.6.4
+V = 3.6.5
PKGNAME = ${N}-${V}
-REVISION = 0
DIST_TUPLE += github QW-Group ${N}-source ${V} . # GPLv2+
DIST_TUPLE += github QW-Group qwprot 53af547d0608a1507895fc1629cdc3f4820fc0af
src/qwprot # GPLv2+
@@ -19,7 +18,7 @@ HOMEPAGE = https://ezquake.com/
WANTLIB += GL SDL2 c curl expat freetype jansson jpeg m minizip pcre2-8 png
WANTLIB += pthread sndfile speex speexdsp z
-CFLAGS_base-clang = -Wno-error=int-conversion
+MODULES = devel/cmake
LIB_DEPENDS = archivers/minizip \
audio/libsndfile \
@@ -31,15 +30,12 @@ LIB_DEPENDS = archivers/minizip \
devel/jansson \
net/curl
-USE_GMAKE = Yes
-MAKE_ENV = V=1
-
NO_TEST = Yes
GAMEDIR = ${PREFIX}/share/ezquake
SUBST_VARS += GAMEDIR
-do-configure:
+pre-configure:
${SUBST_CMD} ${WRKSRC}/src/EX_browser_sources.c
do-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/ezquake/distinfo,v
diff -u -p -r1.10 distinfo
--- distinfo 6 Nov 2023 23:47:43 -0000 1.10
+++ distinfo 26 Oct 2024 20:48:04 -0000
@@ -1,4 +1,4 @@
-SHA256 (QW-Group-ezquake-source-3.6.4.tar.gz) =
BvKf049WKRxMr/GTyLJUF6DBjlj6JrwOWOBjl//tmTM=
+SHA256 (QW-Group-ezquake-source-3.6.5.tar.gz) =
rM3ZmJPwHeevDoyUMxAs45khDRtjwxreY+6CUgGTIxM=
SHA256 (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) =
+nkEALY4D495qX9h2LdciMAwR3CWcT6ewRLjBUsuxFA=
-SIZE (QW-Group-ezquake-source-3.6.4.tar.gz) = 1920426
+SIZE (QW-Group-ezquake-source-3.6.5.tar.gz) = 1920510
SIZE (QW-Group-qwprot-53af547d0608a1507895fc1629cdc3f4820fc0af.tar.gz) = 8815
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 26 Oct 2024 20:48:04 -0000
@@ -0,0 +1,14 @@
+Set binary name to ezquake instead of ezquake-OpenBSD-<arch>
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -885,6 +885,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+ string(TOLOWER "ezQuake" EXECUTABLE_NAME)
+ elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+ string(TOLOWER "ezquake" EXECUTABLE_NAME)
++elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
++ string(TOLOWER "ezquake" EXECUTABLE_NAME)
+ else()
+ string(TOLOWER "ezquake-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}"
EXECUTABLE_NAME)
+ endif()
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 6 Nov 2023 23:47:43 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-Skip the architecture dance.
-Add X11BASE/lib to LDFLAGS
-
-Index: Makefile
---- Makefile.orig
-+++ Makefile
-@@ -36,7 +36,7 @@ JSON2C ?= ./json2c.sh
-
- CFLAGS ?= -O2 -Wall -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
-Wno-strict-aliasing -Werror=strict-prototypes -Werror=old-style-definition -g
-MMD $(INCLUDES)
- RCFLAGS ?=
--LDFLAGS ?=
-+LDFLAGS ?= -L${X11BASE}/lib
- LIBS ?=
-
- CFLAGS_c :=
-@@ -571,7 +571,7 @@ endif
- ifdef CONFIG_WINDOWS
- TARG_c := ezquake$(EZ_POSTFIX).exe
- else
-- TARG_c := ezquake-$(LSYS)-$(CPU)$(EZ_POSTFIX)
-+ TARG_c := ezquake
- endif
-
- all: $(TARG_c)
Index: patches/patch-src_vid_sdl2_c
===================================================================
RCS file: /cvs/ports/games/ezquake/patches/patch-src_vid_sdl2_c,v
diff -u -p -r1.1 patch-src_vid_sdl2_c
--- patches/patch-src_vid_sdl2_c 6 Nov 2023 23:47:43 -0000 1.1
+++ patches/patch-src_vid_sdl2_c 26 Oct 2024 20:48:04 -0000
@@ -6,12 +6,15 @@ https://github.com/QW-Group/ezquake-sour
Index: src/vid_sdl2.c
--- src/vid_sdl2.c.orig
+++ src/vid_sdl2.c
-@@ -222,7 +222,7 @@ cvar_t r_verbose = {"vid_verbose",
+@@ -226,11 +226,7 @@ cvar_t r_verbose = {"vid_verbose",
cvar_t r_showextensions = {"vid_showextensions", "0",
CVAR_SILENT };
cvar_t gl_multisamples = {"gl_multisamples", "0",
CVAR_LATCH_GFX | CVAR_AUTO }; // It's here because it needs to be registered
before window creation
cvar_t vid_gammacorrection = {"vid_gammacorrection", "0",
CVAR_LATCH_GFX };
+-#ifdef __APPLE__
+ cvar_t vid_software_palette = {"vid_software_palette", "0",
CVAR_NO_RESET | CVAR_LATCH_GFX };
+-#else
-cvar_t vid_software_palette = {"vid_software_palette", "1",
CVAR_NO_RESET | CVAR_LATCH_GFX };
-+cvar_t vid_software_palette = {"vid_software_palette", "0",
CVAR_NO_RESET | CVAR_LATCH_GFX };
+-#endif
cvar_t vid_framebuffer = {"vid_framebuffer", "0",
CVAR_NO_RESET | CVAR_LATCH_GFX, conres_changed_callback };
cvar_t vid_framebuffer_blit = {"vid_framebuffer_blit", "0",
CVAR_NO_RESET };
