[PR PATCH] gzdoom 4.5.0

[PR PATCH] gzdoom 4.5.0

[ericonr]

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

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

https://github.com/ericonr/void-packages gzdoom
https://github.com/void-linux/void-packages/pull/30481

gzdoom 4.5.0
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 0c758803c998e206f92bd37953573cd066572e50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Apr 2021 01:29:15 -0300
Subject: [PATCH 1/2] ZMusic: stop dlopening deps.

Force it to link against libfluidsynth and libsndfile (which fixes a
bug, because it only tried dlopening libfluidsynth.so.{1,2} and we ship .3).

Also add mpg123 as a bonus and remove the unused openal (not mentioned
at all) and gme (their version fixes bugs still present in upstream)
deps.
---
 srcpkgs/ZMusic/template | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
index 3eb79a261c03..5d630d1aa3f5 100644
--- a/srcpkgs/ZMusic/template
+++ b/srcpkgs/ZMusic/template
@@ -1,13 +1,11 @@
 # Template file for 'ZMusic'
 pkgname=ZMusic
 version=1.1.6
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+configure_args="-DDYN_SNDFILE=OFF -DDYN_FLUIDSYNTH=OFF -DDYN_MPG123=OFF"
 hostmakedepends="pkg-config"
-makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
-# these are dlopened
-depends="libfluidsynth libopenal libsndfile"
+makedepends="zlib-devel alsa-lib-devel libsndfile-devel fluidsynth-devel mpg123-devel"
 short_desc="GZDoom's music system"
 maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"

From 0f9ab08e2bca34221d1153253f22833b13dd0bb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Sun, 25 Apr 2021 01:36:09 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.5.0, adopt.

Force linking to gtk and openal instead of dlopening.
Clean up unused deps.

Thanks nbm for initial update diff and prompting.
---
 srcpkgs/gzdoom/template | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 8ee85e031747..ce1204db0d01 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,23 +1,25 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.4.2
+version=4.5.0
 revision=1
-_tagdate=2020-06-16
+_tagdate=2021-10-31
+_widepix_commit=f4bb3541edd570cbccb58e5cdaba3dc0979208b9
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
-configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
+configure_args="-DINSTALL_PK3_PATH=share/gzdoom -DDYN_GTK=OFF -DDYN_OPENAL=OFF"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
- ppl-devel ZMusic-devel"
-depends="gtk+3"
+makedepends="SDL2-devel gtk+3-devel libgomp-devel ZMusic-devel libopenal-devel"
 short_desc="Advanced Doom source port with OpenGL support"
-maintainer="Michael Straube <straubem@gmx.de>"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.zdoom.org"
-distfiles="https://github.com/coelckers/${pkgname}/archive/g${version}.tar.gz
- https://github.com/coelckers/${pkgname}/releases/download/g${version}/${pkgname}_${version}_amd64.deb"
-checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
- ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
+# 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
+ https://github.com/nashmuhandes/WidePix/archive/${_widepix_commit}.tar.gz"
+checksum="21eb1a221dae532a6c29f243584be3d5454f8eb4da85a67e405115f89666611d
+ 2f07795728940fca07aa9771d5a8bb77f7764862b96cc5a4126a5b8db7a357b8
+ e0b85ca089a3714968f56acc9525f352dbec14f15e88e0aef1cdece64c4f3cbf"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
@@ -33,6 +35,11 @@ post_extract() {
 	bsdtar xOf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
+	rmdir wadsrc_widescreen/static
+	mv ../WidePix-${_widepix_commit} wadsrc_widescreen/static
+}
+
+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

Re: [PR PATCH] [Merged]: gzdoom 4.5.0

[ericonr]

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

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

gzdoom 4.5.0
https://github.com/void-linux/void-packages/pull/30481

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->