Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] gzdoom: fix depends for audio support.
@ 2020-08-09  5:03 ericonr
  2020-08-09  5:19 ` [PR REVIEW] " fosslinux
                   ` (20 more replies)
  0 siblings, 21 replies; 22+ messages in thread
From: ericonr @ 2020-08-09  5:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 465 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From 0c4281bc7a481d659386c8415b50bec0ad768198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH] gzdoom: fix depends for audio support.

GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665
---
 srcpkgs/gzdoom/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..018fe3054ab 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,14 +1,15 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
 version=4.3.3
-revision=1
+revision=2
 _tagdate=2019-07-09
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel libopenal-devel libsndfile-devel"
+depends="libfluidsynth gtk+3 libopenal libsndfile"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 license="GPL-3.0-or-later"

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
@ 2020-08-09  5:19 ` fosslinux
  2020-08-09  5:22 ` ericonr
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: fosslinux @ 2020-08-09  5:19 UTC (permalink / raw)
  To: ml

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

New review comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#discussion_r467538069

Comment:
Huh, are all of these not auto-detected?

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
  2020-08-09  5:19 ` [PR REVIEW] " fosslinux
@ 2020-08-09  5:22 ` ericonr
  2020-08-09  5:30 ` ericonr
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-09  5:22 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#discussion_r467538264

Comment:
No, but I'm also not sure this PR should be open. I get sound with the old version as well.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
  2020-08-09  5:19 ` [PR REVIEW] " fosslinux
  2020-08-09  5:22 ` ericonr
@ 2020-08-09  5:30 ` ericonr
  2020-08-09  5:43 ` ericonr
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-09  5:30 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#discussion_r467538932

Comment:
So, removing `libopenal` from the system makes sound stop working, but it doesn't seem to matter if it's included in the build. I hate dlopen'd stuff.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (2 preceding siblings ...)
  2020-08-09  5:30 ` ericonr
@ 2020-08-09  5:43 ` ericonr
  2020-08-10 12:13 ` ericonr
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-09  5:43 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#discussion_r467539918

Comment:
Yeah, it's some stupid-ass dlopen thing. Since this is an [upstream recommendation](https://zdoom.org/wiki/Compile_GZDoom_on_Linux#Install_dependencies), I will leave them there.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (3 preceding siblings ...)
  2020-08-09  5:43 ` ericonr
@ 2020-08-10 12:13 ` ericonr
  2020-08-10 12:40 ` ericonr
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-10 12:13 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#issuecomment-671318703

Comment:
There's an update for gzdoom, so I'm gonna include that here.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (4 preceding siblings ...)
  2020-08-10 12:13 ` ericonr
@ 2020-08-10 12:40 ` ericonr
  2020-08-10 12:42 ` [PR PATCH] [Updated] " ericonr
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-10 12:40 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#issuecomment-671318703

Comment:
There's an update for gzdoom, so I'm gonna include that here.

--

Requires adding https://github.com/coelckers/ZMusic to the repo and patching it appropriately. Will do later.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (5 preceding siblings ...)
  2020-08-10 12:40 ` ericonr
@ 2020-08-10 12:42 ` ericonr
  2020-08-16 12:23 ` [PR REVIEW] " Piraty
                   ` (13 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-10 12:42 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From fcf79f617a596b1426042382fb493077466e1081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH] gzdoom: update to 4.4.2, fix depends for audio.

GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665
---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -------------------
 srcpkgs/gzdoom/template                       | 16 +++++++-------
 2 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..945931c3b75 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,22 +1,23 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel libopenal-devel libsndfile-devel"
+depends="libfluidsynth gtk+3 libopenal libsndfile"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
@@ -34,7 +35,8 @@ post_extract() {
 	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
 	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
 	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
+	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' \
+		src/common/platform/posix/i_system.h
 	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
 }
 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (6 preceding siblings ...)
  2020-08-10 12:42 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-16 12:23 ` Piraty
  2020-08-30 20:30 ` [PR PATCH] [Updated] " ericonr
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Piraty @ 2020-08-16 12:23 UTC (permalink / raw)
  To: ml

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

