On Sun, Oct 23, 2022 at 09:40:53AM +0200, Stefan Hagen wrote:
> Fixed the subject.
>
> Stefan Hagen wrote (2022-10-23 09:20 CEST):
> > Hello,
> >
> > vkquake is broken in -current after the SDL update and reports:
> >
> > ---
> > $ vkquake
> > Command line: ./vkquake
> > Found SDL version 2.24.1
> >
> > ERROR-OUT BEGIN
> >
> >
> > QUAKE ERROR: Your version of SDL library is incompatible with me.
> > You need a library version in the line of 2.0.6
> > ---
> >
> > Here is an update to the current version, which has this issue fixed
> > along with the following changes:
> >
> > 1.20.3
> > * Fixed multiple parallelism bugs
> > * 8-bit mode now has dithering
> >
> > 1.20.2
> > * Fixed a crash on startup with re-release Quake data
> > * Fixed crash with small stack sized on Unix (e.g. musl libc)
> >
> > 1.20.1
> > * Fix a bug that could cause random lockups with 1.20.0
> > * Fix screenshot crash
> > * Fix corruption if new vkquake.pak is missing or old one is still in place
> >
> > 1.20.0
> > * Parallelized renderer for significantly higher performance
> > * Parallelized texture mip generation for faster load times
> > * SIMD code optimizations
> > * "8-bit" color mode emulation
> > * Scaling is now less blurry
> > * Mods menu
> > * Completely replaced memory management (no more -heapsize)
> >
> > port-lib-depends-check reports pthread as missing WANTLIB, so I added
> > that.
> >
> > Tested on amd64. Maintainer on CC.
> >
> > OK?
Tested in build and runtime; ok thfr@
Same (or at least very similar) error occurs with quakespasm... I
checked because vkquake is based quakespasm:
$ quakespasm -basedir ~/games/quake
Command line: /usr/local/libexec/quakespasm -basedir /home/thfr/games/quake
Found SDL version 2.24.1
ERROR-OUT BEGIN
QUAKE ERROR: Your version of SDL library is incompatible with me.
You need a library version in the line of 2.0.0
CC'ing maintainer jsg@
> >
> > Best Regards,
> > Stefan
> >
> > Index: games/vkquake/Makefile
> > ===================================================================
> > RCS file: /cvs/ports/games/vkquake/Makefile,v
> > retrieving revision 1.12
> > diff -u -p -u -p -r1.12 Makefile
> > --- games/vkquake/Makefile 3 Jul 2022 22:51:46 -0000 1.12
> > +++ games/vkquake/Makefile 22 Oct 2022 12:21:27 -0000
> > @@ -1,6 +1,6 @@
> > COMMENT = port of Quake 1 using Vulkan instead of OpenGL
> >
> > -V = 1.13.1
> > +V = 1.20.3
> > PKGNAME = vkquake-${V}
> > GH_ACCOUNT = Novum
> > GH_PROJECT = vkQuake
> > @@ -12,7 +12,7 @@ MAINTAINER = Thomas Frohwein <thfr@openb
> > # GPLv2
> > PERMIT_PACKAGE = Yes
> >
> > -WANTLIB += SDL2 c m mad ogg vorbis vorbisfile vulkan
> > +WANTLIB += SDL2 c m mad ogg pthread vorbis vorbisfile vulkan
> >
> > # C11
> > COMPILER = base-clang ports-gcc
> > Index: games/vkquake/distinfo
> > ===================================================================
> > RCS file: /cvs/ports/games/vkquake/distinfo,v
> > retrieving revision 1.9
> > diff -u -p -u -p -r1.9 distinfo
> > --- games/vkquake/distinfo 18 May 2022 03:19:13 -0000 1.9
> > +++ games/vkquake/distinfo 22 Oct 2022 12:21:27 -0000
> > @@ -1,2 +1,2 @@
> > -SHA256 (vkQuake-1.13.1.tar.gz) =
> > zrnuRhNTCffK+UJnU5yucLR++O3xBOOQG4nTruewuHQ=
> > -SIZE (vkQuake-1.13.1.tar.gz) = 14143092
> > +SHA256 (vkQuake-1.20.3.tar.gz) =
> > f/SAwAUTrHqcR4ZMUpbUh0RLxbNaTGw5r/w6VgGIgzk=
> > +SIZE (vkQuake-1.20.3.tar.gz) = 33396356
> > Index: games/vkquake/patches/patch-Quake_Makefile
> > ===================================================================
> > RCS file: /cvs/ports/games/vkquake/patches/patch-Quake_Makefile,v
> > retrieving revision 1.6
> > diff -u -p -u -p -r1.6 patch-Quake_Makefile
> > --- games/vkquake/patches/patch-Quake_Makefile 4 Jul 2022 11:26:02
> > -0000 1.6
> > +++ games/vkquake/patches/patch-Quake_Makefile 22 Oct 2022 12:21:27
> > -0000
> > @@ -16,8 +16,8 @@ Index: Quake/Makefile
> > DFLAGS ?=
> > CFLAGS ?=
> >
> > --CFLAGS += -Wall -Wno-trigraphs -Wno-unused-function -Werror -std=gnu11
> > -+CFLAGS += -Wall -Wno-trigraphs -Wno-unused-function -std=gnu11
> > +-CFLAGS += -Wall -Wno-trigraphs -Wno-unused-function -Werror -std=gnu11
> > -MMD
> > ++CFLAGS += -Wall -Wno-trigraphs -Wno-unused-function -std=gnu11 -MMD
> > CFLAGS += $(CPUFLAGS)
> > ifneq ($(DEBUG),0)
> > DFLAGS += -D_DEBUG
> > @@ -28,4 +28,4 @@ Index: Quake/Makefile
> > -CFLAGS += -O3
> > CFLAGS += $(call check_gcc,-fweb,)
> > CFLAGS += $(call check_gcc,-frename-registers,)
> > - cmd_strip=$(STRIP) $(1)
> > + CFLAGS += $(call check_gcc,-fno-asynchronous-unwind-tables,)
> >
