diff options
author | Jan Cholasta | 2020-02-25 14:27:48 +0100 |
---|---|---|
committer | Jan Cholasta | 2020-02-25 14:27:48 +0100 |
commit | 168ee445beeab47b51b0ad66be3cc38098eff248 (patch) | |
tree | 824098c6a9aef2007966881ee11643f1d078f3e9 | |
parent | bf1b2c1995ed70ce1a489a30f685dc0e524b90bf (diff) | |
download | aur-168ee445beeab47b51b0ad66be3cc38098eff248.tar.gz |
raze-git-0.4.5+36+g999840a9b-1
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0001-Fix-file-paths.patch | 20 | ||||
-rw-r--r-- | PKGBUILD | 28 |
3 files changed, 26 insertions, 30 deletions
@@ -1,6 +1,6 @@ pkgbase = raze-git pkgdesc = Build engine port backed by GZDoom tech (git version) - pkgver = 0.4.4+17+ga873dcf6e + pkgver = 0.4.5+36+g999840a9b pkgrel = 1 url = https://github.com/coelckers/Raze arch = x86_64 @@ -9,16 +9,16 @@ pkgbase = raze-git makedepends = cmake makedepends = desktop-file-utils makedepends = git + depends = gtk3 depends = hicolor-icon-theme depends = libgl depends = libjpeg depends = libvpx + depends = openal depends = sdl2 depends = zmusic - optdepends = gtk3: IWAD selection dialog optdepends = gxmessage: crash dialog (GNOME) optdepends = kdialog: crash dialog (KDE) - optdepends = openal: in-game sound optdepends = xorg-xmessage: crash dialog (other) provides = raze conflicts = raze @@ -26,7 +26,7 @@ pkgbase = raze-git source = 0001-Fix-file-paths.patch source = raze.desktop sha256sums = SKIP - sha256sums = 35c2a1c652f84a56c6ee5a35ec30f9b2028307ee8e14ed053810a344beafc784 + sha256sums = cb6a0ff91f3746a1bd9583540f51e3c3ad445a34b1a2a0a46d18a64797223e68 sha256sums = ffc02d8f6f0d4464a74e025d41063f2441d9423d4ed605a0290eb266ae9531c8 pkgname = raze-git diff --git a/0001-Fix-file-paths.patch b/0001-Fix-file-paths.patch index 0db10f1996f1..04d35292b297 100644 --- a/0001-Fix-file-paths.patch +++ b/0001-Fix-file-paths.patch @@ -1,17 +1,17 @@ -From c52a9fd04f97ed11ff441e6754c5bdeeb2f35efd Mon Sep 17 00:00:00 2001 +From 104b0ed4916d639c53cdb2d5e9caf3549330c113 Mon Sep 17 00:00:00 2001 From: Jan Cholasta <jan@cholasta.net> Date: Thu, 6 Feb 2020 07:59:18 +0100 Subject: [PATCH] Fix file paths --- - source/common/gameconfigfile.cpp | 14 +------------- + source/common/gameconfigfile.cpp | 13 +------------ source/common/gamecontrol.cpp | 2 +- source/common/music/i_soundfont.cpp | 4 +--- source/platform/posix/sdl/i_main.cpp | 14 +------------- - 4 files changed, 4 insertions(+), 30 deletions(-) + 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/source/common/gameconfigfile.cpp b/source/common/gameconfigfile.cpp -index dd4c0889e..949e6be16 100644 +index dd4c0889e..ae7d282d4 100644 --- a/source/common/gameconfigfile.cpp +++ b/source/common/gameconfigfile.cpp @@ -100,15 +100,10 @@ FGameConfigFile::FGameConfigFile () @@ -30,11 +30,9 @@ index dd4c0889e..949e6be16 100644 #endif SetValueForKey ("Path", "$STEAM", true); // also covers GOG. -@@ -128,13 +123,9 @@ FGameConfigFile::FGameConfigFile () - SetValueForKey ("Path", "$GAMEDIR", true); - #else +@@ -130,11 +125,8 @@ FGameConfigFile::FGameConfigFile () SetValueForKey ("Path", "$HOME/" GAME_DIR, true); -- SetValueForKey ("Path", SHARE_DIR, true); + SetValueForKey ("Path", SHARE_DIR, true); SetValueForKey ("Path", "/usr/share/games/jfduke3d", true); - SetValueForKey ("Path", "/usr/local/share/games/jfduke3d", true); SetValueForKey ("Path", "/usr/share/games/eduke32", true); @@ -44,7 +42,7 @@ index dd4c0889e..949e6be16 100644 #endif } -@@ -151,10 +142,7 @@ FGameConfigFile::FGameConfigFile () +@@ -151,10 +143,7 @@ FGameConfigFile::FGameConfigFile () SetValueForKey("Path", "$PROGDIR/soundfonts", true); #else SetValueForKey("Path", "$HOME/" GAME_DIR "/soundfonts", true); @@ -57,10 +55,10 @@ index dd4c0889e..949e6be16 100644 } diff --git a/source/common/gamecontrol.cpp b/source/common/gamecontrol.cpp -index dac122893..111f1f954 100644 +index 05ed78781..4b330ddff 100644 --- a/source/common/gamecontrol.cpp +++ b/source/common/gamecontrol.cpp -@@ -584,7 +584,7 @@ int RunGame() +@@ -599,7 +599,7 @@ int RunGame() FString logfile = Args->TakeValue("+logfile"); // As long as this engine is still in prerelease mode let's always write a log file. @@ -1,25 +1,25 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> pkgname=raze-git -pkgver=0.4.4+17+ga873dcf6e +pkgver=0.4.5+36+g999840a9b pkgrel=1 pkgdesc='Build engine port backed by GZDoom tech (git version)' arch=('x86_64') url='https://github.com/coelckers/Raze' license=('custom:BUILD' 'GPL2') -depends=('hicolor-icon-theme' +depends=('gtk3' + 'hicolor-icon-theme' 'libgl' 'libjpeg' 'libvpx' + 'openal' 'sdl2' 'zmusic') makedepends=('cmake' 'desktop-file-utils' 'git') -optdepends=('gtk3: IWAD selection dialog' - 'gxmessage: crash dialog (GNOME)' +optdepends=('gxmessage: crash dialog (GNOME)' 'kdialog: crash dialog (KDE)' - 'openal: in-game sound' 'xorg-xmessage: crash dialog (other)') provides=('raze') conflicts=('raze') @@ -27,7 +27,7 @@ source=("Raze::git+https://github.com/coelckers/Raze" '0001-Fix-file-paths.patch' 'raze.desktop') sha256sums=('SKIP' - '35c2a1c652f84a56c6ee5a35ec30f9b2028307ee8e14ed053810a344beafc784' + 'cb6a0ff91f3746a1bd9583540f51e3c3ad445a34b1a2a0a46d18a64797223e68' 'ffc02d8f6f0d4464a74e025d41063f2441d9423d4ed605a0290eb266ae9531c8') pkgver() { @@ -43,22 +43,20 @@ prepare() { build() { cd Raze mkdir -p build - local _cflags="-ffile-prefix-map=\"$PWD\"=." cmake -B build \ -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_C_FLAGS="${CFLAGS} ${_cflags}" \ - -D CMAKE_CXX_FLAGS="${CXXFLAGS} ${_cflags}" \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D ZMUSIC_LIBRARIES=/usr/lib/libzmusic.so \ - -D INSTALL_PK3_PATH=lib/raze + -D CMAKE_CXX_FLAGS="${CXXFLAGS} -ffile-prefix-map=\"$PWD\"=. -DSHARE_DIR=\\\"/usr/share/raze\\\"" \ + -D DYN_GTK=OFF \ + -D DYN_OPENAL=OFF make -C build } package() { cd Raze - make -C build install DESTDIR="$pkgdir" + install build/raze -t "$pkgdir"/usr/bin -D + install build/raze.pk3 -t "$pkgdir"/usr/lib/raze -D -m 644 desktop-file-install "$srcdir"/raze.desktop --dir="$pkgdir"/usr/share/applications install source/platform/posix/game.xpm "$pkgdir"/usr/share/icons/hicolor/256x256/apps/raze.xpm -D -m 644 - install package/common/buildlic.txt "$pkgdir"/usr/share/licenses/$pkgname/buildlic.txt -D -m 644 - install soundfont/raze.sf2 "$pkgdir"/usr/share/raze/soundfonts/raze.sf2 -D -m 644 + install package/common/buildlic.txt -t "$pkgdir"/usr/share/licenses/$pkgname -D -m 644 + install build/soundfonts/raze.sf2 -t "$pkgdir"/usr/share/raze/soundfonts -D -m 644 } |