New review comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#discussion_r471106640

Comment:
please vsed

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (7 preceding siblings ...)
  2020-08-16 12:23 ` [PR REVIEW] " Piraty
@ 2020-08-30 20:30 ` ericonr
  2020-08-30 20:31 ` [PR REVIEW] " ericonr
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-30 20:30 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From 77a5de43061bf065da1d4c24f9b9f5b951352b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 1/2] New package: ZMusic-1.1.2.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                           |  2 ++
 srcpkgs/ZMusic-devel                    |  1 +
 srcpkgs/ZMusic/patches/system-gme.patch | 24 +++++++++++++++++
 srcpkgs/ZMusic/template                 | 34 +++++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/system-gme.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..8449555d7d1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3988,3 +3988,5 @@ libaml.so.0 aml-0.1.0_1
 libneatvnc.so.0 neatvnc-0.2.0_1
 libtdjson.so.1.6.0 libtd-1.6.0_1
 libJudy.so.1 judy-1.0.5_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/system-gme.patch b/srcpkgs/ZMusic/patches/system-gme.patch
new file mode 100644
index 00000000000..ed42fbcfbec
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/system-gme.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f09423d..468b06f 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -195,18 +195,7 @@ else()
+ 	set( ZLIB_LIBRARY z )
+ endif()
+ 
+-
+-if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
+-	message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+-else()
+-	message( STATUS "Using internal gme library" )
+-	# Use MAME as it's a balanced emulator: well-accurate, but doesn't eats lot of CPU
+-	# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
+-	set( GME_YM2612_EMU "MAME" )
+-	add_subdirectory( thirdparty/game-music-emu )
+-	set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/game-music-emu" )
+-	set( GME_LIBRARIES gme )
+-endif()
++message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+ 
+ set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/adlmidi" )
+ set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/opnmidi" )
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..ee6875c385e
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,34 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel"
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+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=951940fe63ee386fdea044f2543c7460977921ce3e60d282b87be81546078e07
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 69138e70cf574a376028bfd177c33a047015e25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 33 +++++++++--------
 4 files changed, 16 insertions(+), 86 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..6d78aaf0264 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,40 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel libopenal-devel libsndfile-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	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() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR REVIEW] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (8 preceding siblings ...)
  2020-08-30 20:30 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-30 20:31 ` ericonr
  2020-08-30 20:32 ` [PR PATCH] [Updated] " ericonr
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-30 20:31 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#discussion_r479812488

Comment:
Done!

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (9 preceding siblings ...)
  2020-08-30 20:31 ` [PR REVIEW] " ericonr
@ 2020-08-30 20:32 ` ericonr
  2020-08-30 20:32 ` ericonr
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-30 20:32 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From 5b39ec1de29e7072890ef1b990422671a9e6f704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 1/2] New package: ZMusic-1.1.2.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                           |  2 ++
 srcpkgs/ZMusic-devel                    |  1 +
 srcpkgs/ZMusic/patches/system-gme.patch | 24 +++++++++++++++++
 srcpkgs/ZMusic/template                 | 34 +++++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/system-gme.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..688a5c69399 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,6 +2977,8 @@ libpisync.so.1 pilot-link-0.12.5_1
 libpitcl.so.0 pilot-link-0.12.5_1
 libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
 libsidplayfp.so.5 libsidplayfp-2.0.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/system-gme.patch b/srcpkgs/ZMusic/patches/system-gme.patch
new file mode 100644
index 00000000000..ed42fbcfbec
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/system-gme.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f09423d..468b06f 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -195,18 +195,7 @@ else()
+ 	set( ZLIB_LIBRARY z )
+ endif()
+ 
+-
+-if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
+-	message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+-else()
+-	message( STATUS "Using internal gme library" )
+-	# Use MAME as it's a balanced emulator: well-accurate, but doesn't eats lot of CPU
+-	# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
+-	set( GME_YM2612_EMU "MAME" )
+-	add_subdirectory( thirdparty/game-music-emu )
+-	set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/game-music-emu" )
+-	set( GME_LIBRARIES gme )
+-endif()
++message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+ 
+ set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/adlmidi" )
+ set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/opnmidi" )
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..ee6875c385e
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,34 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel"
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+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=951940fe63ee386fdea044f2543c7460977921ce3e60d282b87be81546078e07
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From a85a79376f6178d56a74de370762aa8388ed1449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 33 +++++++++--------
 4 files changed, 16 insertions(+), 86 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..6d78aaf0264 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,40 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel libopenal-devel libsndfile-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	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() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (10 preceding siblings ...)
  2020-08-30 20:32 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-30 20:32 ` ericonr
  2020-08-30 20:34 ` [PR PATCH] [Updated] " ericonr
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-30 20:32 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#issuecomment-683467235

