From fcf79f617a596b1426042382fb493077466e1081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= 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 -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 " 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 }