CVS commit: pkgsrc/emulators/atari800

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun May  5 10:12:59 UTC 2019

Modified Files:
        pkgsrc/emulators/atari800: Makefile distinfo
        pkgsrc/emulators/atari800/patches: patch-configure
Added Files:
        pkgsrc/emulators/atari800/patches: patch-src_sound__oss.c
Removed Files:
        pkgsrc/emulators/atari800/patches: patch-Makefile.in patch-cfg.c
            patch-sound__oss.c

Log Message:
atari800: updated to 4.1.0

Version 4.1.0:

New Features:
* Atari800 now includes Altirra BIOS-es for all emulated systems: 400/800,
  XL/XE, and 5200; as well as Altirra BASIC. It is now possible to use the
  emulator without providing any ROM images.

* The Altirra OS-es and Altirra BASIC can now be selected by users in the
  "System settings", if they want to use them. Previously Altirra OS was used
  automatically only when no other OS ROMs were found.

* joyhat support for all four real joysticks, configurable in CLI/cfg/TUI

Notable changes:
* All documentation specific to building Atari800 on Windows has been moved
  from DOC/INSTALL to a new file, DOC/BUILD.windows. This document
  has also been expanded with a new chapter covering building Atari800 using
  MSYS2.

* Ability to use the built-in EmuOS firmware has been removed. Users wishing
  to run Atari800 without providing OS ROMs now have an option of using the
  built-in Altirra OS-es, which are compatible with much more Atari software
  than EmuOS.
  At the same time, it is still possible to compile a version of Atari800
  without any OS ROMs built in, by means of the --disable-altirra_bios
  configure option.

Port specific improvements:
== Atari Falcon ==
* More Videl/screen handling fixes
* Ability to run Atari800 in an AES-less environment
* Replaced C2P with MMU friendly and faster code
* Atari800 should run on all TOS clones with XBIOS Sound API

== Android ==
* Fixed building of the Android target, broken in the previous release.
* Fixed labels on console keys (unreadable on hi-res displays)
* Fixed console keys press detection
* Fixed "right-handed joystick" trigger press

== Raspberry Pi ==
* updated build documentation
* find proper Broadcom GLes libraries
* fixed bug in GRAPHICS 9 (shifted colors)

== MS Windows ==
* updated build documentation

General Fixes:
* updated build documentation
* it is possible to build atari800 out of source tree
* unconnected host joysticks initialized properly, fixes the MULE game


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/emulators/atari800/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/emulators/atari800/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/atari800/patches/patch-Makefile.in \
    pkgsrc/emulators/atari800/patches/patch-cfg.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/atari800/patches/patch-configure
cvs rdiff -u -r1.2 -r0 pkgsrc/emulators/atari800/patches/patch-sound__oss.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/atari800/patches/patch-src_sound__oss.c

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

Modified files:

Index: pkgsrc/emulators/atari800/Makefile
diff -u pkgsrc/emulators/atari800/Makefile:1.54 pkgsrc/emulators/atari800/Makefile:1.55
--- pkgsrc/emulators/atari800/Makefile:1.54     Sun Aug  5 21:27:04 2018
+++ pkgsrc/emulators/atari800/Makefile  Sun May  5 10:12:59 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.54 2018/08/05 21:27:04 adam Exp $
+# $NetBSD: Makefile,v 1.55 2019/05/05 10:12:59 adam Exp $
 
-DISTNAME=      atari800-4.0.0
+DISTNAME=      atari800-4.1.0-src
+PKGNAME=       ${DISTNAME:S/-src//}
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=atari800/}
+EXTRACT_SUFX=  .tgz
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} xf25.zip
 
 MAINTAINER=    adam%NetBSD.org@localhost
@@ -16,7 +18,7 @@ NO_BIN_ON_FTP=                ${RESTRICTED}
 NO_SRC_ON_CDROM=       ${RESTRICTED}
 NO_SRC_ON_FTP=         ${RESTRICTED}
 
-WRKSRC=                        ${WRKDIR}/${DISTNAME}/src
+WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=            gmake unzip
 CONFIGURE_ARGS+=       --disable-sdltest
 CONFIGURE_ARGS+=       --with-sound=sdl
@@ -28,6 +30,12 @@ INSTALLATION_DIRS+=  ${PREFIX}/share/atar
 # override HOME to avoid picking up a bad ${HOME}/.atari800 during the build
 MAKE_FLAGS+=   HOME=${WRKSRC}
 
+SUBST_CLASSES+=                cfg-path
+SUBST_STAGE.cfg-path=  pre-configure
+SUBST_MESSAGE.cfg-path=        Setting config path.
+SUBST_FILES.cfg-path=  src/cfg.c
+SUBST_SED.cfg-path=    -e 's,"/etc,"${PREFIX}/share/atari800,g'
+
 post-extract:
        cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/xf25.zip
        sed -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/atari800.cfg \

Index: pkgsrc/emulators/atari800/distinfo
diff -u pkgsrc/emulators/atari800/distinfo:1.23 pkgsrc/emulators/atari800/distinfo:1.24
--- pkgsrc/emulators/atari800/distinfo:1.23     Sun Aug  5 21:27:04 2018
+++ pkgsrc/emulators/atari800/distinfo  Sun May  5 10:12:59 2019
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.23 2018/08/05 21:27:04 adam Exp $
+$NetBSD: distinfo,v 1.24 2019/05/05 10:12:59 adam Exp $
 
