[pkgsrc/trunk]: pkgsrc/emulators/aranym aranym: Update to 1.1.0

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators/aranym aranym: Update to 1.1.0
From: nia <nia%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 12:00:16 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e55c851aac0
branches:  trunk
changeset: 401905:6e55c851aac0
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Oct 01 14:54:59 2019 +0000

description:
aranym: Update to 1.1.0

2019/04/14 - version 1.1.0 released
==========

 List of changes in this release is 60 pages long! No wonder as it's been
 four and half years since previous release, and the development never
 stopped, mainly thanks to Thorsten. See the 'ChangeLog' file for details.

 Tons of things have been fixed in all areas of the ARAnyM, and lots of
 new features have been added. Following list is incomplete but still gives
 you a good overview:

 Notable changes:
 ----------------
 * ARAnyM is hosted by GitHub.com at https://aranym.github.io/
 * there are automated builds for x86/amd64, armhf and macOS
 * added hotkey for turning audio on/off
 * HostFS MiNT file locking implemented
 * nfosmesa updated to OpenGL 4.6
 * MetaDOS driver improved
 * hotkeys work in the Setup GUI dialog as well
 * configurable directory for screenshots (via Setup GUI)
 * on macOS the configuration file is now looked up first
   in ~/Documents/Aranym_files (if it does not exist yet)
 * displaying non-ASCII characters in the fileselector
   should work now
 * path of loaded TOS/EmuTOS can now be selected in the Setup GUI
 * JIT CPU compiler now supports Solaris
 * JIT CPU compiler now supports more 64bit hosts (like kfreebsd)

 New features:
 -------------
 * NatFeat SCSI driver for Linux
 * NatFeat host exec
 * NatFeat for query/set CPU JIT
 * NatFeat for ARAnyM exit
 * new command line option --option
   that can set any value from the config file
 * AppImage can now be built

diffstat:

 emulators/aranym/MESSAGE          |  10 +---
 emulators/aranym/Makefile         |  85 ++++++++++++++++++--------------------
 emulators/aranym/PLIST            |  20 +++++---
 emulators/aranym/distinfo         |  28 +++++------
 emulators/aranym/patches/patch-ab |   4 +-
 emulators/aranym/patches/patch-ad |  27 +++++++++---
 emulators/aranym/patches/patch-ae |   4 +-
 7 files changed, 95 insertions(+), 83 deletions(-)

diffs (275 lines):

diff -r 89e71513ecf1 -r 6e55c851aac0 emulators/aranym/MESSAGE
--- a/emulators/aranym/MESSAGE  Tue Oct 01 14:54:31 2019 +0000
+++ b/emulators/aranym/MESSAGE  Tue Oct 01 14:54:59 2019 +0000
@@ -1,11 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2008/08/07 16:19:34 hauke Exp $
+$NetBSD: MESSAGE,v 1.2 2019/10/01 14:54:59 nia Exp $
 
-       For a start, copy the ${PREFIX}/share/doc/aranym/config file
-       to ~/.aranym/config.
-
-       The aranym emulator can either use an image of your
-       Atari Falcon 4.0.4 ROMs, or the EmuTOS image installed
-       in ${PREFIX}/share/aranym/etos512k.img.
+Before starting Aranym, copy the ${PREFIX}/share/doc/aranym/config file to
+~/.aranym/config.
 
 ===========================================================================
diff -r 89e71513ecf1 -r 6e55c851aac0 emulators/aranym/Makefile
--- a/emulators/aranym/Makefile Tue Oct 01 14:54:31 2019 +0000
+++ b/emulators/aranym/Makefile Tue Oct 01 14:54:59 2019 +0000
@@ -1,31 +1,33 @@
-# $NetBSD: Makefile,v 1.36 2018/03/17 01:15:09 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.37 2019/10/01 14:54:59 nia Exp $
 
-ETVER=                         0.9.4
-DISTNAME=                      aranym_1.0.2.orig
-PKGNAME=                       ${DISTNAME:S/_/-/:S/.orig//}
-PKGREVISION=                   2
-CATEGORIES=                    emulators
-MASTER_SITES=                  ${MASTER_SITE_SOURCEFORGE:=aranym/}
-SITES.emutos-512k-${ETVER}.zip=        ${MASTER_SITE_SOURCEFORGE:=emutos/}
-DISTFILES=                     ${DEFAULT_DISTFILES} emutos-512k-${ETVER}.zip
+DISTNAME=      aranym_1.1.0.orig
+PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
+CATEGORIES=    emulators
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=aranym/}
+GITHUB_PROJECT=        aranym
+GITHUB_RELEASE=        ARANYM_1_1_0
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              https://aranym.github.io/
-COMMENT=               Atari Running on Any Machine
-LICENSE=               gnu-gpl-v2
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://aranym.github.io/
+COMMENT=       Atari Running on Any Machine
+LICENSE=       gnu-gpl-v2
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
+ETVER=         0.9.11
 
-AUTOCONF_REQD=         2.50
+SITES.emutos-512k-${ETVER}.zip= \
+       ${MASTER_SITE_SOURCEFORGE:=emutos/}
+
+DISTFILES=     ${DEFAULT_DISTFILES} emutos-512k-${ETVER}.zip
 
-USE_TOOLS+=            autoconf gmake gzip
-USE_LANGUAGES=         c c++
-GNU_CONFIGURE=         yes
-MANCOMPRESSED=         yes
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
+USE_TOOLS+=    pkg-config perl
+USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
+MANCOMPRESSED= yes
 
 CONFIGURE_ARGS+=       --enable-fullmmu
 CONFIGURE_ARGS+=       --enable-atc=full
+CONFIGURE_ARGS+=       --disable-sdltest
 
 EMUTOS_WRKSRC=         ${WRKDIR}/emutos-512k-${ETVER}
 EMUTOS_DOC_DIR=                ${PREFIX}/share/doc/aranym/emutos
@@ -37,34 +39,16 @@
 SUBST_STAGE.paths=     post-build
 SUBST_FILES.paths=     doc/config
 SUBST_FILES.paths+=    doc/aranym.1
-SUBST_SED.paths=       -e "s|/usr/share/|${PREFIX}/share/|g"
-SUBST_SED.paths+=      -e "s|/usr/local/share/|${PREFIX}/share/|g"
-SUBST_MESSAGE.paths=   Fixing hardcoded paths.
-
-.include "options.mk"
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS.Linux+= --enable-nfpci
-
-.if !empty(MACHINE_PLATFORM:MLinux-*-i386)
-CONFIGURE_ARGS+=       --enable-jit-compiler
-CONFIGURE_ARGS+=       --enable-jit-fpu
-.endif
-
-# This appears if it thinks it can use tun/tap interfaces.
-# (While NetBSD has these, the configure test rejects it.)
-PLIST_VARS+=           aratapif
-.if !empty(MACHINE_PLATFORM:MLinux-*-*) || \
-       !empty(MACHINE_PLATFORM:MDarwin-*-*)
-PLIST.aratapif=                yes
-.endif
+SUBST_VARS.paths+=     PREFIX
+SUBST_SED.paths+=      -e "s|/usr/share/|${PREFIX}/share/|g"
+SUBST_MESSAGE.paths=   Setting path to PREFIX.
 
 INSTALLATION_DIRS+=    ${EMUTOS_DOC_DIR} ${EMUTOS_ROM_DIR}
 
-pre-configure:
-       cd ${WRKSRC} && autoconf
-
 post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/aranym-jit.1
+       ${RM} -f ${DESTDIR}${PREFIX}/share/applications/aranym.desktop
+       ${RM} -f ${DESTDIR}${PREFIX}/share/applications/aranym-jit.desktop
        ${INSTALL_DATA} ${EMUTOS_WRKSRC}/etos512k.img ${DESTDIR}${EMUTOS_ROM_DIR}
        ${INSTALL_DATA} ${EMUTOS_WRKSRC}/readme.txt ${DESTDIR}${EMUTOS_DOC_DIR}
        ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/announce.txt ${DESTDIR}${EMUTOS_DOC_DIR}
@@ -73,6 +57,17 @@
        ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/license.txt ${DESTDIR}${EMUTOS_DOC_DIR}
        ${INSTALL_DATA} ${EMUTOS_WRKSRC}/doc/status.txt ${DESTDIR}${EMUTOS_DOC_DIR}
 
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} != "Darwin"
+.  if !empty(PKG_BUILD_OPTIONS.SDL2:Mopengl)
+.    include "../../graphics/glu/buildlink3.mk"
+.  else
+CONFIGURE_ARGS+=       --disable-opengl
+.  endif
+.endif
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../math/mpfr/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 89e71513ecf1 -r 6e55c851aac0 emulators/aranym/PLIST
--- a/emulators/aranym/PLIST    Tue Oct 01 14:54:31 2019 +0000
+++ b/emulators/aranym/PLIST    Tue Oct 01 14:54:59 2019 +0000
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2015/03/24 14:34:57 ryoon Exp $
-bin/aranym
-${PLIST.aratapif}bin/aratapif
-man/man1/aranym-jit.1
+@comment $NetBSD: PLIST,v 1.8 2019/10/01 14:54:59 nia Exp $
+bin/aranym-mmu
 man/man1/aranym-mmu.1
 man/man1/aranym.1
-${PLIST.aratapif}man/man1/aratapif.1
+share/applications/aranym-mmu.desktop
 share/aranym/arabridge
 share/aranym/atari/hostfs/README
 share/aranym/atari/hostfs/bdconfig.sys
@@ -18,7 +16,7 @@
 share/aranym/atari/tools/pc101us.kbd.bz2
 share/aranym/etos512k.img
 share/aranym/floppy.sh
-share/aranym/logo.png
+share/aranym/logo.bmp
 share/aranym/wm_icon.bmp
 share/doc/aranym/AUTHORS
 share/doc/aranym/BUGS
@@ -36,6 +34,14 @@
 share/doc/aranym/emutos/license.txt
 share/doc/aranym/emutos/readme.txt
 share/doc/aranym/emutos/status.txt
-@pkgdir share/aranym/atari/nfosmesa
+share/icons/hicolor/32x32/apps/aranym-jit.png
+share/icons/hicolor/32x32/apps/aranym-mmu.png
+share/icons/hicolor/32x32/apps/aranym.png
+share/icons/hicolor/48x48/apps/aranym-jit.png
+share/icons/hicolor/48x48/apps/aranym-mmu.png
+share/icons/hicolor/48x48/apps/aranym.png
+share/pixmaps/aranym-jit.png
+share/pixmaps/aranym-mmu.png
+share/pixmaps/aranym.png
 @pkgdir share/aranym/atari/nfjpeg
 @pkgdir share/aranym/atari/nfcdrom
diff -r 89e71513ecf1 -r 6e55c851aac0 emulators/aranym/distinfo
--- a/emulators/aranym/distinfo Tue Oct 01 14:54:31 2019 +0000
+++ b/emulators/aranym/distinfo Tue Oct 01 14:54:59 2019 +0000
@@ -1,16 +1,14 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 20:30:55 agc Exp $
+$NetBSD: distinfo,v 1.16 2019/10/01 14:54:59 nia Exp $
 
-SHA1 (aranym_1.0.2.orig.tar.gz) = ac46a8c8d5c572e07e30458444f68b2dcbb7df2a
-RMD160 (aranym_1.0.2.orig.tar.gz) = 68c6813ce38f495916156cb39ab216e9d67a50e4
-SHA512 (aranym_1.0.2.orig.tar.gz) = 5fb88b77df33e46c0000977ed256b795f6cf040079cfbbb9af91ce8578f2ea385c2ffeeba7cf90ae53b0c4341458639b5643d07edc7bbd3f7e772a0e9659a01d
-Size (aranym_1.0.2.orig.tar.gz) = 2100463 bytes
-SHA1 (emutos-512k-0.9.4.zip) = b46f81dec4574afdc670da14b3bf92452a278a7d
-RMD160 (emutos-512k-0.9.4.zip) = b6e9411090474f8d4eb060d97d1d5a91ccd60f79
-SHA512 (emutos-512k-0.9.4.zip) = 00c8718f364712f5d346859dc40ed83c1792521c9600520aacf199f7d6b24d5cf7a3e2533e1e343d6aa9e77ed3056f8636713bb7c3e9739254e0658c921a78a8
-Size (emutos-512k-0.9.4.zip) = 314877 bytes
-SHA1 (patch-ab) = 8796751780cc559acd089298f3e8a0918d36db3a
-SHA1 (patch-ac) = 8899894456b01c84efd9f96f553750c87df7c21a
-SHA1 (patch-ad) = bb8d6b2ecd0c0066f3032a0ef196a1adb51d1786
-SHA1 (patch-ae) = 6c7ab7cf17bb9da5944c9a09474079bcfe7e7f43
-SHA1 (patch-configure.ac) = 47da314e86b00c9779fc82250de1f6d7a5d65fcd
-SHA1 (patch-src_uae__cpu_fpu_fpu__mpfr.cpp) = c492c198a746d62470112b7a7367692d47e16b61
+SHA1 (aranym_1.1.0.orig.tar.gz) = 88901bba4c727896f32cd0fc3529babe54d35dd2
+RMD160 (aranym_1.1.0.orig.tar.gz) = 16a6ddc730e3d3847b01cf07a5b516377e080fca
+SHA512 (aranym_1.1.0.orig.tar.gz) = 723b1a7c80532734e1dea288dbffd66746d9c7d1302ccb0259248a26aac5dedc7f66a134929de7064686af6c676d10918d90e2cf58cb010fd445979945177b51
+Size (aranym_1.1.0.orig.tar.gz) = 3785612 bytes
+SHA1 (emutos-512k-0.9.11.zip) = 4ee620306af2b37f97f0e619370cf86841649112
+RMD160 (emutos-512k-0.9.11.zip) = 01ba1677f7dbf1c224830d3092ce2695344fc23c
+SHA512 (emutos-512k-0.9.11.zip) = b4f8e401dc3263b9040ed17bc0270aa1090519fa4b49802b9d7812a5e4e646b83bf9c459e24880aa6b85e6c0b66c4c69438303f0b8e4085b6a310a461956645e
+Size (emutos-512k-0.9.11.zip) = 284126 bytes
+SHA1 (patch-ab) = 471cd0af0571eb63142c7933911e70500afeba6d
+SHA1 (patch-ad) = 3f715630ead6f0cb10d0bf71751c07d12e58e0f3
+SHA1 (patch-ae) = 21fecc68e1b2a3548d57f2908264122ed950dfdb
+SHA1 (patch-configure) = 1520c311d534e3aae1d257279cecc5ff39be6a4b
diff -r 89e71513ecf1 -r 6e55c851aac0 emulators/aranym/patches/patch-ab
--- a/emulators/aranym/patches/patch-ab Tue Oct 01 14:54:31 2019 +0000
+++ b/emulators/aranym/patches/patch-ab Tue Oct 01 14:54:59 2019 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2008/07/30 14:08:59 hauke Exp $
+$NetBSD: patch-ab,v 1.3 2019/10/01 14:54:59 nia Exp $
+
+This script works in standard sh.
 
 --- tools/arabridge.orig       2006-02-11 10:46:41.000000000 +0100
 +++ tools/arabridge