Comment:
Updated and now using ZMusic. Should be good to be reviewed, now.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (11 preceding siblings ...)
  2020-08-30 20:32 ` ericonr
@ 2020-08-30 20:34 ` ericonr
  2020-08-30 20:38 ` ericonr
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-30 20:34 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From e9e47f04979aaa0b2d73550ab4403d0d2f57327e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 1/2] New package: ZMusic-1.1.2.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                           |  2 ++
 srcpkgs/ZMusic-devel                    |  1 +
 srcpkgs/ZMusic/patches/system-gme.patch | 24 +++++++++++++++++
 srcpkgs/ZMusic/template                 | 34 +++++++++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/system-gme.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..688a5c69399 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,6 +2977,8 @@ libpisync.so.1 pilot-link-0.12.5_1
 libpitcl.so.0 pilot-link-0.12.5_1
 libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
 libsidplayfp.so.5 libsidplayfp-2.0.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/system-gme.patch b/srcpkgs/ZMusic/patches/system-gme.patch
new file mode 100644
index 00000000000..ed42fbcfbec
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/system-gme.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f09423d..468b06f 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -195,18 +195,7 @@ else()
+ 	set( ZLIB_LIBRARY z )
+ endif()
+ 
+-
+-if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
+-	message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+-else()
+-	message( STATUS "Using internal gme library" )
+-	# Use MAME as it's a balanced emulator: well-accurate, but doesn't eats lot of CPU
+-	# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
+-	set( GME_YM2612_EMU "MAME" )
+-	add_subdirectory( thirdparty/game-music-emu )
+-	set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/game-music-emu" )
+-	set( GME_LIBRARIES gme )
+-endif()
++message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+ 
+ set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/adlmidi" )
+ set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/opnmidi" )
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..3f627af6369
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,34 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+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=951940fe63ee386fdea044f2543c7460977921ce3e60d282b87be81546078e07
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 0be9d1679a4178e4f91ea3093d7e1fef106172bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 33 +++++++++--------
 4 files changed, 16 insertions(+), 86 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..2e2baa629a9 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,40 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	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() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (12 preceding siblings ...)
  2020-08-30 20:34 ` [PR PATCH] [Updated] " ericonr
@ 2020-08-30 20:38 ` ericonr
  2020-08-31 14:23 ` ericonr
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-30 20:38 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From d1c1ec5559d83606c0737f6190e58c947aa804d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 1/2] New package: ZMusic-1.1.2.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                           |  2 ++
 srcpkgs/ZMusic-devel                    |  1 +
 srcpkgs/ZMusic/patches/system-gme.patch | 24 +++++++++++++++++
 srcpkgs/ZMusic/template                 | 35 +++++++++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/system-gme.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..688a5c69399 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,6 +2977,8 @@ libpisync.so.1 pilot-link-0.12.5_1
 libpitcl.so.0 pilot-link-0.12.5_1
 libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
 libsidplayfp.so.5 libsidplayfp-2.0.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/system-gme.patch b/srcpkgs/ZMusic/patches/system-gme.patch
new file mode 100644
index 00000000000..ed42fbcfbec
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/system-gme.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f09423d..468b06f 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -195,18 +195,7 @@ else()
+ 	set( ZLIB_LIBRARY z )
+ endif()
+ 
+-
+-if( GME_FOUND AND NOT FORCE_INTERNAL_GME )
+-	message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+-else()
+-	message( STATUS "Using internal gme library" )
+-	# Use MAME as it's a balanced emulator: well-accurate, but doesn't eats lot of CPU
+-	# Nuked OPN2 is very accurate emulator, but it eats too much CPU for the workflow
+-	set( GME_YM2612_EMU "MAME" )
+-	add_subdirectory( thirdparty/game-music-emu )
+-	set( GME_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/game-music-emu" )
+-	set( GME_LIBRARIES gme )
+-endif()
++message( STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIR}" )
+ 
+ set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/adlmidi" )
+ set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/opnmidi" )
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..e8a5923da53
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,35 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+# these are dlopened
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+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=951940fe63ee386fdea044f2543c7460977921ce3e60d282b87be81546078e07
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 2008759ba251c4433c2bf3d6561a98814729e6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 33 +++++++++--------
 4 files changed, 16 insertions(+), 86 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..2e2baa629a9 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,40 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	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() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (13 preceding siblings ...)
  2020-08-30 20:38 ` ericonr
@ 2020-08-31 14:23 ` ericonr
  2020-08-31 15:00 ` [PR PATCH] [Updated] " ericonr
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-31 14:23 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#issuecomment-683810962

Comment:
Gotta fix i686 and upstream doesn't recommend using system gme, actually.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (14 preceding siblings ...)
  2020-08-31 14:23 ` ericonr
@ 2020-08-31 15:00 ` ericonr
  2020-09-01  0:07 ` ericonr
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-31 15:00 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From 37d2a7e22e64d9b7b37c882d8108646d6b5ff717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 1/2] New package: ZMusic-1.1.2.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                         |  2 ++
 srcpkgs/ZMusic-devel                  |  1 +
 srcpkgs/ZMusic/patches/ppc-musl.patch | 13 ++++++++++
 srcpkgs/ZMusic/template               | 35 +++++++++++++++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/ppc-musl.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index a6b5737b845..688a5c69399 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2977,6 +2977,8 @@ libpisync.so.1 pilot-link-0.12.5_1
 libpitcl.so.0 pilot-link-0.12.5_1
 libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
 libsidplayfp.so.5 libsidplayfp-2.0.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/ppc-musl.patch b/srcpkgs/ZMusic/patches/ppc-musl.patch
new file mode 100644
index 00000000000..729b73b155d
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/ppc-musl.patch
@@ -0,0 +1,13 @@
+Taken from libgme package.
+
+--- thirdparty/game-music-emu/gme/blargg_endian.h
++++ thirdparty/game-music-emu/gme/blargg_endian.h
+@@ -36,7 +36,7 @@
+ #endif
+
+ #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+-	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
++	defined (__sparc__)     || \
+ 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+ 	#define BLARGG_BIG_ENDIAN 1
+ #elif !defined (__mips__)
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..e8a5923da53
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,35 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+# these are dlopened
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+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=951940fe63ee386fdea044f2543c7460977921ce3e60d282b87be81546078e07
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 54d48b06988a473683d336f5c561b996338b4ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 33 +++++++++--------
 4 files changed, 16 insertions(+), 86 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..2e2baa629a9 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,40 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
-esac
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel libexecinfo-devel"
+fi
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	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() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (15 preceding siblings ...)
  2020-08-31 15:00 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-01  0:07 ` ericonr
  2020-10-22 18:32 ` [PR PATCH] [Updated] " ericonr
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-09-01  0:07 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#issuecomment-684112323

