update to new fork which is active, add sdl2_mixer and soundfont deps

3 files changed, 47 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 010a998fe3c4..22ae5f570802 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,20 @@
 pkgbase = 1oom-git
 	pkgdesc = 1oom is a Master of Orion (1993) game engine recreation.
-	pkgver = r777.912dce1
-	pkgrel = 2
+	pkgver = r1047.813ab8df
+	pkgrel = 1
 	url = https://gitlab.com/Tapani_/1oom
 	arch = x86_64
 	license = GPL2
 	makedepends = git
-	depends = libsamplerate
+	depends = sdl2
 	depends = sdl2_mixer
+	depends = libsamplerate
+	depends = soundfont-fluid
 	provides = 1oom
 	conflicts = 1oom
-	source = git+https://gitlab.com/Tapani_/1oom.git
-	sha256sums = SKIP
+	source = git+https://github.com/1oom-fork/1oom.git
+	source = 1oom_classic_sdl2.sh
+	md5sums = SKIP
+	md5sums = 41b52627b2d52b477adcbc2a9a627b37
 
 pkgname = 1oom-git
-
diff --git a/1oom_classic_sdl2.sh b/1oom_classic_sdl2.sh
new file mode 100755
index 000000000000..110da2b066a9
--- /dev/null
+++ b/1oom_classic_sdl2.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+SDL_SOUNDFONTS=/usr/share/soundfonts/FluidR3_GM.sf2 /usr/bin/1oom_classic_sdl2-bin
diff --git a/PKGBUILD b/PKGBUILD
index 17c8485db37e..9b2dffd83416 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,51 @@
-# Maintainer: Frederic Bezies <fredbezies at gmail dot com>
-# Contributor: Benjamin Hodgetts <ben@xnode.org>
+# Maintainer: Alexander Jacocks <alexander@redhat.com>
 
 pkgname=1oom-git
-pkgver=r777.912dce1
-pkgrel=2
+_pkgname=1oom
+pkgver=r1047.813ab8df
+pkgrel=1
 pkgdesc="1oom is a Master of Orion (1993) game engine recreation."
 arch=(x86_64)
 url=https://gitlab.com/Tapani_/1oom
 license=('GPL2')
-depends=('libsamplerate' 'sdl2_mixer')
-makedepends=('git')
-provides=('1oom')
-conflicts=('1oom')
-source=('git+https://gitlab.com/Tapani_/1oom.git')
-sha256sums=('SKIP')
+depends=(sdl2 sdl2_mixer libsamplerate soundfont-fluid)
+makedepends=(git)
+provides=(1oom)
+conflicts=(1oom)
+source=(  'git+https://github.com/1oom-fork/1oom.git'
+          '1oom_classic_sdl2.sh' )
+md5sums=('SKIP'
+         '41b52627b2d52b477adcbc2a9a627b37')
 
 pkgver() {
-    cd "${srcdir}/1oom"
+    cd "${srcdir}/${_pkgname}"
     echo "r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
 }
 
 build() {
-    cd 1oom
-    autoreconf -fi
-    ./configure --prefix=/usr --disable-hwsdl1
-    make
+  cd ${_pkgname}
+  autoreconf -fi
+  test -d build-native || mkdir build-native
+  cd build-native
+  ../configure --prefix=/usr
+  { test "$(nproc)" -gt 1 && make -j"$(nproc)" ;} || make
 }
 
 package() {
-    cd 1oom
-    make PREFIX="/usr" DESTDIR="${pkgdir}" install
+  cd "${srcdir}/${_pkgname}/build-native"
+  make PREFIX="/usr" DESTDIR="${pkgdir}" install
+
+  # install docs
+  cd "${srcdir}/${_pkgname}/doc"
+  mkdir -p "$pkgdir/usr/share/doc/${_pkgname}"
+  cp *.txt "$pkgdir/usr/share/doc/${_pkgname}/"
+  cd ..
+  cp AUTHORS CHANGES CHANGES-GIT CODE_OF_CONDUCT COMPILING COPYING HACKING NEWS PHILOSOPHY README.md "$pkgdir/usr/share/doc/${_pkgname}/"
+
+  # create storage directory for MOO data
+  mkdir -p "$pkgdir/usr/share/1oom"
+
+  # install launch script
+  mv "$pkgdir/usr/bin/1oom_classic_sdl2" "$pkgdir/usr/bin/1oom_classic_sdl2-bin"
+  install -m 0755 "${srcdir}/1oom_classic_sdl2.sh" "$pkgdir/usr/bin/1oom_classic_sdl2"
 }