From fc2638666674665ab7be93fbba7527dec16ccf6e Mon Sep 17 00:00:00 2001 From: poopingpenis <35617595+poopingpenis@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:53:15 -0400 Subject: [PATCH 1/5] Update template --- srcpkgs/gzdoom/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index d746ea14ff57..baf5a4fb3328 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -1,13 +1,13 @@ # Template file for 'gzdoom' pkgname=gzdoom -version=4.7.1 -revision=2 -_tagdate=2021-10-20 +version=4.8.2 +revision=1 +_tagdate=2022-07-04 wrksrc="${pkgname}-g${version}" build_style=cmake configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF" hostmakedepends="pkg-config tar xz" -makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel" +makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel libvpx-devel" short_desc="Advanced Doom source port with OpenGL support" maintainer="Érico Nogueira " license="GPL-3.0-or-later" @@ -15,8 +15,8 @@ homepage="https://www.zdoom.org" # WARNING: watch out for new submodules distfiles="https://github.com/coelckers/gzdoom/archive/g${version}.tar.gz https://github.com/coelckers/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb" -checksum="454257582be0576501eef1efc99fe7ea70f1c4d7993549db3cbc709ce75fc102 - af1501c05815a7945a335704f6f05ac263c5877549fa3f476478077b56ea14f2" +checksum="4edd60f8094c9dc3dfb7400bdbc0ebb0a5e574b0a6747eee4c8d9f1f6af77127 + 0bb7455ea18408d7b93ec5ce3a26e4fdd4efa04e9aace481021fc39fa7aec1a4" skip_extraction="${pkgname}_${version}_amd64.deb" nocross=yes From ae81d0b655574db66ec6d371a63e60677dead451 Mon Sep 17 00:00:00 2001 From: poopingpenis <35617595+poopingpenis@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:54:10 -0400 Subject: [PATCH 2/5] Delete fix-i686.patch --- srcpkgs/gzdoom/patches/fix-i686.patch | 32 --------------------------- 1 file changed, 32 deletions(-) delete mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch deleted file mode 100644 index 14914b3a5a51..000000000000 --- a/srcpkgs/gzdoom/patches/fix-i686.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 26c617e..e162638 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1361,11 +1361,11 @@ endif() - if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE ) - # Need to enable intrinsics for these files. - if( SSE_MATTERS ) -- set_property( SOURCE -+ set_source_files_properties( - common/rendering/polyrenderer/poly_all.cpp - rendering/swrenderer/r_all.cpp -- utility/palette.cpp -- utility/x86.cpp -+ common/utility/palette.cpp -+ common/utility/x86.cpp - APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" ) - endif() - endif() -diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp -index f2a2987..b8de208 100644 ---- a/src/common/utility/palette.cpp -+++ b/src/common/utility/palette.cpp -@@ -33,6 +33,8 @@ - */ - - #include -+#include -+#include - #include "palutil.h" - #include "palentry.h" - #include "sc_man.h" From 47c7dd8e57c218d83a344459723bfcaf570adb4c Mon Sep 17 00:00:00 2001 From: poopingpenis <35617595+poopingpenis@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:54:19 -0400 Subject: [PATCH 3/5] Delete fix-build.patch --- srcpkgs/gzdoom/patches/fix-build.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 srcpkgs/gzdoom/patches/fix-build.patch diff --git a/srcpkgs/gzdoom/patches/fix-build.patch b/srcpkgs/gzdoom/patches/fix-build.patch deleted file mode 100644 index 78b898e09b61..000000000000 --- a/srcpkgs/gzdoom/patches/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -276,7 +276,9 @@ else() - include ( FindPkgConfig ) - pkg_check_modules( MUSL_FTS musl-fts ) - if ( MUSL_FTS_FOUND ) -- set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${MUSL_FTS_LDFLAGS}" ) -+ foreach(flags IN LISTS MUSL_FTS_LDFLAGS) -+ set ( ALL_C_FLAGS "${ALL_C_FLAGS} ${flags}" ) -+ endforeach() - else ( MUSL_FTS_FOUND ) - message (ERROR "fts_* functions not found in the system" ) - endif ( MUSL_FTS_FOUND ) From 988f9af01586e23ccbd431eb5d894ce52593cc8b Mon Sep 17 00:00:00 2001 From: poopingpenis <35617595+poopingpenis@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:54:50 -0400 Subject: [PATCH 4/5] Delete sdl-version.patch --- srcpkgs/gzdoom/patches/sdl-version.patch | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 srcpkgs/gzdoom/patches/sdl-version.patch diff --git a/srcpkgs/gzdoom/patches/sdl-version.patch b/srcpkgs/gzdoom/patches/sdl-version.patch deleted file mode 100644 index 2ec2680ab4b7..000000000000 --- a/srcpkgs/gzdoom/patches/sdl-version.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2c69afa1187f55c2634c67c3ece47d89fd1b4f67 Mon Sep 17 00:00:00 2001 -From: Christoph Oelckers -Date: Tue, 31 May 2022 11:00:10 +0200 -Subject: [PATCH] - fixed SDL version check - ---- - src/common/platform/posix/sdl/sdlglvideo.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/common/platform/posix/sdl/sdlglvideo.cpp b/src/common/platform/posix/sdl/sdlglvideo.cpp -index a5f7e6b527e..335dc620657 100644 ---- a/src/common/platform/posix/sdl/sdlglvideo.cpp -+++ b/src/common/platform/posix/sdl/sdlglvideo.cpp -@@ -394,9 +394,7 @@ SDLVideo::SDLVideo () - } - - // Fail gracefully if we somehow reach here after linking against a SDL2 library older than 2.0.6. -- SDL_version sdlver; -- SDL_GetVersion(&sdlver); -- if (!(sdlver.patch >= 6)) -+ if (!SDL_VERSION_ATLEAST(2, 0, 6)) - { - I_FatalError("Only SDL 2.0.6 or later is supported."); - } From e6a3aab901de17ca5cae6b94a0cef85ca0336718 Mon Sep 17 00:00:00 2001 From: poopingpenis <35617595+poopingpenis@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:55:21 -0400 Subject: [PATCH 5/5] Create fix-gzdoom.pk3.patch --- srcpkgs/gzdoom/patches/fix-gzdoom.pk3.patch | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/gzdoom/patches/fix-gzdoom.pk3.patch diff --git a/srcpkgs/gzdoom/patches/fix-gzdoom.pk3.patch b/srcpkgs/gzdoom/patches/fix-gzdoom.pk3.patch new file mode 100644 index 000000000000..1d04aad1755e --- /dev/null +++ b/srcpkgs/gzdoom/patches/fix-gzdoom.pk3.patch @@ -0,0 +1,22 @@ +--- a/src/d_main.cpp.old 2022-10-23 21:12:16.501173842 -0400 ++++ b/src/d_main.cpp 2022-10-23 21:13:13.549777412 -0400 +@@ -3534,6 +3534,8 @@ + + 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. +@@ -3566,9 +3568,7 @@ + Printf("\n"); + } + +- if (!batchrun) Printf(PRINT_LOG, "%s version %s\n", GAMENAME, GetVersionString()); +- +- D_DoomInit(); ++ Printf("%s version %s\n", GAMENAME, GetVersionString()); + + extern void D_ConfirmSendStats(); + D_ConfirmSendStats();