Comment:
If anyone could help me out, I have no idea how to fix the i686 issue. Somewhere around https://github.com/coelckers/gzdoom/blob/g4.4.2/src/CMakeLists.txt the flags to enable SSE aren't being passed.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: fix depends for audio support.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (16 preceding siblings ...)
  2020-09-01  0:07 ` ericonr
@ 2020-10-22 18:32 ` ericonr
  2020-10-22 18:38 ` gzdoom: update to 4.4.2 ericonr
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-10-22 18:32 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: fix depends for audio support.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From 73e2456e0d4ccd4ec3037cefb655abba9d0aad5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 1/2] New package: ZMusic-1.1.2.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                         |  2 ++
 srcpkgs/ZMusic-devel                  |  1 +
 srcpkgs/ZMusic/patches/ppc-musl.patch | 13 ++++++++++
 srcpkgs/ZMusic/template               | 35 +++++++++++++++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/ppc-musl.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index 671d6d44ee0..1658b9f128c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2974,6 +2974,8 @@ libpisync.so.1 pilot-link-0.12.5_1
 libpitcl.so.0 pilot-link-0.12.5_1
 libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
 libsidplayfp.so.5 libsidplayfp-2.0.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/ppc-musl.patch b/srcpkgs/ZMusic/patches/ppc-musl.patch
new file mode 100644
index 00000000000..729b73b155d
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/ppc-musl.patch
@@ -0,0 +1,13 @@
+Taken from libgme package.
+
+--- thirdparty/game-music-emu/gme/blargg_endian.h
++++ thirdparty/game-music-emu/gme/blargg_endian.h
+@@ -36,7 +36,7 @@
+ #endif
+
+ #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+-	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
++	defined (__sparc__)     || \
+ 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+ 	#define BLARGG_BIG_ENDIAN 1
+ #elif !defined (__mips__)
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..e8a5923da53
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,35 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.2
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+# these are dlopened
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+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=951940fe63ee386fdea044f2543c7460977921ce3e60d282b87be81546078e07
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From fda34b51f5a18294bc207f3a31e76db57a2d7413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/fix-i686.patch         | 32 +++++++++++++++++
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 35 ++++++++++---------
 5 files changed, 51 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 create mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
new file mode 100644
index 00000000000..b66d70db512
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 26c617e..e162638 100644
+--- src/CMakeLists.txt
++++ 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
+--- src/common/utility/palette.cpp
++++ 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/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..bc644c1e3f2 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,44 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
+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
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	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() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: gzdoom: update to 4.4.2.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (17 preceding siblings ...)
  2020-10-22 18:32 ` [PR PATCH] [Updated] " ericonr
@ 2020-10-22 18:38 ` ericonr
  2020-10-23  5:12 ` [PR PATCH] [Updated] " ericonr
  2020-11-22  5:08 ` [PR PATCH] [Merged]: " the-maldridge
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-10-22 18:38 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/24149#issuecomment-714684451

Comment:
The flag to disable SSE2 from https://forum.zdoom.org/viewtopic.php?f=50&t=67433&p=1137416&hilit=mmx#p1137416 didn't work, so `gzdoom` now requires SSE2 on i686.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Updated] gzdoom: update to 4.4.2.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (18 preceding siblings ...)
  2020-10-22 18:38 ` gzdoom: update to 4.4.2 ericonr
@ 2020-10-23  5:12 ` ericonr
  2020-11-22  5:08 ` [PR PATCH] [Merged]: " the-maldridge
  20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-10-23  5:12 UTC (permalink / raw)
  To: ml

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

There is an updated 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/24149

gzdoom: update to 4.4.2.
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

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

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

From a9fb9a01cc6b71032077561a124de094c750629c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 30 Aug 2020 17:28:45 -0300
Subject: [PATCH 1/2] New package: ZMusic-1.1.3.

ZMusic needs libopenal to enable sound playback.
libopenal, libfluidsynth and libsndfile are all loaded dynamically.

Based on and closes #20665.
---
 common/shlibs                         |  2 ++
 srcpkgs/ZMusic-devel                  |  1 +
 srcpkgs/ZMusic/patches/ppc-musl.patch | 13 ++++++++++
 srcpkgs/ZMusic/template               | 35 +++++++++++++++++++++++++++
 4 files changed, 51 insertions(+)
 create mode 120000 srcpkgs/ZMusic-devel
 create mode 100644 srcpkgs/ZMusic/patches/ppc-musl.patch
 create mode 100644 srcpkgs/ZMusic/template

diff --git a/common/shlibs b/common/shlibs
index 671d6d44ee0..1658b9f128c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2974,6 +2974,8 @@ libpisync.so.1 pilot-link-0.12.5_1
 libpitcl.so.0 pilot-link-0.12.5_1
 libiscsi.so.9 libiscsi-1.19.0_1
 libgme.so.0 libgme-0.6.1_1
+libzmusic.so.1 ZMusic-1.1.2_1
+libzmusiclite.so.1 ZMusic-1.1.2_1
 libsidplayfp.so.5 libsidplayfp-2.0.0_1
 libstilview.so.0 libsidplayfp-1.8.7_1
 libczmq.so.4 czmq-4.0.1_1
diff --git a/srcpkgs/ZMusic-devel b/srcpkgs/ZMusic-devel
new file mode 120000
index 00000000000..023ff24ecd4
--- /dev/null
+++ b/srcpkgs/ZMusic-devel
@@ -0,0 +1 @@
+ZMusic
\ No newline at end of file
diff --git a/srcpkgs/ZMusic/patches/ppc-musl.patch b/srcpkgs/ZMusic/patches/ppc-musl.patch
new file mode 100644
index 00000000000..729b73b155d
--- /dev/null
+++ b/srcpkgs/ZMusic/patches/ppc-musl.patch
@@ -0,0 +1,13 @@
+Taken from libgme package.
+
+--- thirdparty/game-music-emu/gme/blargg_endian.h
++++ thirdparty/game-music-emu/gme/blargg_endian.h
+@@ -36,7 +36,7 @@
+ #endif
+
+ #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
+-	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
++	defined (__sparc__)     || \
+ 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+ 	#define BLARGG_BIG_ENDIAN 1
+ #elif !defined (__mips__)
diff --git a/srcpkgs/ZMusic/template b/srcpkgs/ZMusic/template
new file mode 100644
index 00000000000..b75b6d0c409
--- /dev/null
+++ b/srcpkgs/ZMusic/template
@@ -0,0 +1,35 @@
+# Template file for 'ZMusic'
+pkgname=ZMusic
+version=1.1.3
+revision=1
+build_style=cmake
+configure_args="-DGME_INCLUDE_DIR=/usr/include -DGME_LIBRARIES=gme"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel alsa-lib-devel libgme-devel libopenal-devel libsndfile-devel"
+# these are dlopened
+depends="libfluidsynth libopenal libsndfile"
+short_desc="GZDoom's music system"
+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=5f432b022e023175eae7701625f79287e9ffe889a444179681381026b4fb93bf
+nocross=yes
+
+if [ "$XBPS_TARGET_LIBC" = musl ]; then
+	makedepends+=" musl-fts-devel"
+fi
+
+post_install() {
+	vmkdir usr/share/licenses/${pkgname}
+	vcopy "licenses/*" usr/share/licenses/${pkgname}/
+}
+
+ZMusic-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 6971c65654af280eb38d3082835fd2563d21240f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 9 Aug 2020 01:59:48 -0300
Subject: [PATCH 2/2] gzdoom: update to 4.4.2.

---
 ...d654ed85fc42ec59c99f760a7da572a95d2d.patch | 21 -----------
 srcpkgs/gzdoom/patches/fix-i686.patch         | 32 +++++++++++++++++
 srcpkgs/gzdoom/patches/i686.patch             | 35 -------------------
 srcpkgs/gzdoom/patches/ppc-musl.patch         | 13 -------
 srcpkgs/gzdoom/template                       | 35 ++++++++++---------
 5 files changed, 51 insertions(+), 85 deletions(-)
 delete mode 100644 srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
 create mode 100644 srcpkgs/gzdoom/patches/fix-i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/i686.patch
 delete mode 100644 srcpkgs/gzdoom/patches/ppc-musl.patch

