Received: by mail.netbsd.org (Postfix, from userid 605) id 3EFD884E7D; Thu, 14 Dec 2017 22:12:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BA15284DF0 for ; Thu, 14 Dec 2017 22:12:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ZIr5D3gZzTHP for ; Thu, 14 Dec 2017 22:12:19 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9E76184D50 for ; Thu, 14 Dec 2017 22:12:19 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 99A54FB40; Thu, 14 Dec 2017 22:12:19 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1513289539104430" MIME-Version: 1.0 Date: Thu, 14 Dec 2017 22:12:19 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/emulators/atari800 To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20171214221219.99A54FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1513289539104430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Dec 14 22:12:19 UTC 2017 Modified Files: pkgsrc/emulators/atari800: Makefile distinfo Added Files: pkgsrc/emulators/atari800/patches: patch-cfg.c patch-configure patch-sound__oss.c Removed Files: pkgsrc/emulators/atari800: options.mk pkgsrc/emulators/atari800/patches: patch-aa patch-ab patch-ad Log Message: atari800: updated to 3.1.0 Version 3.1.0: General new features: --------------------- * More accurate emulation of PAL colours (based on analysis of oscillograms of real PAL GTIA output) * Improved PAL blending, working on all grayscale pixels and is accurate now (can be enabled/disabled in "TV effect" display settings) * common sound layer implemented (SDL, JavaNVM, OSS, DOS) with synchro sound. * synchronized sound is now supported by both POKEY sound engines. * turbo mode (F12) is considerably faster * Added cartridge mapping used by "Turbo Hit"/"Atari Blizzard Hit". * Added MegaMax 2 MB cartridge mapping. * Added read-only support for the 4 MB Flash MegaCart mapping. * Added minimal support for The!Cart. General Fixes: -------------- * fixed possible unnecessary cartridge bank switching * fixes and clean up in Java port * fixed diagnostic cartridge cold start (doesn't send Start+Option) * fixed two old bugs in DOS sound (pitch being wrong and sound missing) * fixed keyboard not working for ncurses video and OSS sound To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 pkgsrc/emulators/atari800/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/atari800/distinfo cvs rdiff -u -r1.6 -r0 pkgsrc/emulators/atari800/options.mk cvs rdiff -u -r1.6 -r0 pkgsrc/emulators/atari800/patches/patch-aa cvs rdiff -u -r1.9 -r0 pkgsrc/emulators/atari800/patches/patch-ab cvs rdiff -u -r1.8 -r0 pkgsrc/emulators/atari800/patches/patch-ad cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/atari800/patches/patch-cfg.c \ pkgsrc/emulators/atari800/patches/patch-configure \ pkgsrc/emulators/atari800/patches/patch-sound__oss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1513289539104430 Content-Disposition: inline Content-Length: 6823 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/atari800/Makefile diff -u pkgsrc/emulators/atari800/Makefile:1.52 pkgsrc/emulators/atari800/Makefile:1.53 --- pkgsrc/emulators/atari800/Makefile:1.52 Sat Apr 25 14:20:44 2015 +++ pkgsrc/emulators/atari800/Makefile Thu Dec 14 22:12:19 2017 @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.52 2015/04/25 14:20:44 tnn Exp $ +# $NetBSD: Makefile,v 1.53 2017/12/14 22:12:19 adam Exp $ -DISTNAME= atari800-3.0.0 -PKGREVISION= 1 +DISTNAME= atari800-3.1.0 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=atari800/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} xf25.zip MAINTAINER= adam@NetBSD.org -HOMEPAGE= http://atari800.sourceforge.net/ +HOMEPAGE= https://atari800.github.io/ COMMENT= Atari 800, 800XL, 130XE and 5200 emulator LICENSE= gnu-gpl-v2 @@ -19,26 +18,28 @@ NO_SRC_ON_FTP= ${RESTRICTED} WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_TOOLS+= gmake unzip +CONFIGURE_ARGS+= --disable-sdltest +CONFIGURE_ARGS+= --with-sound=sdl +CONFIGURE_ARGS+= --with-video=sdl GNU_CONFIGURE= yes INSTALLATION_DIRS+= ${PREFIX}/share/atari800 -.include "options.mk" - # override HOME to avoid picking up a bad ${HOME}/.atari800 during the build MAKE_FLAGS+= HOME=${WRKSRC} post-extract: cd ${WRKDIR} && unzip -Lqo ${DISTDIR}/xf25.zip - sed -e 's,@PREFIX@,${PREFIX},g' <${FILESDIR}/atari800.cfg \ + sed -e 's,@PREFIX@,${PREFIX},g' ${FILESDIR}/atari800.cfg \ >${WRKSRC}/atari800.cfg post-install: ${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \ ${WRKSRC}/atari800.cfg ${DESTDIR}${PREFIX}/share/atari800/ -.include "../../mk/readline.buildlink3.mk" +.include "../../devel/SDL/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" +.include "../../mk/readline.buildlink3.mk" .include "../../mk/termcap.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/emulators/atari800/distinfo diff -u pkgsrc/emulators/atari800/distinfo:1.20 pkgsrc/emulators/atari800/distinfo:1.21 --- pkgsrc/emulators/atari800/distinfo:1.20 Thu Mar 23 17:06:49 2017 +++ pkgsrc/emulators/atari800/distinfo Thu Dec 14 22:12:19 2017 @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.20 2017/03/23 17:06:49 joerg Exp $ +$NetBSD: distinfo,v 1.21 2017/12/14 22:12:19 adam Exp $ -SHA1 (atari800-3.0.0.tar.gz) = 24dca4580805d2c1d6aa28a2b440c552a2dd171f -RMD160 (atari800-3.0.0.tar.gz) = 705e132d8f0e8a17f520a011fe6074bc27a6de20 -SHA512 (atari800-3.0.0.tar.gz) = 516afead4c03481afe426b4a8a9d0d71d95b1cfc02714372da694e885aee47c76296e7776220bb527a439c5d464a25408edc149dc4d6b6f042fd21061b420388 -Size (atari800-3.0.0.tar.gz) = 1480143 bytes +SHA1 (atari800-3.1.0.tar.gz) = d81d57ae8cc14169521e3738d3ac1b2e18a95080 +RMD160 (atari800-3.1.0.tar.gz) = 8644aec61b8f9084d7ced672236d779bee1fedcc +SHA512 (atari800-3.1.0.tar.gz) = c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe +Size (atari800-3.1.0.tar.gz) = 1492289 bytes SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42 RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7 SHA512 (xf25.zip) = 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923 Size (xf25.zip) = 188942 bytes -SHA1 (patch-aa) = 2bd0dc856397aec91f01ad3ab0f3835d6e062aed -SHA1 (patch-ab) = 23062b3f9f858914c668b522e2a76d068dd24abf SHA1 (patch-ac) = 28a10768c6214cbe3cad9006916dbfa28b70eb96 -SHA1 (patch-ad) = 1567687cd851d606616aa35dc36a4e63e839181a +SHA1 (patch-cfg.c) = c8f22ca08b4fad2c24886dc8132c7269331b4f39 +SHA1 (patch-configure) = 9ad06b6a273b8efe6c628e40cde7ce4e304675cd SHA1 (patch-rdevice.c) = 9c17f7e600db506e7e6e9f1f3780e66b404813be +SHA1 (patch-sound__oss.c) = 7318f96c460bbd9cb116401328e2368ce7be29ab Added files: Index: pkgsrc/emulators/atari800/patches/patch-cfg.c diff -u /dev/null pkgsrc/emulators/atari800/patches/patch-cfg.c:1.1 --- /dev/null Thu Dec 14 22:12:19 2017 +++ pkgsrc/emulators/atari800/patches/patch-cfg.c Thu Dec 14 22:12:19 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-cfg.c,v 1.1 2017/12/14 22:12:19 adam Exp $ + +Provide PkgSrc path for the configuration file. + +--- cfg.c.orig 2014-04-05 19:40:14.000000000 +0000 ++++ cfg.c +@@ -68,7 +68,7 @@ int CFG_save_on_exit = FALSE; + #endif + + #ifndef SYSTEM_WIDE_CFG_FILE +-#define SYSTEM_WIDE_CFG_FILE "/etc/atari800.cfg" ++#define SYSTEM_WIDE_CFG_FILE PREFIX "/share/atari800/atari800.cfg" + #endif + + static char rtconfig_filename[FILENAME_MAX]; Index: pkgsrc/emulators/atari800/patches/patch-configure diff -u /dev/null pkgsrc/emulators/atari800/patches/patch-configure:1.1 --- /dev/null Thu Dec 14 22:12:19 2017 +++ pkgsrc/emulators/atari800/patches/patch-configure Thu Dec 14 22:12:19 2017 @@ -0,0 +1,39 @@ +$NetBSD: patch-configure,v 1.1 2017/12/14 22:12:19 adam Exp $ + +Compatibility fixes. + +--- configure.orig 2014-04-12 14:00:06.000000000 +0000 ++++ configure +@@ -7577,11 +7577,8 @@ $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 + 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; Index: pkgsrc/emulators/atari800/patches/patch-sound__oss.c diff -u /dev/null pkgsrc/emulators/atari800/patches/patch-sound__oss.c:1.1 --- /dev/null Thu Dec 14 22:12:19 2017 +++ pkgsrc/emulators/atari800/patches/patch-sound__oss.c Thu Dec 14 22:12:19 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-sound__oss.c,v 1.1 2017/12/14 22:12:19 adam Exp $ + +Do not hard-code sound device. + +--- sound_oss.c.orig 2013-12-15 23:17:45.000000000 +0000 ++++ sound_oss.c +@@ -36,7 +36,7 @@ + + #define DEBUG 0 + +-static const char * const dspname = "/dev/dsp"; ++static const char * const dspname = DEVOSSAUDIO; + + static int dsp_fd; + --_----------=_1513289539104430--