Timo Myyrä wrote (2023-11-14 17:50 CET):
> On Fri, Nov 10 2023, Stefan Hagen wrote:
>
> > Thomas Frohwein wrote (2023-11-09 21:16 CET):
> >> 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.
> >
> > What's the deal with:
> >> +- set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> >> ++ #set(ZVULKAN_LIBS ${CMAKE_DL_LIBS} -ldl)
> >
> > It builds and works fine with
> > set(ZVULKAN_LIBS ${CMAKE_DL_LIBS})
> >
> > There doesn't seem to be a difference at runtime. At least on my
> > machine (amd), vulkan runs fine with and without this line.
> >
> > (I haven't diffed the build logs to figure out if it has picked up
> > something differently)
> >
> > Regarding:
> >> https://marc.info/?l=openbsd-ports&m=169132550927983&w=2
> >> After changing that back to default opengl (0),
> >
> > It seems to be untrue that opengl is the default backend. If I remove
> > gzdoom.ini and start the game, the vulkan backend is automatically
> > selected.
> >
> > If we have issues with the vulkan backend on more than a few machines,
> > should we change the default? And/Or described the issue in the README?
> >
>
> How about this diff? Bumps minor version a bit and sets the vulkan bits.
> Works for me with ryzen thinkpad.
Hmm. Vulkan and OpenGL ES works. When I select OpenGL it gets stuck on
the loading screen and gzdoom keeps consuming 60% CPU and X ~15/20%.
Does this happen for you too?
> diff /usr/ports
> commit - 9213cea3ba80fcc2debf29c883db9b8e42c07622
> path + /usr/ports
> blob - e08c43f0bf6074d7afac5b1c384ceb55e065c6fc
> file + games/gzdoom/Makefile
> --- games/gzdoom/Makefile
> +++ games/gzdoom/Makefile
> @@ -6,12 +6,11 @@ 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
>
> HOMEPAGE = https://zdoom.org
> @@ -21,8 +20,8 @@ MAINTAINER = Timo Myyra
> <timo.my...@bittivirhe.fi>
> # 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
> blob - fffa78bdc838438fde2a24aea4f98f67711f36aa
> file + games/gzdoom/distinfo
> --- games/gzdoom/distinfo
> +++ games/gzdoom/distinfo
> @@ -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
> blob - 0f5f1a7bc01e286e168f93809d4a8c6c8357cc3e
> file + games/gzdoom/patches/patch-CMakeLists_txt
> --- games/gzdoom/patches/patch-CMakeLists_txt
> +++ games/gzdoom/patches/patch-CMakeLists_txt
> @@ -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)
> blob - /dev/null
> file + games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt (mode 644)
> --- /dev/null
> +++ games/gzdoom/patches/patch-libraries_ZVulkan_CMakeLists_txt
> @@ -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})
> + add_definitions(-DUNIX -D_UNIX)
> + add_link_options(-pthread)
> + endif()
> blob - 89f07cd487ce6fca5e38f2137f3fcb216658cef7
> file + /dev/null
> --- games/gzdoom/patches/patch-libraries_discordrpc_CMakeLists_txt
> +++ /dev/null
> @@ -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(
> blob - 7245cc1caf34db9c4bfb8a5d85e9dee2448f7d00
> file + /dev/null
> --- games/gzdoom/patches/patch-src_d_main_cpp
> +++ /dev/null
> @@ -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();
>
