On Tue, May 14 2024, Thomas Frohwein wrote: > On Sun, May 12, 2024 at 08:26:57PM +0200, Solene Rapenne wrote: >> changelog https://github.com/ZDoom/gzdoom/compare/g4.11.3...g4.12.2 >> >> tested with doom2 and brutal doom, sound + music worked fine >> >> one patch was merged upstream > > I have the same diff and it works as expected with FreeDoom. ok thfr@ > for update; see if Timo can weigh in, too. >
Works fine here as well so ok from me as well. Timo >> diff --git a/games/gzdoom/Makefile b/games/gzdoom/Makefile >> index 50b4a92f320..e4ca89b89c3 100644 >> --- a/games/gzdoom/Makefile >> +++ b/games/gzdoom/Makefile >> @@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = i386 amd64 >> >> COMMENT = OpenGL engine for idTech 1 games like >> doom,hexen,heretic... >> >> -V = 4.11.3 >> +V = 4.12.2 >> >> DIST_TUPLE = github ZDoom gzdoom g${V} . >> PKGNAME = gzdoom-${V} >> diff --git a/games/gzdoom/distinfo b/games/gzdoom/distinfo >> index 34c0a704339..926b22dec20 100644 >> --- a/games/gzdoom/distinfo >> +++ b/games/gzdoom/distinfo >> @@ -1,2 +1,2 @@ >> -SHA256 (ZDoom-gzdoom-g4.11.3.tar.gz) = >> WUPbpQ2iD/lPH8xBUTJnLUKhWRfFcbHCt87v4Uk19dU= >> -SIZE (ZDoom-gzdoom-g4.11.3.tar.gz) = 24354699 >> +SHA256 (ZDoom-gzdoom-g4.12.2.tar.gz) = >> hkxaHsl23WBo+c2T+SxUBMZigkmWEB8UEd2yWlSvxzI= >> +SIZE (ZDoom-gzdoom-g4.12.2.tar.gz) = 25910359 >> diff --git a/games/gzdoom/patches/patch-CMakeLists_txt >> b/games/gzdoom/patches/patch-CMakeLists_txt >> deleted file mode 100644 >> index 6d2aba4be6d..00000000000 >> --- a/games/gzdoom/patches/patch-CMakeLists_txt >> +++ /dev/null >> @@ -1,12 +0,0 @@ >> -Index: CMakeLists.txt >> ---- CMakeLists.txt.orig >> -+++ CMakeLists.txt >> -@@ -301,7 +301,7 @@ else() >> - >> - if ( UNIX ) >> - include(CheckSymbolExists) >> -- check_symbol_exists( "fts_set" "fts.h" HAVE_FTS ) >> -+ check_symbol_exists( "fts_set" "sys/types.h;sys/stat.h;fts.h" >> HAVE_FTS ) >> - if ( NOT HAVE_FTS ) >> - include ( FindPkgConfig ) >> - pkg_check_modules( MUSL_FTS musl-fts ) >> diff --git a/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt >> b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt >> new file mode 100644 >> index 00000000000..f9dd257c5a3 >> --- /dev/null >> +++ b/games/gzdoom/patches/patch-libraries_ZWidget_CMakeLists_txt >> @@ -0,0 +1,12 @@ >> +Index: libraries/ZWidget/CMakeLists.txt >> +--- libraries/ZWidget/CMakeLists.txt.orig >> ++++ libraries/ZWidget/CMakeLists.txt >> +@@ -127,7 +127,7 @@ elseif(APPLE) >> + add_link_options(-pthread) >> + else() >> + set(ZWIDGET_SOURCES ${ZWIDGET_SOURCES} ${ZWIDGET_SDL2_SOURCES}) >> +- set(ZWIDGET_LIBS ${CMAKE_DL_LIBS} -ldl) >> ++ set(ZWIDGET_LIBS ${CMAKE_DL_LIBS}) >> + add_definitions(-DUNIX -D_UNIX) >> + add_link_options(-pthread) >> + endif() >>