From 2b89f637a6dbd5b585d078dab280bf173179d1ab Mon Sep 17 00:00:00 2001 From: SpidFightFR Date: Sat, 20 May 2023 11:52:18 +0000 Subject: [PATCH] gzdoom: update to 4.10.0. --- srcpkgs/gzdoom/patches/fix-build.patch | 13 ---------- srcpkgs/gzdoom/patches/fix-i686.patch | 32 ------------------------ srcpkgs/gzdoom/patches/sdl-version.patch | 24 ------------------ srcpkgs/gzdoom/template | 27 ++++++++++---------- 4 files changed, 14 insertions(+), 82 deletions(-) delete mode 100644 srcpkgs/gzdoom/patches/fix-build.patch delete mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch delete mode 100644 srcpkgs/gzdoom/patches/sdl-version.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 ) 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" 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."); - } diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template index 99ee5e2144c2..6f54b7476493 100644 --- a/srcpkgs/gzdoom/template +++ b/srcpkgs/gzdoom/template @@ -1,23 +1,23 @@ # Template file for 'gzdoom' pkgname=gzdoom -version=4.7.1 -revision=2 -_tagdate=2021-10-20 +version=4.10.0 +revision=1 +_tagdate=2022-12-04 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" 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" +distfiles="https://github.com/ZDoom/gzdoom/archive/g${version}.tar.gz + https://github.com/ZDoom/gzdoom/releases/download/g${version}/gzdoom_${version}_amd64.deb" +checksum="8702522c05048dfd4a765c6ac82a270d8bd0942e813d5bc6f4b69795a5d23a20 + 1baf9f577839daff89073768eeccf561dd330eabec65217ba67eba799a4dfcab" skip_extraction="${pkgname}_${version}_amd64.deb" -nocross=yes +nocross="Requires building from source and patches" CXXFLAGS=-std=gnu++11 @@ -40,10 +40,11 @@ post_extract() { } post_patch() { - vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/gitinfo.cpp - vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/gitinfo.cpp - vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/gitinfo.cpp - vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \ + vsed -e "s|GIT_DESCRIPTION|\"${version}\"|g" -i src/common/utility/gitinfo.cpp + vsed -e "s|VERSIONSTR|\"${version}\"|g" -i src/common/utility/gitinfo.cpp + vsed -e "s|GIT_TIME|\"${_tagdate}\"|g" -i src/common/utility/gitinfo.cpp + + vsed -e 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \ -i src/common/platform/posix/i_system.h vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp }