Picked up orphan and updated to 0.9.0

4 files changed, 56 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd38aa6f6653..926bc15ceb79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
 pkgbase = rpcemu
-	pkgdesc = Emulator of the Acorn Archimedes and RiscPC computers.
-	pkgver = 0.8.15
-	pkgrel = 2
+	pkgdesc = An Emulator of classic Acorn computer systems, such as the Risc PC and A7000
+	pkgver = 0.9.0
+	pkgrel = 1
 	url = http://www.marutan.net/rpcemu/
 	install = rpcemu.install
-	changelog = rpcemu.changelog
 	arch = x86_64
 	arch = i686
 	license = GPL2
-	depends = allegro4
-	source = http://www.marutan.net/rpcemu/cgi/download.php?sFName=0.8.15/rpcemu-0.8.15.tar.gz
-	md5sums = bffb5bbb81391c14f210facccd0f40b6
+	makedepends = qt5-base
+	source = http://www.marutan.net/rpcemu/cgi/download.php?sFName=0.9.0/rpcemu-0.9.0.tar.gz
+	sha256sums = 772f2648cd141943d4182fb9518ebc9730e00cbdd492dc5c3c1b447d8cb1f86d
 
 pkgname = rpcemu
 
diff --git a/PKGBUILD b/PKGBUILD
index 8984ae053835..3134f10f63a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,63 +1,58 @@
-# Maintainer: Natalia Portillo <claunia@clania.com>
+# Maintainer: Paul Bell <linux at dpb dot org dot uk>
+# Contributor: Natalia Portillo <claunia@clania.com>
 pkgname=rpcemu
-pkgver=0.8.15
-pkgrel=2
-pkgdesc="Emulator of the Acorn Archimedes and RiscPC computers."
+pkgver=0.9.0
+pkgrel=1
+pkgdesc="An Emulator of classic Acorn computer systems, such as the Risc PC and A7000"
 url="http://www.marutan.net/rpcemu/"
 arch=('x86_64' 'i686')
 license=('GPL2')
-depends=('allegro4')
+makedepends=('qt5-base')
 source=("http://www.marutan.net/rpcemu/cgi/download.php?sFName=${pkgver}/rpcemu-${pkgver}.tar.gz")
-md5sums=('bffb5bbb81391c14f210facccd0f40b6')
-install=$pkgname.install
-changelog=$pkgname.changelog
+sha256sums=('772f2648cd141943d4182fb9518ebc9730e00cbdd492dc5c3c1b447d8cb1f86d')
+install="$pkgname.install"
+_pkgname="rpcemu-recompiler"
+
+prepare() {
+  # dynarec/recompiler is the default (_verbool=0)
+  # set _verbool=1 for "interpreter"
+  local _verbool=0
+  if [ "$_verbool" -eq 0 ]; then
+    sed -e "s/CONFIG += debug_and_release/CONFIG += debug_and_release dynarec/" \
+        -i "$srcdir/${pkgname}-${pkgver}/src/qt5/rpcemu.pro"
+  else
+    _pkgname="rpcemu-interpreter"
+  fi
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-  ./configure --prefix=/usr --enable-dynarec
+  cd "$srcdir/${pkgname}-${pkgver}/src/qt5"
+  qmake-qt5
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
-  install -Dm755 rpcemu "$pkgdir/usr/share/$pkgname/rpcemu"
-  mkdir -p "$pkgdir/usr/bin"
-  ln -s "/usr/share/$pkgname/rpcemu" "$pkgdir/usr/bin/rpcemu"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -Dm644 cmos.ram "$pkgdir/usr/share/$pkgname/cmos.ram"
-  install -Dm644 readme.txt "$pkgdir/usr/share/$pkgname/readme.txt"
-  install -Dm644 rpc.cfg "$pkgdir/usr/share/$pkgname/rpc.cfg"
-  install -Dm644 "hostfs/Network/!System/310/Modules/Network/EtherRPCEm,ffa" "$pkgdir/usr/share/$pkgname/hostfs/Network/!System/310/Modules/Network/EtherRPCEm,ffa"
-  install -Dm644 "hostfs/Network/AutoSense/EtherRPCEm,ffb" "$pkgdir/usr/share/$pkgname/hostfs/Network/AutoSense/EtherRPCEm,ffb"
-  install -Dm644 "hostfs/Network/ReadMe,fff" "$pkgdir/usr/share/$pkgname/hostfs/Network/ReadMe,fff"
-  install -Dm644 "poduleroms/SyncClock,ffa" "$pkgdir/usr/share/$pkgname/poduleroms/SyncClock,ffa"
-  install -Dm755 "poduleroms/hostfsfiler,ffa" "$pkgdir/usr/share/$pkgname/poduleroms/hostfsfiler,ffa"
-  install -Dm755 "poduleroms/hostfs,ffa" "$pkgdir/usr/share/$pkgname/poduleroms/hostfs,ffa"
-  install -Dm644 "riscos-progs/EtherRPCEm/cmhg/ModHdr" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/cmhg/ModHdr"
-  install -Dm644 "riscos-progs/EtherRPCEm/!System/310/Modules/Network/EtherRPCEm,ffa" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/!System/310/Modules/Network/EtherRPCEm,ffa"
-  install -Dm644 "riscos-progs/EtherRPCEm/!Boot/Resources/Configure/!InetSetup/AutoSense/EtherRPCEm,ffb" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/!Boot/Resources/Configure/!InetSetup/AutoSense/EtherRPCEm,ffb"
-  install -Dm644 "riscos-progs/EtherRPCEm/Structs.h" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/Structs.h"
-  install -Dm644 "riscos-progs/EtherRPCEm/LICENSE" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/LICENSE"
-  install -Dm644 "riscos-progs/EtherRPCEm/Defines.h" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/Defines.h"
-  install -Dm644 "riscos-progs/EtherRPCEm/Equates.h" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/Equates.h"
-  install -Dm644 "riscos-progs/EtherRPCEm/Makefile" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/Makefile"
-  install -Dm644 "riscos-progs/EtherRPCEm/DCI.h" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/DCI.h"
-  install -Dm644 "riscos-progs/EtherRPCEm/Notes" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/Notes"
-  install -Dm644 "riscos-progs/EtherRPCEm/mbuf_c.h" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/mbuf_c.h"
-  install -Dm644 "riscos-progs/EtherRPCEm/Module.h" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/Module.h"
-  install -Dm644 "riscos-progs/EtherRPCEm/intveneer.s" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/intveneer.s"
-  install -Dm644 "riscos-progs/EtherRPCEm/ReadMe,fff" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/ReadMe,fff"
-  install -Dm644 "riscos-progs/EtherRPCEm/Module.c" "$pkgdir/usr/share/$pkgname/riscos-progs/EtherRPCEm/Module.c"
-  install -Dm755 "riscos-progs/HostFS/hostfsfiler,ffa" "$pkgdir/usr/share/$pkgname/riscos-progs/HostFS/hostfsfiler,ffa"
-  install -Dm644 "riscos-progs/HostFS/arm_binutils.txt" "$pkgdir/usr/share/$pkgname/riscos-progs/HostFS/arm_binutils.txt"
-  install -Dm755 "riscos-progs/HostFS/hostfs,ffa" "$pkgdir/usr/share/$pkgname/riscos-progs/HostFS/hostfs,ffa"
-  install -Dm644 "riscos-progs/HostFS/Makefile" "$pkgdir/usr/share/$pkgname/riscos-progs/HostFS/Makefile"
-  install -Dm644 "riscos-progs/HostFS/hostfs.s" "$pkgdir/usr/share/$pkgname/riscos-progs/HostFS/hostfs.s"
-  install -Dm644 "riscos-progs/HostFS/hostfsfiler.s" "$pkgdir/usr/share/$pkgname/riscos-progs/HostFS/hostfsfiler.s"
-  install -Dm644 "riscos-progs/SyncClock/SyncClock,ffa" "$pkgdir/usr/share/$pkgname/riscos-progs/SyncClock/SyncClock,ffa"
-  install -Dm644 "riscos-progs/SyncClock/SyncClockSrc,ffb" "$pkgdir/usr/share/$pkgname/riscos-progs/SyncClock/SyncClockSrc,ffb"
-  install -Dm644 "roms/roms.txt" "$pkgdir/usr/share/$pkgname/roms/roms.txt"
+  local _systdir="/usr/share"
+  local _basedir="$pkgdir/$_systdir/$pkgname"
+
+  cd "$srcdir/${pkgname}-${pkgver}"
+  install -dm755 "$pkgdir/usr/bin"
+
+  # must be writable (group) for rpcemu to function
+  install -dm775 "$_basedir"
+
+  # install as provided
+  install -Dm644 COPYING -t "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm644 {cmos.ram,readme.txt,rpc.cfg} -t "$_basedir"
+  install -Dm755 "$_pkgname" "$_basedir/$_pkgname"
+  cp -a "hostfs" "poduleroms" "riscos-progs" "roms" "$_basedir"
+
+  # create a script to set working directory (to find roms) and run $_pkgname
+  echo -e '#!/bin/sh'"\ncd $_systdir/$pkgname\n./$_pkgname" >"$_basedir/$pkgname"
+  chmod 755 "$_basedir/$pkgname"
+  ln -s "$_systdir/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+
+  # these must be writable (group) for rpcemu to function
+  chown root:users -R "$_basedir"
+  chmod g+w "$_basedir"/{cmos.ram,rpc.cfg,roms,hostfs,hostfs/Network}
 }
- 
-# vim:set ts=2 sw=2 et:
diff --git a/rpcemu.changelog b/rpcemu.changelog
deleted file mode 100644
index a4cf4cd9bc1f..000000000000
--- a/rpcemu.changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-Version 0.8.15 - 26/10/2016
-
-Issue with 8MB VRAM being less stable has been resolved, code is now correctly allowed in the 2-8MB area.
-ARM SWP instruction correctly handles unaligned access.
-Enhancements to TLB to correctly flush caches on more operations.
diff --git a/rpcemu.install b/rpcemu.install
index 5a20f6b3c3a8..12ea1152ec92 100644
--- a/rpcemu.install
+++ b/rpcemu.install
@@ -1,13 +1,11 @@
-#!/bin/bash
-
 post_install() {
   cat << _EOF
 
-  RPCEmu needs RISC OS ROMs files in /usr/share/rpcemu/roms
-  For information on how to acquire ROM images please visit
+  RPCEmu needs RISC OS ROM files placed in /usr/share/rpcemu/roms
+  For useage information and how to acquire ROM images please visit
   http://www.marutan.net/rpcemu
 
-  Configuration file is /usr/share/rpcemu/rpc.cfg
+  The configuration file is /usr/share/rpcemu/rpc.cfg
 
 _EOF
 }
@@ -15,7 +13,7 @@ _EOF
 post_remove() {
   cat << _EOF
 
-  Check for leftover files in /usr/share/rpcemu
+  Manually remove any leftover files in /usr/share/rpcemu
 
 _EOF
 }