Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Apr 2026 14:39:24 +0000
From:      Vladimir Druzenko <vvd@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Cc:        Alastair Hogge <agh@riseup.net>
Subject:   git: 40b264f45e9b - main - games/vkquake: Update 1.32.3.1 => 1.34.1
Message-ID:  <69f3699c.3cdc6.6e0830ea@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=40b264f45e9b0133beca56e245279f38e079bb5b

commit 40b264f45e9b0133beca56e245279f38e079bb5b
Author:     Alastair Hogge <agh@riseup.net>
AuthorDate: 2026-04-30 14:36:45 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-04-30 14:39:18 +0000

    games/vkquake: Update 1.32.3.1 => 1.34.1
    
    Changelogs:
    https://github.com/Novum/vkQuake/releases/tag/1.33.0
    https://github.com/Novum/vkQuake/releases/tag/1.33.1
    https://github.com/Novum/vkQuake/releases/tag/1.34.0
    https://github.com/Novum/vkQuake/releases/tag/1.34.1
    
    PR:             294511
    Approved by:    Amelia Marsh <seafork@disroot.org> (maintainer)
    Sponsored by:   UNIS Labs
---
 games/vkquake/Makefile                      | 21 ++++++++++++---------
 games/vkquake/distinfo                      |  8 +++-----
 games/vkquake/files/patch-Quake_pr__edict.c | 14 +++++++-------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/games/vkquake/Makefile b/games/vkquake/Makefile
index 75eb2cb370a5..fd5794691421 100644
--- a/games/vkquake/Makefile
+++ b/games/vkquake/Makefile
@@ -1,11 +1,7 @@
 PORTNAME=	vkquake
-DISTVERSION=	1.32.3.1
-PORTREVISION=	2
+DISTVERSION=	1.34.1
 CATEGORIES=	games
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	85ddf2386f15944c26317a763d4044077fc8731f.patch:-p1
-
 MAINTAINER=	seafork@disroot.org
 COMMENT=	Vulkan Quake port based on QuakeSpasm
 WWW=		https://github.com/Novum/vkQuake
@@ -17,23 +13,27 @@ BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		vulkan-headers>0:graphics/vulkan-headers
 LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 
-USES=		meson pkgconfig sdl
+USES=		compiler:c11 meson pkgconfig sdl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Novum
 GH_PROJECT=	vkQuake
-USE_SDL=	sdl2
 
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
 CFLAGS+=	-DDATADIR='\"${Q1DIR}\"' -Wno-error=atomic-alignment
+LDFLAGS+=	-lexecinfo
 
 OPTIONS_DEFINE=			DEBUG FLAC OPUS USERDIRS VORBIS WAVE
-OPTIONS_DEFAULT=		FLAC MP3 OPUS USERDIRS VORBIS WAVE
+OPTIONS_DEFAULT=		FLAC MP3 OPUS SDL2 USERDIRS VORBIS WAVE
 OPTIONS_RADIO=			MP3LIBRARY
 OPTIONS_RADIO_MP3LIBRARY=	MAD MP3
+OPTIONS_SINGLE=			SDL
+OPTIONS_SINGLE_SDL=		SDL2 SDL3
 
 MP3LIBRARY_DESC=	MP3 audio library
+SDL2_DESC=		SDL-2.x support
+SDL3_DESC=		SDL-3.x support
 USERDIRS_DESC=		Support loading game data from user directories (~/.vkquake)
 WAVE_DESC=		Wave audio support
 
@@ -50,6 +50,9 @@ MP3_MESON_ON=		-Dmp3_lib=mpg123
 OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
 			libopusfile.so:audio/opusfile
 OPUS_MESON_ENABLED=	use_codec_opus
+SDL2_USE=		SDL=sdl2
+SDL2_MESON_FALSE=	use_sdl3
+SDL3_USE=		SDL=sdl3
 USERDIRS_MESON_ENABLED=	do_userdirs
 VORBIS_LIB_DEPENDS=	libogg.so:audio/libogg \
 			libvorbis.so:audio/libvorbis \
@@ -63,7 +66,7 @@ post-install:
 	${MKDIR} ${STAGEDIR}${Q1DIR} \
 		 ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps \
 		 ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
-	${INSTALL_DATA} ${WRKSRC}/Quake/vkquake.pak \
+	${INSTALL_DATA} ${WRKSRC}/_build/vkquake.pak \
 		${STAGEDIR}${Q1DIR}
 	${INSTALL_DATA} ${WRKSRC}/Misc/vkQuake_256.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/vkquake.png
diff --git a/games/vkquake/distinfo b/games/vkquake/distinfo
index 8c6b192b4728..5774bd49687a 100644
--- a/games/vkquake/distinfo
+++ b/games/vkquake/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1759155169
-SHA256 (Novum-vkQuake-1.32.3.1_GH0.tar.gz) = 10440837f98ce4aaeb215b95298a1197ce42d25fdc05d890669d5d71b211a591
-SIZE (Novum-vkQuake-1.32.3.1_GH0.tar.gz) = 28244801
-SHA256 (85ddf2386f15944c26317a763d4044077fc8731f.patch) = 8a03da95d4f35e9905ba6a4e5cf5dee7cbc62e5ef066329ba95c079c336a3746
-SIZE (85ddf2386f15944c26317a763d4044077fc8731f.patch) = 1952
+TIMESTAMP = 1776056066
+SHA256 (Novum-vkQuake-1.34.1_GH0.tar.gz) = 3ce614a47ad563cfdf91429861c74ade11b3aa68805fedb16f1f452ceee515af
+SIZE (Novum-vkQuake-1.34.1_GH0.tar.gz) = 26424402
diff --git a/games/vkquake/files/patch-Quake_pr__edict.c b/games/vkquake/files/patch-Quake_pr__edict.c
index d033133a2acc..c334cd43dfdd 100644
--- a/games/vkquake/files/patch-Quake_pr__edict.c
+++ b/games/vkquake/files/patch-Quake_pr__edict.c
@@ -4,16 +4,16 @@
  process that does not generate this patch. To get around this, remove
  ${WRKSRC}/Misc/vq_pak/maps when the patches need to be regenerated.
 
---- Quake/pr_edict.c.orig	2025-05-01 11:30:09 UTC
+--- Quake/pr_edict.c.orig	2026-04-14 07:28:53 UTC
 +++ Quake/pr_edict.c
-@@ -883,8 +883,8 @@ void ED_PrintEdicts (void)
- */
- void ED_PrintEdicts (void)
- {
+@@ -977,8 +977,8 @@ void ED_PrintEdicts (void)
+ 	if (!sv.active)
+ 		return;
+ 
 -	int free_edicts_count = 0;
 -	int free_list_count = 0;
 +	int free_edicts_count __attribute__((unused)) = 0;
 +	int free_list_count __attribute__((unused)) = 0;
  
- 	if (!sv.active)
- 		return;
+ 	PR_SwitchQCVM (&sv.qcvm);
+ 


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f3699c.3cdc6.6e0830ea>