[PR PATCH] gzdoom: update to version 4.10.0.

[PR PATCH] gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 1097 bytes --]

There is a new pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-gzdoom
https://github.com/void-linux/void-packages/pull/44504

gzdoom: update to version 4.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR:

- Remade the i686 patch as it was broken after updating.
- Removed the sdl patch as it's already applied in the gzdoom repo ( see [sdlglvideo.cpp](https://github.com/ZDoom/gzdoom/blob/c675d60bacefd9c6651b8006f799f7bb55d0870b/src/common/platform/posix/sdl/sdlglvideo.cpp#L246) )
- Removed the vsed lines post-patch as gitinfo.cpp has been removed since [release 4.9.0](https://github.com/ZDoom/gzdoom/releases/tag/g4.9.0), also removed the leftover variable "tagdate".



A patch file from https://github.com/void-linux/void-packages/pull/44504.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gzdoom-44504.patch --]
[-- Type: text/x-diff, Size: 5458 bytes --]

From 747390420515cad6b58a20cf3e1ad2cae48af1f7 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Sun, 18 Jun 2023 15:18:31 +0000
Subject: [PATCH] gzdoom: update to version 4.10.0.

---
 srcpkgs/gzdoom/patches/fix-i686.patch    | 29 ++++++++++++------------
 srcpkgs/gzdoom/patches/sdl-version.patch | 24 --------------------
 srcpkgs/gzdoom/template                  | 24 ++++++--------------
 3 files changed, 21 insertions(+), 56 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/sdl-version.patch

diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
index 14914b3a5a51..0aa4c22e5fe7 100644
--- a/srcpkgs/gzdoom/patches/fix-i686.patch
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -1,24 +1,23 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 26c617e..e162638 100644
+index 911e35d..813858e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -1361,11 +1361,11 @@ endif()
- if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+@@ -1376,10 +1376,11 @@ install(DIRECTORY "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_b
+ 
+ if( DEM_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()
+-	set_property( SOURCE
++        set_source_files_properties(
++                common/rendering/polyrenderer/poly_all.cpp
++		rendering/swrenderer/r_all.cpp
+ 		common/utility/palette.cpp
+ 		common/utility/x86.cpp
+-		rendering/swrenderer/r_all.cpp
+ 		APPEND_STRING PROPERTY COMPILE_FLAGS " ${SSE2_ENABLE}" )
  endif()
+ 
 diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
-index f2a2987..b8de208 100644
+index 5d7be22..1a0a506 100644
 --- a/src/common/utility/palette.cpp
 +++ b/src/common/utility/palette.cpp
 @@ -33,6 +33,8 @@
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 <coelckers@users.noreply.github.com>
-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..2e29633ac6e0 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,21 +1,20 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.7.1
-revision=2
-_tagdate=2021-10-20
+version=4.10.0
+revision=1
 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 <ericonr@disroot.org>"
 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
 
@@ -39,15 +38,6 @@ post_extract() {
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 }
 
-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/"|' \
-		-i src/common/platform/posix/i_system.h
-	vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
-}
-
 post_install() {
 	vmkdir usr/share/licenses
 	mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}

Re: gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

New comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#issuecomment-1596185795

Comment:
So the i686 patch doesn't seem to work. If anyone has a suggestion, feel free to bring one !

Re: gzdoom: update to version 4.10.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#issuecomment-1615945769

Comment:
```patch
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -21,6 +21,7 @@ nocross=yes
 CXXFLAGS=-std=gnu++11
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
+       CFLAGS="-D_7ZIP_AFFINITY_DISABLE"
        makedepends+=" musl-fts-devel libexecinfo-devel"
 fi
 ```
should fix musl

Re: [PR REVIEW] gzdoom: update to version 4.10.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#discussion_r1248867050

Comment:
```suggestion
-		APPEND_STRING PROPERTY COMPILE_FLAGS " ${SSE2_ENABLE}" )
+ 		APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mfpmath=sse" )
```

Re: [PR PATCH] [Updated] gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-gzdoom
https://github.com/void-linux/void-packages/pull/44504

gzdoom: update to version 4.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR:

- Remade the i686 patch as it was broken after updating.
- Removed the sdl patch as it's already applied in the gzdoom repo ( see [sdlglvideo.cpp](https://github.com/ZDoom/gzdoom/blob/c675d60bacefd9c6651b8006f799f7bb55d0870b/src/common/platform/posix/sdl/sdlglvideo.cpp#L246) )
- Removed the vsed lines post-patch as gitinfo.cpp has been removed since [release 4.9.0](https://github.com/ZDoom/gzdoom/releases/tag/g4.9.0), also removed the leftover variable "tagdate".
- Added `libvpx-devel` as a make dependency as it doesn't build otherwise.



A patch file from https://github.com/void-linux/void-packages/pull/44504.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gzdoom-44504.patch --]
[-- Type: text/x-diff, Size: 5889 bytes --]

From 0928480b849f958e359a919b5394881986980719 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Sun, 2 Jul 2023 08:08:45 +0000
Subject: [PATCH] gzdoom: update to version 4.10.0.

---
 srcpkgs/gzdoom/patches/fix-i686.patch    | 29 +++++++++++-----------
 srcpkgs/gzdoom/patches/sdl-version.patch | 24 ------------------
 srcpkgs/gzdoom/template                  | 31 +++++++++---------------
 3 files changed, 25 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/sdl-version.patch

diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
index 14914b3a5a51..19f2807622dc 100644
--- a/srcpkgs/gzdoom/patches/fix-i686.patch
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -1,24 +1,23 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 26c617e..e162638 100644
+index 911e35d..813858e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -1361,11 +1361,11 @@ endif()
- if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+@@ -1376,10 +1376,11 @@ install(DIRECTORY "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_b
+ 
+ if( DEM_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()
+-	set_property( SOURCE
++        set_source_files_properties(
++                common/rendering/polyrenderer/poly_all.cpp
++		rendering/swrenderer/r_all.cpp
+ 		common/utility/palette.cpp
+ 		common/utility/x86.cpp
+-               rendering/swrenderer/r_all.cpp                
+ 		APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mfpmath=sse" )
  endif()
+ 
 diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
-index f2a2987..b8de208 100644
+index 5d7be22..1a0a506 100644
 --- a/src/common/utility/palette.cpp
 +++ b/src/common/utility/palette.cpp
 @@ -33,6 +33,8 @@
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 <coelckers@users.noreply.github.com>
-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..11285430c2dc 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,21 +1,20 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.7.1
-revision=2
-_tagdate=2021-10-20
+version=4.10.0
+revision=1
 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 <ericonr@disroot.org>"
 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
 
@@ -25,9 +24,10 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel libexecinfo-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
-esac
+#commited by classabbyamp
+#case "$XBPS_TARGET_MACHINE" in
+#	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
+#esac
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
@@ -39,15 +39,6 @@ post_extract() {
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 }
 
-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/"|' \
-		-i src/common/platform/posix/i_system.h
-	vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
-}
-
 post_install() {
 	vmkdir usr/share/licenses
 	mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}

Re: [PR REVIEW] gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 341 bytes --]

New review comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#discussion_r1249343667

Comment:
Alright, i make a little test with what you sent, thanks again !

If everything works out, i'm gonna re-edit the template to remove the comments and re-commit. It's currently just a test.

Re: [PR REVIEW] gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New review comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#discussion_r1249351249

Comment:
alright i'm aware some things went wrong here, but i'm doing another test, this one it should be good.

Re: [PR PATCH] [Updated] gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-gzdoom
https://github.com/void-linux/void-packages/pull/44504

gzdoom: update to version 4.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR:

- Remade the i686 patch as it was broken after updating.
- Removed the sdl patch as it's already applied in the gzdoom repo ( see [sdlglvideo.cpp](https://github.com/ZDoom/gzdoom/blob/c675d60bacefd9c6651b8006f799f7bb55d0870b/src/common/platform/posix/sdl/sdlglvideo.cpp#L246) )
- Removed the vsed lines post-patch as gitinfo.cpp has been removed since [release 4.9.0](https://github.com/ZDoom/gzdoom/releases/tag/g4.9.0), also removed the leftover variable "tagdate".
- Added `libvpx-devel` as a make dependency as it doesn't build otherwise.



A patch file from https://github.com/void-linux/void-packages/pull/44504.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gzdoom-44504.patch --]
[-- Type: text/x-diff, Size: 5893 bytes --]

From 76d3f8389b52c4ec31f35125d40f4a777124a158 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Sun, 2 Jul 2023 08:30:56 +0000
Subject: [PATCH] gzdoom: update to version 4.10.0.

---
 srcpkgs/gzdoom/patches/fix-i686.patch    | 31 ++++++++++++------------
 srcpkgs/gzdoom/patches/sdl-version.patch | 24 ------------------
 srcpkgs/gzdoom/template                  | 28 ++++++---------------
 3 files changed, 23 insertions(+), 60 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/sdl-version.patch

diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
index 14914b3a5a51..524683f1adf6 100644
--- a/srcpkgs/gzdoom/patches/fix-i686.patch
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -1,24 +1,25 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 26c617e..e162638 100644
+index 911e35d..a301dbc 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -1361,11 +1361,11 @@ endif()
- if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+@@ -1376,11 +1376,12 @@ install(DIRECTORY "${PROJECT_BINARY_DIR}/soundfonts" "${PROJECT_BINARY_DIR}/fm_b
+ 
+ if( DEM_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()
+-	set_property( SOURCE
++        set_source_files_properties(
++          common/rendering/polyrenderer/poly_all.cpp
++          rendering/swrenderer/r_all.cpp
+ 		common/utility/palette.cpp
+ 		common/utility/x86.cpp
+-		rendering/swrenderer/r_all.cpp
+-		APPEND_STRING PROPERTY COMPILE_FLAGS " ${SSE2_ENABLE}" )
++                APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mfpmath=sse" )
  endif()
+ 
+ if( APPLE )
 diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
-index f2a2987..b8de208 100644
+index 5d7be22..1a0a506 100644
 --- a/src/common/utility/palette.cpp
 +++ b/src/common/utility/palette.cpp
 @@ -33,6 +33,8 @@
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 <coelckers@users.noreply.github.com>
-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..80e35ed8c959 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,21 +1,20 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.7.1
-revision=2
-_tagdate=2021-10-20
+version=4.10.0
+revision=1
 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 <ericonr@disroot.org>"
 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
 
@@ -25,10 +24,6 @@ if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	makedepends+=" musl-fts-devel libexecinfo-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
-esac
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
@@ -39,15 +34,6 @@ post_extract() {
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 }
 
-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/"|' \
-		-i src/common/platform/posix/i_system.h
-	vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
-}
-
 post_install() {
 	vmkdir usr/share/licenses
 	mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}

Re: [PR REVIEW] gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New review comment by SpidFightFR on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#discussion_r1249362287

Comment:
damn... i really hoped it would work... :(

Re: gzdoom: update to version 4.10.0.

[Jjp137]

[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]

New comment by Jjp137 on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#issuecomment-1619183112

Comment:
> but it seems that they no longer want to support i686

Yeah, as someone casually following the Doom community, that has been the plan for some time. I usually just watch this repo occasionally from afar since I started trying out Void Linux on my laptop, but as a GZDoom user (albeit in another distro), I saw this PR and I wanted to give some more context.

In particular, see this commit and the comments below it: https://github.com/ZDoom/gzdoom/commit/8c244f6f850eeb5a5dede7f887f3f1ba87b3d8bc

A few years ago, there was a thread about 32-bit support here in which many users think that 32-bit is dead: https://forum.zdoom.org/viewtopic.php?p=1134388

Thus, if one uses a 32-bit build of GZDoom and problems happen, they should not expect support from upstream. The hardware requirements for GZDoom have always been steadily increasing throughout the years (one notable example is dropping OpenGL 2.1 support many years ago), and this is just another example of it.

Re: [PR REVIEW] gzdoom: update to version 4.10.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#discussion_r1251303663

Comment:
add `CFLAGS="-D_7ZIP_AFFINITY_DISABLE"` here

Re: [PR REVIEW] gzdoom: update to version 4.10.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#discussion_r1251305468

Comment:
add `archs="~i686* ~arm*"`

Re: [PR REVIEW] gzdoom: update to version 4.10.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/44504#discussion_r1251303222

Comment:
remove this patch

Re: [PR PATCH] [Updated] gzdoom: update to version 4.10.0.

[SpidFightFR]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

There is an updated pull request by SpidFightFR against master on the void-packages repository

https://github.com/SpidFightFR/void-packages update-gzdoom
https://github.com/void-linux/void-packages/pull/44504

gzdoom: update to version 4.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR:

- Remade the i686 patch as it was broken after updating.
- Removed the sdl patch as it's already applied in the gzdoom repo ( see [sdlglvideo.cpp](https://github.com/ZDoom/gzdoom/blob/c675d60bacefd9c6651b8006f799f7bb55d0870b/src/common/platform/posix/sdl/sdlglvideo.cpp#L246) )
- Removed the vsed lines post-patch as gitinfo.cpp has been removed since [release 4.9.0](https://github.com/ZDoom/gzdoom/releases/tag/g4.9.0), also removed the leftover variable "tagdate".
- Added `libvpx-devel` as a make dependency as it doesn't build otherwise.



A patch file from https://github.com/void-linux/void-packages/pull/44504.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-gzdoom-44504.patch --]
[-- Type: text/x-diff, Size: 5511 bytes --]

From 4da1590e5a2056e3b91cb67a33d7e5bfc3e91561 Mon Sep 17 00:00:00 2001
From: SpidFightFR <spidfight.one@gmail.com>
Date: Tue, 4 Jul 2023 15:06:52 +0000
Subject: [PATCH] gzdoom: update to version 4.10.0.

---
 srcpkgs/gzdoom/patches/fix-i686.patch    | 32 ------------------------
 srcpkgs/gzdoom/patches/sdl-version.patch | 24 ------------------
 srcpkgs/gzdoom/template                  | 30 +++++++---------------
 3 files changed, 9 insertions(+), 77 deletions(-)
 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-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 <algorithm>
-+#include <cfloat>
-+#include <cmath>
- #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 <coelckers@users.noreply.github.com>
-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..781616f36a93 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,34 +1,31 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.7.1
-revision=2
-_tagdate=2021-10-20
+version=4.10.0
+revision=1
+archs="~i686* ~arm*"
 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 <ericonr@disroot.org>"
 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
 
 CXXFLAGS=-std=gnu++11
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	CFLAGS="-D_7ZIP_AFFINITY_DISABLE"
 	makedepends+=" musl-fts-devel libexecinfo-devel"
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	i686*) configure_args+=" -DSSE_MATTERS=true" ;;
-esac
-
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
@@ -39,15 +36,6 @@ post_extract() {
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 }
 
-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/"|' \
-		-i src/common/platform/posix/i_system.h
-	vsed -e 's|/usr/share/games/doom|/usr/share/gzdoom|g' -i src/gameconfigfile.cpp
-}
-
 post_install() {
 	vmkdir usr/share/licenses
 	mv ${PKGDESTDIR}/usr/share/{doc/gzdoom/licenses,licenses/${pkgname}}

Re: [PR PATCH] [Merged]: gzdoom: update to version 4.10.0.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1008 bytes --]

There's a merged pull request on the void-packages repository

gzdoom: update to version 4.10.0.
https://github.com/void-linux/void-packages/pull/44504

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)


#### Additional notes for the PR:

- Remade the i686 patch as it was broken after updating.
- Removed the sdl patch as it's already applied in the gzdoom repo ( see [sdlglvideo.cpp](https://github.com/ZDoom/gzdoom/blob/c675d60bacefd9c6651b8006f799f7bb55d0870b/src/common/platform/posix/sdl/sdlglvideo.cpp#L246) )
- Removed the vsed lines post-patch as gitinfo.cpp has been removed since [release 4.9.0](https://github.com/ZDoom/gzdoom/releases/tag/g4.9.0), also removed the leftover variable "tagdate".
- Added `libvpx-devel` as a make dependency as it doesn't build otherwise.