diff options
author | Alexandre Bouvier | 2019-02-28 16:50:48 +0100 |
---|---|---|
committer | Alexandre Bouvier | 2019-02-28 16:51:59 +0100 |
commit | 0d4e9e6d771178a5cea54cfd4c303f18011867be (patch) | |
tree | 6b42a3ed63bd2788e2838e49efe72afa2a2083a9 | |
parent | e426fcc84b5b64c4f19c44d9a4d345102f8aec2d (diff) | |
download | aur-0d4e9e6d771178a5cea54cfd4c303f18011867be.tar.gz |
use LINUX_DEFAULT_PATH rather than patching
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-game_data_location.patch | 13 | ||||
-rw-r--r-- | PKGBUILD | 25 |
3 files changed, 7 insertions, 37 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Mon Jun 20 09:33:55 UTC 2016 pkgbase = dhewm3-git pkgdesc = Doom 3 engine with native 64-bit support, SDL, and OpenAL - pkgver = 1.4.1 + pkgver = 1.5.0.r16.17c10d4 pkgrel = 1 epoch = 1 url = https://github.com/dhewm/dhewm3 @@ -21,10 +19,8 @@ pkgbase = dhewm3-git conflicts = dhewm3 source = git+https://github.com/dhewm/dhewm3 source = dhewm3.desktop - source = 0001-game_data_location.patch sha256sums = SKIP sha256sums = 7c9ae892c6cf0453fcd57731689ccedac8f8ce10f33043f7dd5fb66bd73d1287 - sha256sums = dbbb0607a92482a1b753cf9cac97dcc57345b92ee43449c9826f5b23af7624f9 pkgname = dhewm3-git diff --git a/0001-game_data_location.patch b/0001-game_data_location.patch deleted file mode 100644 index 60966c259624..000000000000 --- a/0001-game_data_location.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/neo/framework/Licensee.h b/neo/framework/Licensee.h -index 9cc20fb..fb1c882 100644 ---- a/neo/framework/Licensee.h -+++ b/neo/framework/Licensee.h -@@ -90,7 +90,7 @@ If you have questions concerning this license or the applicable additional terms - #define WIN32_CONSOLE_CLASS "dhewm 3 WinConsole" - - // Linux info --#define LINUX_DEFAULT_PATH "/usr/local/games/doom3" -+#define LINUX_DEFAULT_PATH "/usr/share/games/doom3" - - // CD Key file info - // goes into BASE_GAMEDIR whatever the fs_game is set to @@ -1,7 +1,8 @@ -# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com> +# Maintainer: Alexandre Bouvier <contact@amb.tf> +# Contributor: Mike Swanson <mikeonthecomputer@gmail.com> pkgname=dhewm3-git -pkgver=1.4.1 +pkgver=1.5.0.r16.17c10d4 pkgrel=1 epoch=1 pkgdesc="Doom 3 engine with native 64-bit support, SDL, and OpenAL" @@ -13,11 +14,9 @@ makedepends=('cmake' 'git') conflicts=('dhewm3') provides=('dhewm3') source=("git+$url" - 'dhewm3.desktop' - '0001-game_data_location.patch') + 'dhewm3.desktop') sha256sums=('SKIP' - '7c9ae892c6cf0453fcd57731689ccedac8f8ce10f33043f7dd5fb66bd73d1287' - 'dbbb0607a92482a1b753cf9cac97dcc57345b92ee43449c9826f5b23af7624f9') + '7c9ae892c6cf0453fcd57731689ccedac8f8ce10f33043f7dd5fb66bd73d1287') pkgver() { cd "${pkgname/-git/}" @@ -25,22 +24,10 @@ pkgver() { printf "%s" "$(git describe --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" } -prepare() { - cd "${pkgname/-git/}" - - for patch in ../*.patch; do - if [ ! -f "$patch" ]; then - break; - else - patch -p1 -i "$patch" - fi - done -} - build() { cd "${pkgname/-git/}/neo" - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DD3XP=1 -DDEDICATED=1 . + CXXFLAGS='-DLINUX_DEFAULT_PATH=\"/usr/share/games/doom3\"' cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DD3XP=1 -DDEDICATED=1 . make } |