diff -r 89e71513ecf1 -r 6e55c851aac0 emulators/aranym/patches/patch-ad
--- a/emulators/aranym/patches/patch-ad Tue Oct 01 14:54:31 2019 +0000
+++ b/emulators/aranym/patches/patch-ad Tue Oct 01 14:54:59 2019 +0000
@@ -1,6 +1,10 @@
-$NetBSD: patch-ad,v 1.1 2008/08/07 16:19:34 hauke Exp $
+$NetBSD: patch-ad,v 1.2 2019/10/01 14:54:59 nia Exp $
+
+Preconfigure some reasonable defaults.
 
---- doc/config.orig    2008-01-26 12:01:41.000000000 +0100
+48000 Hz is a reasonable value for modern (~last 20 years) sound devices.
+
+--- doc/config.orig    2019-04-14 14:11:29.000000000 +0000
 +++ doc/config
 @@ -5,13 +5,13 @@
  FastRAM = 0
@@ -9,12 +13,21 @@
 -Floppy = /dev/fd0
 +Floppy = /dev/fd0a
  
- # location of TOS 4.04 ROM image (full path)
- TOS = /usr/local/share/aranym/ROM
+ # location of TOS 4.04 ROM image (can be full path, relative to config file or relative to HOME directory)
+ TOS = ROM
  
- # location of EmuTOS (full path)
--EmuTOS = 
-+EmuTOS = /usr/local/share/aranym/etos512k.img
+ # location of EmuTOS (can be full path, relative to config file or relative to HOME directory)
+-EmuTOS = emutos-aranym.img
++EmuTOS = @PREFIX@/share/aranym/etos512k.img
  
  # location of FreeMiNT kernel (full path)
  Bootstrap =
+@@ -271,7 +271,7 @@ UseHostMouseCursor = No
+ [AUDIO]
+ # Host audio device settings
+ #  Frequency
+-Frequency = 22050
++Frequency = 48000
+ #  Number of channels (2 for stereo, 1 for mono)
+ Channels = 2
+ #  Bits per channel (8 or 16)
diff -r 89e71513ecf1 -r 6e55c851aac0 emulators/aranym/patches/patch-ae
--- a/emulators/aranym/patches/patch-ae Tue Oct 01 14:54:31 2019 +0000
+++ b/emulators/aranym/patches/patch-ae Tue Oct 01 14:54:59 2019 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.1 2010/07/08 11:28:05 obache Exp $
+$NetBSD: patch-ae,v 1.2 2019/10/01 14:54:59 nia Exp $
+
+Shell portability.
 
 --- src/Unix/darwin/aratapif.sh.orig   2008-02-05 21:37:06.000000000 +0000
 +++ src/Unix/darwin/aratapif.sh
Prev by Date: [pkgsrc/trunk]: pkgsrc/biology/py-pydicom py-pydicom: Update to 1.3.0
Next by Date: [pkgsrc/trunk]: pkgsrc/emulators/aranym/patches aranym: Add missing patch
Previous by Thread: [pkgsrc/trunk]: pkgsrc/biology/py-pydicom py-pydicom: Update to 1.3.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/emulators/aranym/patches aranym: Add missing patch
Indexes:
Home | Main Index | Thread Index | Old Index