[odamex]: upgrade to v0.8.1 - add armv7h build

2 files changed, 39 insertions, 54 deletions

diff --git a/pcr/odamex/0001-Fix-WAD-path.patch b/pcr/odamex/0001-Fix-WAD-path.patch
index 00926cc62..12b485ac8 100644
--- a/pcr/odamex/0001-Fix-WAD-path.patch
+++ b/pcr/odamex/0001-Fix-WAD-path.patch
@@ -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 $")
diff --git a/pcr/odamex/PKGBUILD b/pcr/odamex/PKGBUILD
index 9040e33cd..da26762d0 100644
--- a/pcr/odamex/PKGBUILD
+++ b/pcr/odamex/PKGBUILD
@@ -1,45 +1,41 @@
-# Maintainer (Arch): Mikael Eriksson <mikael_eriksson@miffe.org>
-# Contributor (Arch): Thomas Dziedzic < gostrc at gmail >
-# Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-# Contributor (Arch): Curtis Smith <kman922002@gmail.com>
+# Maintainer (AUR): Mikael Eriksson <mikael_eriksson@miffe.org>
+# Contributor (AUR): Pol Marcet Sardà <polmarcetsarda@gmail.com>
+# Contributor (AUR): Thomas Dziedzic < gostrc at gmail >
+# Contributor (AUR): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+# Contributor (AUR): Curtis Smith <kman922002@gmail.com>
 
 pkgname=odamex
-pkgver=0.7.0
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 pkgdesc='A free client/server multiplayer engine for the classic FPS Doom.'
-arch=('i686' 'x86_64')
+arch=('armv7h' 'i686' 'x86_64')
 url='http://odamex.net/'
 license=('GPL')
-depends=('sdl_mixer>=1.2.6' 'wxgtk')
+depends=('sdl_mixer>=1.2.6' 'wxgtk' 'miniupnpc' 'portmidi')
 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=('31704a45eae3a833dcc0c4c840444cda0ba88a2fc9b6115b612e31a6dcc48bfb'
+            'c4ce4072515c7dbfe65d1829a317d21b5f1091e04997761cdfee345a60141638')
 
-build() {
-	cd odamex-src-${pkgver}
-  
-  patch -p1 -i $srcdir/0001-Fix-WAD-path.patch
+prepare() {
+  cd $pkgname-src-$pkgver
+  patch --forward --strip=1 --input="${srcdir}/0001-Fix-WAD-path.patch"
+}
 
-  cmake .
+build() {
+  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: