makedeb
makedeb
Feature centric port for all Doom engine games
Click here to go back to the commit logs for gzdoom.
Hash: a5b2a90cb3433eca5713177c40289bfb5204ff11
Message: Updated to most recent version
diff --git a/.SRCINFO b/.SRCINFO
index be7de2b..5f46d9b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,45 +1,98 @@
-pkgbase = gzdoom
- pkgdesc = Feature centric port for all Doom engine games
- pkgver = 4.6.1
- pkgrel = 1
- url = http://www.zdoom.org/
- arch = i686
- arch = x86_64
- license = BSD
- license = GPL3
- license = LGPL3
- makedepends = g++
- makedepends = make
- makedepends = cmake
- makedepends = libsdl2-dev
- makedepends = git
- makedepends = zlib1g-dev
- makedepends = libbz2-dev
- makedepends = libjpeg-dev
- makedepends = libfluidsynth-dev
- makedepends = libgme-dev
- makedepends = libopenal-dev
- makedepends = libmpg123-dev
- makedepends = libsndfile1-dev
- makedepends = libgtk-3-dev
- makedepends = timidity
- makedepends = nasm
- makedepends = libgl1-mesa-dev
- makedepends = tar
- makedepends = libsdl1.2-dev
- makedepends = libglew-dev
- depends = libgtk-3-0
- depends = hicolor-icon-theme
- depends = libgl1
- depends = libjpeg8
- depends = libopenal1
- depends = libsdl2-2.0-0
- depends = zmusic>=1.1.8
- source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g4.6.1
- source = gzdoom.desktop
- source = 0001-Fix-file-paths.patch
- sha256sums = SKIP
- sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
- sha256sums = 9b6c37c6fc90080ceb4162673f23187210b083af7cd61294ece2711790eac186
-
+generated-by = makedeb
pkgname = gzdoom
+pkgbase = gzdoom
+pkgdesc = Feature centric port for all Doom engine games
+pkgrel = 1
+pkgver = 4.14.0
+url = http://www.zdoom.org/
+arch = amd64
+arch = aarch64
+depends = hicolor-icon-theme
+depends = libgl1
+depends = libjpeg62-turbo
+depends = libopenal1
+depends = libsdl2-2.0-0
+depends = zmusic>=1.1.14
+depends = vulkan-icd
+depends = libgtk-3-0
+license = BSD
+license = GPL3
+license = LGPL3
+makedepends = g++
+makedepends = make
+makedepends = cmake
+makedepends = libsdl2-dev
+makedepends = git
+makedepends = zlib1g-dev
+makedepends = libbz2-dev
+makedepends = libjpeg-dev
+makedepends = libfluidsynth-dev
+makedepends = libgme-dev
+makedepends = libopenal-dev
+makedepends = libmpg123-dev
+makedepends = libsndfile1-dev
+makedepends = libgtk-3-dev
+makedepends = timidity
+makedepends = nasm
+makedepends = libgl1-mesa-dev
+makedepends = tar
+makedepends = libglew-dev
+makedepends = libvulkan-dev
+makedepends = libvpx-dev
+optdepends = blasphemer-wad: Blasphemer (free Heretic) game data
+optdepends = chexquest3-wad: Chex Quest 3 game data
+optdepends = doom1-wad: Doom shareware game data
+optdepends = freedm: FreeDM game data
+optdepends = freedoom: Freedoom game data
+optdepends = gxmessage: crash dialog (GNOME)
+optdepends = hacx-wad: HacX game data
+optdepends = harmony-wad: Harmony game data
+optdepends = heretic1-wad: Heretic shareware game data
+optdepends = hexen1-wad: Hexen demo game data
+optdepends = kdialog: crash dialog (KDE)
+optdepends = strife0-wad: Strife shareware game data
+optdepends = square1-wad: The Adventures of Square, Episode 1 game data
+optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
+optdepends = x11-utils: crash dialog (other)
+source = gzdoom-4.14.0.tar.gz::https://github.com/ZDoom/gzdoom/archive/g4.14.0.tar.gz
+source = gzdoom.desktop
+source = 0000-fix-format-security-error.patch
+sha256sums = fb887b196859fe4b4696f5daffe93ea2840c637e887526a5ca53ce356b52b04c
+sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
+sha256sums = d414fe125d6f19992868c547e3aeb7f3a50bed4b28666ab717c102cb269e8d5b
+makedepends = g++
+makedepends = make
+makedepends = cmake
+makedepends = libsdl2-dev
+makedepends = git
+makedepends = zlib1g-dev
+makedepends = libbz2-dev
+makedepends = libjpeg-dev
+makedepends = libfluidsynth-dev
+makedepends = libgme-dev
+makedepends = libopenal-dev
+makedepends = libmpg123-dev
+makedepends = libsndfile1-dev
+makedepends = libgtk-3-dev
+makedepends = timidity
+makedepends = nasm
+makedepends = libgl1-mesa-dev
+makedepends = tar
+makedepends = libglew-dev
+makedepends = libvulkan-dev
+makedepends = libvpx-dev
+optdepends = blasphemer-wad: Blasphemer (free Heretic) game data
+optdepends = chexquest3-wad: Chex Quest 3 game data
+optdepends = doom1-wad: Doom shareware game data
+optdepends = freedm: FreeDM game data
+optdepends = freedoom: Freedoom game data
+optdepends = gxmessage: crash dialog (GNOME)
+optdepends = hacx-wad: HacX game data
+optdepends = harmony-wad: Harmony game data
+optdepends = heretic1-wad: Heretic shareware game data
+optdepends = hexen1-wad: Hexen demo game data
+optdepends = kdialog: crash dialog (KDE)
+optdepends = strife0-wad: Strife shareware game data
+optdepends = square1-wad: The Adventures of Square, Episode 1 game data
+optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
+optdepends = x11-utils: crash dialog (other)
diff --git a/0000-fix-format-security-error.patch b/0000-fix-format-security-error.patch
new file mode 100644
index 0000000..1bb9dc1
--- /dev/null
+++ b/0000-fix-format-security-error.patch
@@ -0,0 +1,13 @@
+diff --git a/src/common/engine/i_net.cpp b/src/common/engine/i_net.cpp
+index ad106bbc4a..0e587dd90f 100644
+--- a/src/common/engine/i_net.cpp
++++ b/src/common/engine/i_net.cpp
+@@ -1072,7 +1072,7 @@ void I_NetError(const char* error)
+ {
+ doomcom.numnodes = 0;
+ StartWindow->NetClose();
+- I_FatalError(error);
++ I_FatalError("%s", error);
+ }
+
+ // todo: later these must be dispatched by the main menu, not the start screen.
\ No newline at end of file
diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch
deleted file mode 100644
index bd229c9..0000000
--- a/0001-Fix-file-paths.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From ae97c9c15f3ee0d63573a319afda1e15fbe40cce Mon Sep 17 00:00:00 2001
-From: Jan Cholasta <jan@cholasta.net>
-Date: Tue, 25 Feb 2020 12:53:07 +0100
-Subject: [PATCH] Fix file paths
-
----
- src/common/platform/posix/sdl/i_main.cpp | 14 +-------------
- src/gameconfigfile.cpp | 14 ++------------
- 2 files changed, 3 insertions(+), 25 deletions(-)
-
-diff --git a/src/common/platform/posix/sdl/i_main.cpp b/src/common/platform/posix/sdl/i_main.cpp
-index 7fc179a51..f39a38440 100644
---- a/src/common/platform/posix/sdl/i_main.cpp
-+++ b/src/common/platform/posix/sdl/i_main.cpp
-@@ -129,19 +129,7 @@ int main (int argc, char **argv)
- Args = new FArgs(argc, argv);
-
- // Should we even be doing anything with progdir on Unix systems?
-- char program[PATH_MAX];
-- if (realpath (argv[0], program) == NULL)
-- strcpy (program, argv[0]);
-- char *slash = strrchr (program, '/');
-- if (slash != NULL)
-- {
-- *(slash + 1) = '\0';
-- progdir = program;
-- }
-- else
-- {
-- progdir = "./";
-- }
-+ progdir = "/usr/lib/gzdoom/";
-
- I_StartupJoysticks();
-
-diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
-index 7f7e55a21..8dfd6a9b3 100644
---- a/src/gameconfigfile.cpp
-+++ b/src/gameconfigfile.cpp
-@@ -109,8 +109,6 @@ FGameConfigFile::FGameConfigFile ()
- // Arch Linux likes them in /usr/share/doom
- // Debian likes them in /usr/share/games/doom
- // I assume other distributions don't do anything radically different
-- SetValueForKey ("Path", "/usr/local/share/doom", true);
-- SetValueForKey ("Path", "/usr/local/share/games/doom", true);
- SetValueForKey ("Path", "/usr/share/doom", true);
- SetValueForKey ("Path", "/usr/share/games/doom", true);
- #endif
-@@ -130,8 +128,6 @@ FGameConfigFile::FGameConfigFile ()
- #else
- SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
- SetValueForKey ("Path", SHARE_DIR, true);
-- SetValueForKey ("Path", "/usr/local/share/doom", true);
-- SetValueForKey ("Path", "/usr/local/share/games/doom", true);
- SetValueForKey ("Path", "/usr/share/doom", true);
- SetValueForKey ("Path", "/usr/share/games/doom", true);
- #endif
-@@ -157,14 +153,8 @@ FGameConfigFile::FGameConfigFile ()
- #else
- SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true);
- SetValueForKey("Path", "$HOME/" GAME_DIR "/fm_banks", true);
-- SetValueForKey("Path", "/usr/local/share/doom/soundfonts", true);
-- SetValueForKey("Path", "/usr/local/share/doom/fm_banks", true);
-- SetValueForKey("Path", "/usr/local/share/games/doom/soundfonts", true);
-- SetValueForKey("Path", "/usr/local/share/games/doom/fm_banks", true);
-- SetValueForKey("Path", "/usr/share/doom/soundfonts", true);
-- SetValueForKey("Path", "/usr/share/doom/fm_banks", true);
-- SetValueForKey("Path", "/usr/share/games/doom/soundfonts", true);
-- SetValueForKey("Path", "/usr/share/games/doom/fm_banks", true);
-+ SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/soundfonts", true);
-+ SetValueForKey("Path", "/usr/share/" GAMENAMELOWERCASE "/fm_banks", true);
- #endif
- }
-
---
-2.28.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 26be4cb..0daeb72 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,54 +1,64 @@
-# Maintainer: Tobias Zindl <zie.develop@gmail.com>
-# Maintainer: Jan Cholasta <grubber at grubber cz>
-# Contributor: Christoph Zeiler <rabyte*gmail>
+# Maintainer: Kay <lambdadeltacommunism@gmail.com>
pkgname=gzdoom
-pkgver=4.6.1
+pkgver=4.14.0
pkgrel=1
pkgdesc='Feature centric port for all Doom engine games'
-arch=('i686' 'x86_64')
+arch=('amd64' 'aarch64')
url='http://www.zdoom.org/'
license=('BSD' 'GPL3' 'LGPL3')
-depends=('libgtk-3-0'
- 'hicolor-icon-theme'
- 'libgl1'
- 'libjpeg8'
- 'libopenal1'
- 'libsdl2-2.0-0'
- 'zmusic>=1.1.8')
-makedepends=('g++' 'make' 'cmake' 'libsdl2-dev' 'git' 'zlib1g-dev' 'libbz2-dev' 'libjpeg-dev' 'libfluidsynth-dev' 'libgme-dev' 'libopenal-dev' 'libmpg123-dev' 'libsndfile1-dev' 'libgtk-3-dev' 'timidity' 'nasm' 'libgl1-mesa-dev' 'tar' 'libsdl1.2-dev' 'libglew-dev')
-source=("gzdoom::git://github.com/coelckers/gzdoom.git#tag=g${pkgver}"
- 'gzdoom.desktop'
- '0001-Fix-file-paths.patch')
-ptdepends=('blasphemer: Blasphemer (free Heretic) game data'
- 'freedm: FreeDM game data'
- 'freedoom: Freedoom: Phase 1 & Phase 2 game data'
- )
-sha256sums=('SKIP'
- '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
- '9b6c37c6fc90080ceb4162673f23187210b083af7cd61294ece2711790eac186')
+depends=('hicolor-icon-theme'
+ 'libgl1'
+ 'libjpeg62-turbo'
+ 'libopenal1'
+ 'libsdl2-2.0-0'
+ 'zmusic>=1.1.14'
+ 'vulkan-icd'
+ 'libgtk-3-0')
+makedepends=('g++' 'make' 'cmake' 'libsdl2-dev' 'git' 'zlib1g-dev' 'libbz2-dev' 'libjpeg-dev' 'libfluidsynth-dev' 'libgme-dev' 'libopenal-dev' 'libmpg123-dev' 'libsndfile1-dev' 'libgtk-3-dev' 'timidity' 'nasm' 'libgl1-mesa-dev' 'tar' 'libglew-dev' 'libvulkan-dev' 'libvpx-dev')
+_srcname=gzdoom-${pkgver}
+source=("${_srcname}.tar.gz::https://github.com/ZDoom/gzdoom/archive/g${pkgver}.tar.gz"
+ 'gzdoom.desktop'
+ '0000-fix-format-security-error.patch')
+optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
+ 'chexquest3-wad: Chex Quest 3 game data'
+ 'doom1-wad: Doom shareware game data'
+ 'freedm: FreeDM game data'
+ 'freedoom: Freedoom game data'
+ 'gxmessage: crash dialog (GNOME)'
+ 'hacx-wad: HacX game data'
+ 'harmony-wad: Harmony game data'
+ 'heretic1-wad: Heretic shareware game data'
+ 'hexen1-wad: Hexen demo game data'
+ 'kdialog: crash dialog (KDE)'
+ 'strife0-wad: Strife shareware game data'
+ 'square1-wad: The Adventures of Square, Episode 1 game data'
+ 'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data'
+ 'x11-utils: crash dialog (other)')
+sha256sums=('fb887b196859fe4b4696f5daffe93ea2840c637e887526a5ca53ce356b52b04c'
+ '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d'
+ 'd414fe125d6f19992868c547e3aeb7f3a50bed4b28666ab717c102cb269e8d5b')
prepare() {
- cd gzdoom
- git submodule update --init
- patch -i "$srcdir"/0001-Fix-file-paths.patch -p 1
+ cd gzdoom-g${pkgver}
+ patch -i "$srcdir"/0000-fix-format-security-error.patch -p 1
}
build() {
- cd gzdoom
+ cd gzdoom-g${pkgver}
mkdir -p build
cmake -B build \
- -D CMAKE_BUILD_TYPE=Release \
- -D CMAKE_CXX_FLAGS="${CXXFLAGS} -ffile-prefix-map=\"$PWD\"=. -DSHARE_DIR=\\\"/usr/share/gzdoom\\\"" \
- -D DYN_GTK=OFF \
- -D DYN_OPENAL=OFF
+ -D CMAKE_BUILD_TYPE=Release \
+ -D CMAKE_CXX_FLAGS="${CXXFLAGS} -ffile-prefix-map=\"$PWD\"=. -DSHARE_DIR=\\\"/usr/share/gzdoom\\\"" \
+ -D DYN_GTK=OFF \
+ -D DYN_OPENAL=OFF
make -C build
}
package() {
- cd gzdoom
+ cd gzdoom-g${pkgver}
install build/gzdoom -t "$pkgdir"/usr/bin -D
- install build/{game_support,gzdoom}.pk3 -t "$pkgdir"/usr/lib/gzdoom -D -m 644
+ install build/{game_support,gzdoom}.pk3 -t "$pkgdir"/usr/share/gzdoom -D -m 644
desktop-file-install "$srcdir"/gzdoom.desktop --dir="$pkgdir"/usr/share/applications
install docs/{console,rh-log,skins}.* -t "$pkgdir"/usr/share/doc/gzdoom -D -m 644
install build/{brightmaps,game_widescreen_gfx,lights}.pk3 -t "$pkgdir"/usr/share/gzdoom -D -m 644