-SHA1 (atari800-4.0.0.tar.gz) = c07a28a14d280a90c01f59705801f28943e0d198
-RMD160 (atari800-4.0.0.tar.gz) = 35006f7fd045e27e644eb70cf9700ba6b3e60179
-SHA512 (atari800-4.0.0.tar.gz) = 36483533af851896031cb48ed97abd34e9ab095f9079b4a3abd13b72c1f13004e3bcb3da02c356e2bb15556270ab229b4fc66ba70f10ff56ab0d6a73aa9a4a52
-Size (atari800-4.0.0.tar.gz) = 1534283 bytes
+SHA1 (atari800-4.1.0-src.tgz) = 70ef4211602be5b5003f361b32f31ad8df01942e
+RMD160 (atari800-4.1.0-src.tgz) = 8d665a11cb51760cfacc5015752846b3dd4d524b
+SHA512 (atari800-4.1.0-src.tgz) = 0eb5f072683c142b8baa30bd646cef58e1015ec85151446cbce408c7c063fb65560bc250a0da8dede8500fd273737a15325e89cdd7ea75df78d957999bd16a03
+Size (atari800-4.1.0-src.tgz) = 6784763 bytes
 SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
 RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
 SHA512 (xf25.zip) = 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
 Size (xf25.zip) = 188942 bytes
-SHA1 (patch-Makefile.in) = 9f742abfad1a6c8f48186914452bb03b84d4a376
-SHA1 (patch-cfg.c) = c8f22ca08b4fad2c24886dc8132c7269331b4f39
-SHA1 (patch-configure) = 9ad06b6a273b8efe6c628e40cde7ce4e304675cd
-SHA1 (patch-sound__oss.c) = c408b96e14adfc99f5132326a7918defde3086be
+SHA1 (patch-configure) = bd13b2352f6f3bf847639427bc707e63fecc406f
+SHA1 (patch-src_sound__oss.c) = 73b51491aee42e5657584bd8b58127e9cd8e5d87

Index: pkgsrc/emulators/atari800/patches/patch-configure
diff -u pkgsrc/emulators/atari800/patches/patch-configure:1.1 pkgsrc/emulators/atari800/patches/patch-configure:1.2
--- pkgsrc/emulators/atari800/patches/patch-configure:1.1       Thu Dec 14 22:12:19 2017
+++ pkgsrc/emulators/atari800/patches/patch-configure   Sun May  5 10:12:59 2019
@@ -1,39 +1,28 @@
-$NetBSD: patch-configure,v 1.1 2017/12/14 22:12:19 adam Exp $
+$NetBSD: patch-configure,v 1.2 2019/05/05 10:12:59 adam Exp $
 
 Compatibility fixes.
 
---- configure.orig     2014-04-12 14:00:06.000000000 +0000
+--- configure.orig     2019-04-14 08:27:50.000000000 +0000
 +++ configure
-@@ -7577,11 +7577,8 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME
+@@ -9050,10 +9050,7 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME
              LIBS="$LIBS $SDL_LIBS"
              CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
              if [ "$a8_host" = "win" ]; then
 -                CPPFLAGS=${CPPFLAGS/-Dmain=SDL_main/}
 -                LIBS=${LIBS/-lSDLmain/}
-                 OBJS="$OBJS SDL_win32_main.o"
                  CPPFLAGS="$CPPFLAGS -DNO_STDIO_REDIRECT"
 -                LIBS=${LIBS/-mwindows/}
              fi
              a8_use_sdl=yes
  
-@@ -8512,11 +8509,8 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME
+@@ -10114,10 +10111,7 @@ $as_echo "#define SUPPORTS_PLATFORM_TIME
              LIBS="$LIBS $SDL_LIBS"
              CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
              if [ "$a8_host" = "win" ]; then
 -                CPPFLAGS=${CPPFLAGS/-Dmain=SDL_main/}
 -                LIBS=${LIBS/-lSDLmain/}
-                 OBJS="$OBJS SDL_win32_main.o"
                  CPPFLAGS="$CPPFLAGS -DNO_STDIO_REDIRECT"
 -                LIBS=${LIBS/-mwindows/}
              fi
              a8_use_sdl=yes
  
-@@ -8870,7 +8864,7 @@ $as_echo "#define IDE 1" >>confdefs.h
- 
-     fi
- 
--if [ "$WANT_IDE" == "yes" ]; then
-+if [ "$WANT_IDE" = "yes" ]; then
-     # Check whether --enable-largefile was given.
- if test "${enable_largefile+set}" = set; then :
-   enableval=$enable_largefile;

Added files:

Index: pkgsrc/emulators/atari800/patches/patch-src_sound__oss.c
diff -u /dev/null pkgsrc/emulators/atari800/patches/patch-src_sound__oss.c:1.1
--- /dev/null   Sun May  5 10:12:59 2019
+++ pkgsrc/emulators/atari800/patches/patch-src_sound__oss.c    Sun May  5 10:12:59 2019
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_sound__oss.c,v 1.1 2019/05/05 10:12:59 adam Exp $
+
+Do not hard-code sound device.
+
+--- src/sound_oss.c.orig       2018-04-21 17:02:14.000000000 +0000
++++ src/sound_oss.c
+@@ -38,11 +38,7 @@
+ 
+ #define DEBUG 0
+ 
+-#if defined (__NetBSD__) || defined (__OpenBSD__)
+-static const char * const dspname = "/dev/audio";
+-#else
+-static const char * const dspname = "/dev/dsp";
+-#endif
++static const char * const dspname = DEVOSSAUDIO;
+ 
+ static int dsp_fd;
+