mike/arch-ppa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ppa update

Browse Source
This commit is contained in:
moparisthebest
2019-07-27 10:40:51 -04:00
parent 326dadd136
commit 4150b9c6b5
70 changed files with 487 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/odamex/0001-Fix-WAD-path.patch
View File

@@ -1,25 +1,14 @@
From 02dcf788ba288ddebb7164b86aef22e0e5fbf96a Mon Sep 17 00:00:00 2001
From: Mikael Eriksson <mikael_eriksson@miffe.org>
Date: Mon, 17 Dec 2012 12:04:02 +0100
Subject: [PATCH] Fix WAD path
---
common/d_main.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/common/d_main.cpp b/common/d_main.cpp
index a31cb62..4abf6be 100644
--- a/common/d_main.cpp
+++ b/common/d_main.cpp
@@ -490,6 +490,8 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s
dirs.push_back(progdir);
D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
+ D_AddSearchDir(dirs, "/usr/share/odamex", separator);
+ D_AddSearchDir(dirs, "/usr/share/doom", separator);
D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
D_AddSearchDir(dirs, getenv("HOME"), separator);
--
1.8.0.2
diff --unified --recursive --text odamex-src-0.8.0/common/d_main.cpp "odamex-src-0.8.0 diff/common/d_main.cpp"
--- odamex-src-0.8.0/common/d_main.cpp 2019-01-23 04:01:47.000000000 +0100
+++ "odamex-src-0.8.0 diff/common/d_main.cpp" 2019-03-07 22:31:46.807985980 +0100
@@ -499,6 +499,8 @@
dirs.push_back(progdir);
D_AddSearchDir(dirs, Args.CheckValue("-waddir"), separator);
+ D_AddSearchDir(dirs, "/usr/share/odamex", separator);
+ D_AddSearchDir(dirs, "/usr/share/doom", separator);
D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);
D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);
D_AddSearchDir(dirs, getenv("HOME"), separator);
VERSION_CONTROL (d_main_cpp, "$Id: cc97705a3130a984ef22d249de74a1dc64ba33a8 $")

43
src/odamex/PKGBUILD
View File

@@ -1,45 +1,42 @@
# Maintainer: Mikael Eriksson <mikael_eriksson@miffe.org>
# Contributor: Pol Marcet Sardà <polmarcetsarda@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
# Contributor: Curtis Smith <kman922002@gmail.com>
pkgname=odamex
pkgver=0.7.0
pkgrel=2
pkgver=0.8.0
pkgrel=1
pkgdesc='A free client/server multiplayer engine for the classic FPS Doom.'
arch=('i686' 'x86_64')
url='http://odamex.net/'
license=('GPL')
depends=('sdl_mixer>=1.2.6' 'wxgtk')
depends=('sdl_mixer>=1.2.6' 'wxgtk' 'miniupnpc')
makedepends=('cmake')
optdepends=('timidity++: Required for music')
source=("http://downloads.sourceforge.net/odamex/odamex-src-${pkgver}.tar.bz2"
source=("http://downloads.sourceforge.net/odamex/odamex-src-${pkgver}.tar.gz"
0001-Fix-WAD-path.patch)
md5sums=('312769b98bbdb450454e4676b2c55986'
'bb32f96f8b78f71456ae758b48e3fbe1')
sha256sums=('52b4d0ba504edfea53e24d8b19c86da6f7e3b75980c3133eb6b5e97d24a606ea'
'c4ce4072515c7dbfe65d1829a317d21b5f1091e04997761cdfee345a60141638')
prepare() {
cd $pkgname-src-$pkgver
patch --forward --strip=1 --input="${srcdir}/0001-Fix-WAD-path.patch"
}
build() {
cd odamex-src-${pkgver}
patch -p1 -i $srcdir/0001-Fix-WAD-path.patch
cmake .
cd $pkgname-src-${pkgver}
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
.
make
}
package() {
cd odamex-src-${pkgver}
install -Dm755 client/odamex "$pkgdir/usr/bin/odamex"
install -Dm755 server/odasrv "$pkgdir/usr/bin/odasrv"
install -Dm755 odalaunch/odalaunch "$pkgdir/usr/bin/odalaunch"
install -Dm644 odamex.wad "$pkgdir/usr/share/odamex/odamex.wad"
install -Dm644 media/icon_odamex_96.png "$pkgdir/usr/share/pixmaps/odamex.png"
install -Dm644 media/icon_odasrv_96.png "$pkgdir/usr/share/pixmaps/odasrv.png"
install -Dm644 media/icon_odalaunch_96.png "$pkgdir/usr/share/pixmaps/odalaunch.png"
install -Dm644 installer/arch/odamex.desktop "$pkgdir/usr/share/applications/odamex.desktop"
install -Dm644 installer/arch/odasrv.desktop "$pkgdir/usr/share/applications/odasrv.desktop"
install -Dm644 installer/arch/odalaunch.desktop "$pkgdir/usr/share/applications/odalaunch.desktop"
cd $pkgname-src-${pkgver}
make DESTDIR=$pkgdir install
# Use system headers.
rm -r "$pkgdir/usr/include/miniupnpc/"
}
# vim:set ts=2 sw=2 et: