CVS commit: pkgsrc/emulators/rpcemu

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sat Oct 24 16:33:34 UTC 2020

Added Files:
        pkgsrc/emulators/rpcemu: DESCR Makefile PLIST distinfo
        pkgsrc/emulators/rpcemu/patches: patch-src-qt5-rpc-qt5.cpp
            patch-src-qt5-rpcemu.pro

Log Message:
Add emulators/rpcemu

RPCEmu is an emulator of Acorn's Risc PC and A7000 machines. It is a work in
progress and should be considered of Alpha Quality.

The latest version is available from, this also has links to compilation
instructions for various platforms.

    http://www.marutan.net/rpcemu/

The User Manual is available from

    http://www.marutan.net/rpcemu/manual/

RPCEmu requires a RISC OS ROM image to work; check here for details:

    http://www.marutan.net/rpcemu/manual/romimage.html

RPCEmu is licensed under the GPL, see COPYING for more details.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/rpcemu/DESCR \
    pkgsrc/emulators/rpcemu/Makefile pkgsrc/emulators/rpcemu/PLIST \
    pkgsrc/emulators/rpcemu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpc-qt5.cpp \
    pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpcemu.pro

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/emulators/rpcemu/DESCR
diff -u /dev/null pkgsrc/emulators/rpcemu/DESCR:1.1
--- /dev/null   Sat Oct 24 16:33:34 2020
+++ pkgsrc/emulators/rpcemu/DESCR       Sat Oct 24 16:33:34 2020
@@ -0,0 +1,17 @@
+RPCEmu is an emulator of Acorn's Risc PC and A7000 machines. It is a work in
+progress and should be considered of Alpha Quality.
+
+The latest version is available from, this also has links to compilation
+instructions for various platforms.
+
+    http://www.marutan.net/rpcemu/
+
+The User Manual is available from
+
+    http://www.marutan.net/rpcemu/manual/
+
+RPCEmu requires a RISC OS ROM image to work; check here for details:
+
+    http://www.marutan.net/rpcemu/manual/romimage.html
+
+RPCEmu is licensed under the GPL, see COPYING for more details.
Index: pkgsrc/emulators/rpcemu/Makefile
diff -u /dev/null pkgsrc/emulators/rpcemu/Makefile:1.1
--- /dev/null   Sat Oct 24 16:33:34 2020
+++ pkgsrc/emulators/rpcemu/Makefile    Sat Oct 24 16:33:34 2020
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2020/10/24 16:33:34 js Exp $
+
+DISTNAME=      rpcemu-0.9.3
+CATEGORIES=    emulators
+MASTER_SITES=  http://www.marutan.net/rpcemu/cgi/download.php?sFName=${PKGVERSION_NOREV}/
+
+MAINTAINER=    js%pkgsrc.org@localhost
+HOMEPAGE=      https://www.marutan.net/rpcemu/
+COMMENT=       Emulator of classic Acorn computer systems
+LICENSE=       gnu-gpl-v2
+
+USE_LANGUAGES= c c++
+TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+
+INSTALLATION_DIRS+=    bin
+
+do-configure:
+       cd ${WRKSRC} && ${QTDIR}/bin/qmake src/qt5/rpcemu.pro
+
+do-install:
+       ${INSTALL} -m 0755 ${WRKSRC}/rpcemu-interpreter \
+               ${DESTDIR}${PREFIX}/bin/rpcemu-interpreter
+
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/emulators/rpcemu/PLIST
diff -u /dev/null pkgsrc/emulators/rpcemu/PLIST:1.1
--- /dev/null   Sat Oct 24 16:33:34 2020
+++ pkgsrc/emulators/rpcemu/PLIST       Sat Oct 24 16:33:34 2020
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2020/10/24 16:33:34 js Exp $
+bin/rpcemu-interpreter
Index: pkgsrc/emulators/rpcemu/distinfo
diff -u /dev/null pkgsrc/emulators/rpcemu/distinfo:1.1
--- /dev/null   Sat Oct 24 16:33:34 2020
+++ pkgsrc/emulators/rpcemu/distinfo    Sat Oct 24 16:33:34 2020
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2020/10/24 16:33:34 js Exp $
+
+SHA1 (rpcemu-0.9.3.tar.gz) = bc72bc7defa741459f2e1797f8d7a326c5513d64
+RMD160 (rpcemu-0.9.3.tar.gz) = 0e2b74257a0f9bbde1d696e891729ee0900ac27a
+SHA512 (rpcemu-0.9.3.tar.gz) = e785f0e911cf96a33a780289f0da69ef0e0d33d3383746825c205653e3aba34d255297cf3bf17c1eb3a5f7cd4c7f5550b7f6cbb10625b9e3d5618fa96c8732b1
+Size (rpcemu-0.9.3.tar.gz) = 384962 bytes
+SHA1 (patch-src-qt5-rpc-qt5.cpp) = 1971048028c3cb17d86ca454e8efdaff305a6e08
+SHA1 (patch-src-qt5-rpcemu.pro) = f575887375cef917a7efd6730a74beb07aeb271f

Index: pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpc-qt5.cpp
diff -u /dev/null pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpc-qt5.cpp:1.1
--- /dev/null   Sat Oct 24 16:33:34 2020
+++ pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpc-qt5.cpp   Sat Oct 24 16:33:34 2020
@@ -0,0 +1,35 @@
+$NetBSD: patch-src-qt5-rpc-qt5.cpp,v 1.1 2020/10/24 16:33:34 js Exp $
+
+The qmake .pro only includes certain files when on Linux or Windows, but the
+code always assumes it's there, resulting in linker errors.
+
+--- src/qt5/rpc-qt5.cpp.orig   2020-05-06 19:19:23.000000000 +0000
++++ src/qt5/rpc-qt5.cpp
+@@ -554,6 +554,7 @@ Emulator::mainemuloop()
+                       inscount = 0;
+               }
+ 
++#ifdef CONFIG_SLIRP
+               // If NAT networking, poll, but not too often
+               if (config.network_type == NetworkType_NAT) {
+                       network_nat_rate++;
+@@ -561,6 +562,7 @@ Emulator::mainemuloop()
+                               network_nat_poll();
+                       }
+               }
++#endif
+       }
+ 
+       // Perform clean-up and finalising actions
+@@ -924,9 +926,11 @@ Emulator::network_config_updated(Network
+       QByteArray ba_ipaddress = ipaddress.toUtf8();
+       const char *ip_address = ba_ipaddress.constData();
+ 
++#ifdef CONFIG_NETWORK
+       if (network_config_changed(network_type, bridge_name, ip_address)) {
+               this->reset();
+       }
++#endif
+ }
+ 
+ /**
Index: pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpcemu.pro
diff -u /dev/null pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpcemu.pro:1.1
--- /dev/null   Sat Oct 24 16:33:34 2020
+++ pkgsrc/emulators/rpcemu/patches/patch-src-qt5-rpcemu.pro    Sat Oct 24 16:33:34 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-src-qt5-rpcemu.pro,v 1.1 2020/10/24 16:33:34 js Exp $
+
+Add a define to figure out network-related files are compiled.
+
+Disable debug mode to avoid error about QtWidgets_debug missing.
+
+--- src/qt5/rpcemu.pro.orig    2020-05-06 19:19:23.000000000 +0000
++++ src/qt5/rpcemu.pro
+@@ -1,6 +1,6 @@
+ # http://doc.qt.io/qt-5/qmake-tutorial.html
+ 
+-CONFIG += debug_and_release
++CONFIG += release
+ 
+ 
+ QT += core widgets gui multimedia
+@@ -125,6 +125,7 @@ win32 { 
+                       keyboard_win.c
+       HEADERS +=      ../network.h \
+                       network_dialog.h
++      DEFINES +=      CONFIG_NETWORK
+ 
+       RC_ICONS = ../win/rpcemu.ico
+ 
+@@ -139,6 +140,7 @@ linux {
+                       network_dialog.cpp
+       HEADERS +=      ../network.h \
+                       network_dialog.h
++      DEFINES +=      CONFIG_NETWORK
+ }
+ 
+ unix {