diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | 0001-Fix-file-paths.patch | 78 | ||||
| -rw-r--r-- | PKGBUILD | 42 |
3 files changed, 49 insertions, 90 deletions
@@ -1,10 +1,11 @@ pkgbase = gzdoom-git - pkgdesc = Advanced Doom source port with OpenGL support (git version) - pkgver = 4.4pre+105+g15d4fb8fc + pkgdesc = Feature centric port for all Doom engine games (git version) + pkgver = 4.12pre+382+gdecaf07 pkgrel = 1 url = http://www.zdoom.org/ arch = i686 arch = x86_64 + arch = aarch64 license = BSD license = GPL3 license = LGPL3 @@ -14,16 +15,16 @@ pkgbase = gzdoom-git depends = gtk3 depends = hicolor-icon-theme depends = libgl - depends = libjpeg + depends = libvpx>=1.14 + depends = libwebp depends = openal depends = sdl2 - depends = zmusic + depends = zmusic>=1.1.8 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 = freedoom1: Freedoom: Phase 1 game data - optdepends = freedoom2: Freedoom: Phase 2 game data + optdepends = freedoom: Freedoom game data optdepends = gxmessage: crash dialog (GNOME) optdepends = hacx-wad: HacX game data optdepends = harmony-wad: Harmony game data @@ -37,12 +38,14 @@ pkgbase = gzdoom-git provides = gzdoom conflicts = gzdoom replaces = gzdoom1-git - source = gzdoom::git://github.com/coelckers/gzdoom.git + replaces = gzdoom-legacy-git + options = !lto + source = gzdoom::git+https://github.com/coelckers/gzdoom.git source = gzdoom.desktop source = 0001-Fix-file-paths.patch sha256sums = SKIP sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d - sha256sums = fb91388572f388d14983ea49f153b6fed36288b283faf6745a25427282c9a20f + sha256sums = a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f optdepends_x86_64 = vulkan-driver: Vulkan renderer optdepends_x86_64 = vulkan-icd-loader: Vulkan renderer diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch index 83c5a9e0f1ff..5df3f66c809e 100644 --- a/0001-Fix-file-paths.patch +++ b/0001-Fix-file-paths.patch @@ -1,19 +1,17 @@ -From 9def07d1ab571430ee97c3db3022b5ba647b3f21 Mon Sep 17 00:00:00 2001 +From 749acb5c34edad113b083e37df034887674aad3e 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/gameconfigfile.cpp | 14 ++------------ - src/posix/sdl/i_main.cpp | 14 +------------- - src/sound/music/i_soundfont.cpp | 4 +--- - 3 files changed, 4 insertions(+), 28 deletions(-) + src/gameconfigfile.cpp | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp -index a04264dbe..55e66bc4c 100644 +index 82b8071b60..a6584fa6f5 100644 --- a/src/gameconfigfile.cpp +++ b/src/gameconfigfile.cpp -@@ -108,8 +108,6 @@ FGameConfigFile::FGameConfigFile () +@@ -121,8 +121,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 @@ -22,72 +20,28 @@ index a04264dbe..55e66bc4c 100644 SetValueForKey ("Path", "/usr/share/doom", true); SetValueForKey ("Path", "/usr/share/games/doom", true); #endif -@@ -129,8 +127,6 @@ FGameConfigFile::FGameConfigFile () - #else +@@ -143,8 +141,6 @@ FGameConfigFile::FGameConfigFile () SetValueForKey ("Path", "$HOME/" GAME_DIR, true); + SetValueForKey ("Path", "$HOME/.local/share/games/doom", 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 -@@ -156,14 +152,8 @@ FGameConfigFile::FGameConfigFile () - #else - SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true); +@@ -172,10 +168,8 @@ FGameConfigFile::FGameConfigFile () SetValueForKey("Path", "$HOME/" GAME_DIR "/fm_banks", true); + SetValueForKey("Path", "$HOME/.local/share/games/doom/soundfonts", true); + SetValueForKey("Path", "$HOME/.local/share/games/doom/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 - } - -diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp -index 9004dc0a3..a88dfcf18 100644 ---- a/src/posix/sdl/i_main.cpp -+++ b/src/posix/sdl/i_main.cpp -@@ -187,19 +187,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/sound/music/i_soundfont.cpp b/src/sound/music/i_soundfont.cpp -index 400f92cb6..41896ae32 100644 ---- a/src/sound/music/i_soundfont.cpp -+++ b/src/sound/music/i_soundfont.cpp -@@ -231,9 +231,7 @@ FPatchSetReader::FPatchSetReader(const char *filename) - #ifndef _WIN32 - mCaseSensitivePaths = true; - const char *paths[] = { -- "/usr/local/lib/timidity", -- "/etc/timidity", -- "/etc" -+ "/etc/timidity++" - }; - #else - const char *paths[] = { ++ SetValueForKey("Path", "$PROGDIR/soundfonts", true); ++ SetValueForKey("Path", "$PROGDIR/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); -- -2.25.0 +2.38.1 @@ -1,26 +1,26 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> pkgname=gzdoom-git -pkgver=4.4pre+105+g15d4fb8fc +pkgver=4.12pre+382+gdecaf07 pkgrel=1 -pkgdesc='Advanced Doom source port with OpenGL support (git version)' -arch=('i686' 'x86_64') +pkgdesc='Feature centric port for all Doom engine games (git version)' +arch=('i686' 'x86_64' 'aarch64') url='http://www.zdoom.org/' license=('BSD' 'GPL3' 'LGPL3') depends=('gtk3' 'hicolor-icon-theme' 'libgl' - 'libjpeg' + 'libvpx>=1.14' + 'libwebp' 'openal' 'sdl2' - 'zmusic') + 'zmusic>=1.1.8') makedepends=('cmake' 'desktop-file-utils' 'git') 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' - 'freedoom1: Freedoom: Phase 1 game data' - 'freedoom2: Freedoom: Phase 2 game data' + 'freedoom: Freedoom game data' 'gxmessage: crash dialog (GNOME)' 'hacx-wad: HacX game data' 'harmony-wad: Harmony game data' @@ -35,17 +35,18 @@ optdepends_x86_64=('vulkan-driver: Vulkan renderer' 'vulkan-icd-loader: Vulkan renderer') provides=('gzdoom') conflicts=('gzdoom') -replaces=('gzdoom1-git') -source=('gzdoom::git://github.com/coelckers/gzdoom.git' +replaces=('gzdoom1-git' 'gzdoom-legacy-git') +options=(!lto) +source=('gzdoom::git+https://github.com/coelckers/gzdoom.git' 'gzdoom.desktop' '0001-Fix-file-paths.patch') sha256sums=('SKIP' '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d' - 'fb91388572f388d14983ea49f153b6fed36288b283faf6745a25427282c9a20f') + 'a37dde8274e1a9fd511af951da2e362d503ab4be72e79d4843e1ca3a0129549f') pkgver() { cd gzdoom - git describe --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/-/+/g' + git describe --tags --abbrev=7 --match '[Gg]*' | sed -r 's/^[Gg]//;s/-/+/g' } prepare() { @@ -58,7 +59,12 @@ build() { 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 CMAKE_CXX_FLAGS="$CXXFLAGS -ffile-prefix-map=\"$PWD\"=. -DSHARE_DIR=\\\"/usr/share/gzdoom\\\"" \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D SYSTEMINSTALL=ON \ + -D INSTALL_PK3_PATH=share/gzdoom \ + -D INSTALL_SOUNDFONT_PATH=share/gzdoom \ + -D INSTALL_RPATH=/usr/lib \ -D DYN_GTK=OFF \ -D DYN_OPENAL=OFF make -C build @@ -66,13 +72,9 @@ build() { package() { cd gzdoom - install build/gzdoom -t "$pkgdir"/usr/bin -D - install build/gzdoom.pk3 -t "$pkgdir"/usr/lib/gzdoom -D -m 644 + make -C build install DESTDIR="$pkgdir" + install -d "$pkgdir"/usr/share/licenses + mv "$pkgdir"/usr/share/doc/gzdoom/licenses "$pkgdir"/usr/share/licenses/gzdoom 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,lights,game_support}.pk3 -t "$pkgdir"/usr/share/gzdoom -D -m 644 - install build/soundfonts/gzdoom.sf2 -t "$pkgdir"/usr/share/gzdoom/soundfonts -D -m 644 - install build/fm_banks/* -t "$pkgdir"/usr/share/gzdoom/fm_banks -D -m 644 - install src/posix/zdoom.xpm "$pkgdir"/usr/share/icons/hicolor/256x256/apps/gzdoom.xpm -D -m 644 - install docs/licenses/{bsd,fxaa,gdtoa,README}.* -t "$pkgdir"/usr/share/licenses/$pkgname -D -m 644 + install src/posix/zdoom.xpm -D -m 644 "$pkgdir"/usr/share/icons/hicolor/256x256/apps/gzdoom.xpm } |