diff --git a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch b/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
deleted file mode 100644
index 92399384298..00000000000
--- a/srcpkgs/gzdoom/patches/c3fed654ed85fc42ec59c99f760a7da572a95d2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From c3fed654ed85fc42ec59c99f760a7da572a95d2d Mon Sep 17 00:00:00 2001
-From: John Zimmermann <johnz@posteo.net>
-Date: Tue, 29 Oct 2019 01:02:09 +0100
-Subject: [PATCH] utility/palette.cpp requires sse2 on x86*
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6f6ece0a24..cb8ffc0f3d 100644
---- src/CMakeLists.txt
-+++ src/CMakeLists.txt
-@@ -1305,6 +1305,7 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
- 			rendering/polyrenderer/poly_all.cpp
- 			rendering/swrenderer/r_all.cpp
- 			utility/x86.cpp
-+			utility/palette.cpp
- 			PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
- 	endif()
- endif()
diff --git a/srcpkgs/gzdoom/patches/fix-i686.patch b/srcpkgs/gzdoom/patches/fix-i686.patch
new file mode 100644
index 00000000000..b66d70db512
--- /dev/null
+++ b/srcpkgs/gzdoom/patches/fix-i686.patch
@@ -0,0 +1,32 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 26c617e..e162638 100644
+--- src/CMakeLists.txt
++++ 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
+--- src/common/utility/palette.cpp
++++ 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/i686.patch b/srcpkgs/gzdoom/patches/i686.patch
deleted file mode 100644
index 6f9d839ab06..00000000000
--- a/srcpkgs/gzdoom/patches/i686.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/utility/palette.cpp	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 16:45:10.882234214 +0100
-@@ -34,6 +34,10 @@
- 
- #include "palette.h"
- #include "palentry.h"
-+#include <cfloat>
-+#include <cstring>
-+#include <cstdlib>
-+#include <cmath>
-
- /****************************/
- /* Palette management stuff */
---- src/CMakeLists.txt	2019-10-30 16:50:46.769763172 +0100
-+++ -	2019-10-30 17:11:18.507995925 +0100
-@@ -1210,7 +1210,7 @@
- 	endif()
- endif()
- 
--target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
-+target_link_libraries( zdoom ${ZDOOM_LIBS} dl gdtoa dumb lzma adl opn timidity timidityplus wildmidi oplsynth zmusic )
- 
- include_directories( .
- 	g_statusbar
---- libraries/zmusic/CMakeLists.txt	2019-10-20 16:16:08.000000000 +0200
-+++ -	2019-10-30 17:15:11.581747039 +0100
-@@ -94,7 +94,7 @@
- 	zmusic/zmusic.cpp
- 	${PLAT_SOURCES}
- 	)
--target_link_libraries( zmusic adl dumb gme oplsynth opn timidity timidityplus wildmidi )
-+target_link_libraries( zmusic dl adl dumb gme oplsynth opn timidity timidityplus wildmidi )
- 
- if( NOT DYN_SNDFILE AND SNDFILE_FOUND )
- 	include_directories( "${SNDFILE_INCLUDE_DIRS}" )
diff --git a/srcpkgs/gzdoom/patches/ppc-musl.patch b/srcpkgs/gzdoom/patches/ppc-musl.patch
deleted file mode 100644
index 978800ac214..00000000000
--- a/srcpkgs/gzdoom/patches/ppc-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from libgme package.
-
---- libraries/game-music-emu/gme/blargg_endian.h
-+++ libraries/game-music-emu/gme/blargg_endian.h
-@@ -36,7 +36,7 @@
- #endif
- 
- #if defined (MSB_FIRST)     || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
--	defined (__sparc__)     ||  BLARGG_CPU_POWERPC || \
-+	defined (__sparc__) || \
- 	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
- 	#define BLARGG_BIG_ENDIAN 1
- #elif !defined (__mips__)
diff --git a/srcpkgs/gzdoom/template b/srcpkgs/gzdoom/template
index 96e9aedeac5..bc644c1e3f2 100644
--- a/srcpkgs/gzdoom/template
+++ b/srcpkgs/gzdoom/template
@@ -1,41 +1,44 @@
 # Template file for 'gzdoom'
 pkgname=gzdoom
-version=4.3.3
+version=4.4.2
 revision=1
-_tagdate=2019-07-09
+_tagdate=2020-06-16
 wrksrc="${pkgname}-g${version}"
 build_style=cmake
 configure_args="-DINSTALL_PK3_PATH=share/gzdoom"
 hostmakedepends="pkg-config tar xz"
-makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel ppl-devel"
-depends="libfluidsynth gtk+3"
+makedepends="SDL2-devel gtk+3-devel fluidsynth-devel libgme-devel libgomp-devel
+ ppl-devel ZMusic-devel"
+depends="gtk+3"
 short_desc="Advanced Doom source port with OpenGL support"
 maintainer="Michael Straube <straubem@gmx.de>"
 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="8fe6bf59071dc603e611e9e822cd8a6934cc481d0a2a198d921af88126661b60
- 6d3c216eb12dd6f5a9504f7a2479721a465b1cc60a1888deab1b47bff1431eaa"
+checksum="d0ede9aefa8834b6d97a8a5336e57077475f43c297447f75b37550ee93010674
+ ccff299967bd47c8154d3af835fe514df29fc0560831437074a4b5ada674e6ba"
 skip_extraction="${pkgname}_${version}_amd64.deb"
 nocross=yes
 
-case "$XBPS_MACHINE" in
-	*-musl)
-		configure_args+=" -DCMAKE_CXX_FLAGS=-Wl,-lexecinfo -DCMAKE_EXE_LINKER_FLAGS=-lfts"
-		makedepends+=" musl-fts-devel libexecinfo-devel"
-	;;
+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
 
 post_extract() {
 	ar -p ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}_${version}_amd64.deb data.tar.xz |
 	tar --strip-components=4 -xJf - ./usr/share/{pixmaps/gzdoom.png,applications/gzdoom.desktop}
 
-	sed -i "s|GIT_DESCRIPTION|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|VERSIONSTR|\"${version}\"|g" src/gitinfo.cpp
-	sed -i "s|GIT_TIME|\"${_tagdate}\"|g" src/gitinfo.cpp
-	sed -i 's|#define SHARE_DIR.*|#define SHARE_DIR "/usr/share/gzdoom/"|' src/posix/i_system.h
-	sed -i 's|/usr/share/games/doom|/usr/share/gzdoom|g' src/gameconfigfile.cpp
+	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() {

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PR PATCH] [Merged]: gzdoom: update to 4.4.2.
  2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
                   ` (19 preceding siblings ...)
  2020-10-23  5:12 ` [PR PATCH] [Updated] " ericonr
@ 2020-11-22  5:08 ` the-maldridge
  20 siblings, 0 replies; 22+ messages in thread
From: the-maldridge @ 2020-11-22  5:08 UTC (permalink / raw)
  To: ml

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

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

gzdoom: update to 4.4.2.
https://github.com/void-linux/void-packages/pull/24149

Description:
GZDoom needs libopenal or FMOD to have sound playback. FMOD is not
packaged, so OpenAL is added as a dependency.

Based on and closes #20665

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2020-11-22  5:08 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-09  5:03 [PR PATCH] gzdoom: fix depends for audio support ericonr
2020-08-09  5:19 ` [PR REVIEW] " fosslinux
2020-08-09  5:22 ` ericonr
2020-08-09  5:30 ` ericonr
2020-08-09  5:43 ` ericonr
2020-08-10 12:13 ` ericonr
2020-08-10 12:40 ` ericonr
2020-08-10 12:42 ` [PR PATCH] [Updated] " ericonr
2020-08-16 12:23 ` [PR REVIEW] " Piraty
2020-08-30 20:30 ` [PR PATCH] [Updated] " ericonr
2020-08-30 20:31 ` [PR REVIEW] " ericonr
2020-08-30 20:32 ` [PR PATCH] [Updated] " ericonr
2020-08-30 20:32 ` ericonr
2020-08-30 20:34 ` [PR PATCH] [Updated] " ericonr
2020-08-30 20:38 ` ericonr
2020-08-31 14:23 ` ericonr
2020-08-31 15:00 ` [PR PATCH] [Updated] " ericonr
2020-09-01  0:07 ` ericonr
2020-10-22 18:32 ` [PR PATCH] [Updated] " ericonr
2020-10-22 18:38 ` gzdoom: update to 4.4.2 ericonr
2020-10-23  5:12 ` [PR PATCH] [Updated] " ericonr
2020-11-22  5:08 ` [PR PATCH] [Merged]: " the-maldridge

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git