* [PR PATCH] gzdoom: update to 4.10.0
@ 2022-12-29 18:06 LittleAmpton
2023-01-07 20:07 ` [PR REVIEW] " abenson
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: LittleAmpton @ 2022-12-29 18:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
There is a new pull request by LittleAmpton against master on the void-packages repository
https://github.com/LittleAmpton/void-packages gzdoom4.10.0
https://github.com/void-linux/void-packages/pull/41350
gzdoom: update to 4.10.0
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture (ARCH-LIBC)
A patch file from https://github.com/void-linux/void-packages/pull/41350.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gzdoom4.10.0-41350.patch --]
[-- Type: text/x-diff, Size: 6097 bytes --]
From 3e9c9ff757b85c247422003f939727cee96ced60 Mon Sep 17 00:00:00 2001
From: LittleAmpton <troblin1@gmail.com>
Date: Thu, 29 Dec 2022 18:42:43 +0100
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 | 26 +++++++++----------
4 files changed, 13 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 <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..1004a236de90 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=3
+_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 <ericonr@disroot.org>"
+maintainer="LittleAmpton <troblin1@gmail.com>"
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="not easily cross-compilable - requires files from native build"
CXXFLAGS=-std=gnu++11
@@ -40,9 +40,9 @@ 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|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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] gzdoom: update to 4.10.0
2022-12-29 18:06 [PR PATCH] gzdoom: update to 4.10.0 LittleAmpton
@ 2023-01-07 20:07 ` abenson
2023-01-07 20:09 ` abenson
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2023-01-07 20:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
New review comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/41350#discussion_r1064041928
Comment:
Reset to 1.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR REVIEW] gzdoom: update to 4.10.0
2022-12-29 18:06 [PR PATCH] gzdoom: update to 4.10.0 LittleAmpton
2023-01-07 20:07 ` [PR REVIEW] " abenson
@ 2023-01-07 20:09 ` abenson
2023-04-08 1:48 ` github-actions
2023-04-22 1:53 ` [PR PATCH] [Closed]: " github-actions
3 siblings, 0 replies; 7+ messages in thread
From: abenson @ 2023-01-07 20:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by abenson on void-packages repository
https://github.com/void-linux/void-packages/pull/41350#discussion_r1064042057
Comment:
Double check with the maintainer before adopting. @ericonr
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: gzdoom: update to 4.10.0
2022-12-29 18:06 [PR PATCH] gzdoom: update to 4.10.0 LittleAmpton
2023-01-07 20:07 ` [PR REVIEW] " abenson
2023-01-07 20:09 ` abenson
@ 2023-04-08 1:48 ` github-actions
2023-04-22 1:53 ` [PR PATCH] [Closed]: " github-actions
3 siblings, 0 replies; 7+ messages in thread
From: github-actions @ 2023-04-08 1:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/41350#issuecomment-1500758744
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: gzdoom: update to 4.10.0
2022-12-29 18:06 [PR PATCH] gzdoom: update to 4.10.0 LittleAmpton
` (2 preceding siblings ...)
2023-04-08 1:48 ` github-actions
@ 2023-04-22 1:53 ` github-actions
3 siblings, 0 replies; 7+ messages in thread
From: github-actions @ 2023-04-22 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
There's a closed pull request on the void-packages repository
gzdoom: update to 4.10.0
https://github.com/void-linux/void-packages/pull/41350
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture (ARCH-LIBC)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PR PATCH] gzdoom: update to 4.10.0.
@ 2023-05-20 12:02 SpidFightFR
0 siblings, 0 replies; 7+ messages in thread
From: SpidFightFR @ 2023-05-20 12:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 798 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/43960
gzdoom: update to 4.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
**Warning**: Crossbuild seems to require patches, in order to make gzdoom compilable on my architecture, i **removed them**, and i set a `nocross` setting in the template. A bit of help would be welcomed on that side !
A patch file from https://github.com/void-linux/void-packages/pull/43960.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_gzdoom-43960.patch --]
[-- Type: text/x-diff, Size: 6134 bytes --]
From 2b89f637a6dbd5b585d078dab280bf173179d1ab Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
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 <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..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 <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
+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
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PR PATCH] gzdoom: update to 4.10.0.
@ 2023-05-20 11:37 SpidFightFR
0 siblings, 0 replies; 7+ messages in thread
From: SpidFightFR @ 2023-05-20 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 802 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/43959
gzdoom: update to 4.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64-GlibC)
**Warning**: Crossbuild seems to require patches, in order to make gzdoom compilable on my architecture, i **removed them**, and i set a `nocross` setting in the template. A bit of help would be welcomed on that side !
A patch file from https://github.com/void-linux/void-packages/pull/43959.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_gzdoom-43959.patch --]
[-- Type: text/x-diff, Size: 6969 bytes --]
From fe68b34138e6dd654d8e23c87f57d5edeeaeff64 Mon Sep 17 00:00:00 2001
From: SpidFightFR <vincent.bardot@outlook.fr>
Date: Sat, 20 May 2023 09:45:15 +0000
Subject: [PATCH] gzdoom: update to 4.10.0.
---
srcpkgs/ZMusic/template | 4 +--
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 ++++++++++----------
5 files changed, 16 insertions(+), 84 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/ZMusic/template b/srcpkgs/ZMusic/template
index 8a66744e49cd..8496f8f9cd35 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,6 +1,6 @@
# Template file for 'ZMusic'
pkgname=ZMusic
-version=1.1.10
+version=1.1.12
revision=1
build_style=cmake
configure_args="-DDYN_SNDFILE=OFF -DDYN_FLUIDSYNTH=OFF -DDYN_MPG123=OFF"
@@ -11,7 +11,7 @@ maintainer="Érico Nogueira <ericonr@disroot.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/coelckers/ZMusic"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=378435b35f02a3123ee9e01b5e7990017f9bc1244b788e3bf54b37b34a2985ba
+checksum=da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
if [ "$XBPS_TARGET_LIBC" = musl ]; then
makedepends+=" musl-fts-devel"
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 <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..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 <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
+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
}
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-05-20 12:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-29 18:06 [PR PATCH] gzdoom: update to 4.10.0 LittleAmpton
2023-01-07 20:07 ` [PR REVIEW] " abenson
2023-01-07 20:09 ` abenson
2023-04-08 1:48 ` github-actions
2023-04-22 1:53 ` [PR PATCH] [Closed]: " github-actions
2023-05-20 11:37 [PR PATCH] " SpidFightFR
2023-05-20 12:02 SpidFightFR
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).