Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A5B5D84F44 for ; Fri, 21 Jul 2023 09:32:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id QfXkotF2xMXc for ; Fri, 21 Jul 2023 09:32:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 51D7984CF2 for ; Fri, 21 Jul 2023 09:32:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4F186FBDB; Fri, 21 Jul 2023 09:32:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1689931957249890" MIME-Version: 1.0 Date: Fri, 21 Jul 2023 09:32:37 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20230721093237.4F186FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1689931957249890 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Jul 21 09:32:37 UTC 2023 Modified Files: pkgsrc/emulators/gnuboy: DESCR Makefile PLIST distinfo pkgsrc/emulators/gnuboy-sdl: DESCR Makefile PLIST Added Files: pkgsrc/emulators/gnuboy: Makefile.common options.mk pkgsrc/emulators/gnuboy-sdl/files: gnuboy-sdl.6 pkgsrc/emulators/gnuboy/files: xgnuboy.6 Removed Files: pkgsrc/emulators/gnuboy-sdl: distinfo pkgsrc/emulators/gnuboy-sdl/patches: patch-aa patch-configure pkgsrc/emulators/gnuboy/patches: patch-aa patch-ab patch-ac patch-ad Log Message: gnuboy[-sdl]: Update to 1.0.4 (switch to modern fork) This gets us some fixes for modern compilers and systems, SDL2 support, and allows deleting a handful of patches. While here, import the manual pages from Debian. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/gnuboy/DESCR cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/gnuboy/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/gnuboy/Makefile.common \ pkgsrc/emulators/gnuboy/options.mk cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/gnuboy/PLIST cvs rdiff -u -r1.8 -r1.9 pkgsrc/emulators/gnuboy/distinfo cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/gnuboy-sdl/DESCR cvs rdiff -u -r1.16 -r1.17 pkgsrc/emulators/gnuboy-sdl/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/gnuboy-sdl/PLIST cvs rdiff -u -r1.7 -r0 pkgsrc/emulators/gnuboy-sdl/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/gnuboy-sdl/files/gnuboy-sdl.6 cvs rdiff -u -r1.2 -r0 pkgsrc/emulators/gnuboy-sdl/patches/patch-aa cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/gnuboy-sdl/patches/patch-configure cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/gnuboy/files/xgnuboy.6 cvs rdiff -u -r1.3 -r0 pkgsrc/emulators/gnuboy/patches/patch-aa \ pkgsrc/emulators/gnuboy/patches/patch-ab \ pkgsrc/emulators/gnuboy/patches/patch-ac cvs rdiff -u -r1.2 -r0 pkgsrc/emulators/gnuboy/patches/patch-ad Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1689931957249890 Content-Disposition: inline Content-Length: 11540 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/gnuboy/DESCR diff -u pkgsrc/emulators/gnuboy/DESCR:1.2 pkgsrc/emulators/gnuboy/DESCR:1.3 --- pkgsrc/emulators/gnuboy/DESCR:1.2 Fri Feb 14 20:08:37 2003 +++ pkgsrc/emulators/gnuboy/DESCR Fri Jul 21 09:32:36 2023 @@ -1,2 +1,10 @@ -gnuboy is a portable program for emulating the Nintendo GameBoy Color -software platform. +Welcome to gnuboy, one of the fastest if not the fastest GB/GBC emu- +lator available. + +gnuboy was written well over 20 years ago and achieved full speed +on most machines of that era, on today's machines it runs close to +0% CPU usage. + +Unlike most modern GB emulators, gnuboy doesn't strive to be +cycle-accurate (except where necessary), but to be fast, portable +and compatible and to provide a good gaming experience. Index: pkgsrc/emulators/gnuboy/Makefile diff -u pkgsrc/emulators/gnuboy/Makefile:1.15 pkgsrc/emulators/gnuboy/Makefile:1.16 --- pkgsrc/emulators/gnuboy/Makefile:1.15 Tue Oct 23 10:24:03 2012 +++ pkgsrc/emulators/gnuboy/Makefile Fri Jul 21 09:32:36 2023 @@ -1,30 +1,28 @@ -# $NetBSD: Makefile,v 1.15 2012/10/23 10:24:03 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2023/07/21 09:32:36 nia Exp $ -DISTNAME= gnuboy-1.0.3 -PKGREVISION= 2 -CATEGORIES= emulators games -MASTER_SITES= http://brightrain.aerifal.cx/~laguna/src/ +.include "Makefile.common" -MAINTAINER= njl@sdf.lonestar.org -#HOMEPAGE= http://gnuboy.unix-fu.org/ -COMMENT= Gameboy emulator +COMMENT= Fast gameboy emulator (X11 version) -GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-x -INSTALLATION_DIRS= bin -BUILDLINK_TRANSFORM+= rm:-fforce-mem +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= ${PKGMANDIR}/man6 +INSTALLATION_DIRS+= share/doc/gnuboy +INSTALLATION_DIRS+= share/examples/gnuboy do-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/gnuboy - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/gnuboy ${INSTALL_PROGRAM} ${WRKSRC}/xgnuboy ${DESTDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \ ${DESTDIR}${PREFIX}/share/examples/gnuboy/ ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/docs/* \ ${DESTDIR}${PREFIX}/share/doc/gnuboy/ + ${INSTALL_MAN} ${FILESDIR}/xgnuboy.6 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/xgnuboy.6 BUILDLINK_DEPMETHOD.libXt?= build +.include "options.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" Index: pkgsrc/emulators/gnuboy/PLIST diff -u pkgsrc/emulators/gnuboy/PLIST:1.4 pkgsrc/emulators/gnuboy/PLIST:1.5 --- pkgsrc/emulators/gnuboy/PLIST:1.4 Sun Jun 14 17:51:04 2009 +++ pkgsrc/emulators/gnuboy/PLIST Fri Jul 21 09:32:36 2023 @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:51:04 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2023/07/21 09:32:36 nia Exp $ bin/xgnuboy +man/man6/xgnuboy.6 share/doc/gnuboy/CHANGES share/doc/gnuboy/CONFIG share/doc/gnuboy/CREDITS Index: pkgsrc/emulators/gnuboy/distinfo diff -u pkgsrc/emulators/gnuboy/distinfo:1.8 pkgsrc/emulators/gnuboy/distinfo:1.9 --- pkgsrc/emulators/gnuboy/distinfo:1.8 Tue Oct 26 10:23:51 2021 +++ pkgsrc/emulators/gnuboy/distinfo Fri Jul 21 09:32:36 2023 @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 10:23:51 nia Exp $ +$NetBSD: distinfo,v 1.9 2023/07/21 09:32:36 nia Exp $ -BLAKE2s (gnuboy-1.0.3.tar.gz) = 7986d7c531d04e56a30f1f2732320caa4c690aa97e65ac1633bd5c91dc74e706 -SHA512 (gnuboy-1.0.3.tar.gz) = 89e8075dac5ec17b375a5739367b46c55130211fb487a052be1cca49a5d86cc1a7f1619b2b2473d744fbe3c51fdb1a11110b15836cc9cc9de588932b91d258e6 -Size (gnuboy-1.0.3.tar.gz) = 187627 bytes -SHA1 (patch-aa) = d99a316e40d1249685204f23e66e3709cefc03e3 -SHA1 (patch-ab) = e3fe25086d105864f4d127c84bfe3f3234820927 -SHA1 (patch-ac) = 1c3851d5a65c377b25fae529d4505fdb9dd12729 -SHA1 (patch-ad) = cac88fded5d8422824faf57d8d32ab571a611fc1 +BLAKE2s (gnuboy-1.0.4.tar.xz) = 4ea0a1d510e61e92d514d5d1726af675415e6fac005a8001452f1e4639d0e846 +SHA512 (gnuboy-1.0.4.tar.xz) = 04a86b3326e8ac944535275af1aa2d124dc4a59c5625463a41a1e8af0a6fef5e5e230209f1d05fdf32a10a2924750b2494a424afaa7ac1360a15ffa709cb5b5c +Size (gnuboy-1.0.4.tar.xz) = 188192 bytes Index: pkgsrc/emulators/gnuboy-sdl/DESCR diff -u pkgsrc/emulators/gnuboy-sdl/DESCR:1.1.1.1 pkgsrc/emulators/gnuboy-sdl/DESCR:1.2 --- pkgsrc/emulators/gnuboy-sdl/DESCR:1.1.1.1 Mon Jul 26 17:05:05 2004 +++ pkgsrc/emulators/gnuboy-sdl/DESCR Fri Jul 21 09:32:36 2023 @@ -1,2 +1,12 @@ -Gnuboy is a portable program for emulating the Nintendo GameBoy Color -software platform. This is the SDL port, with joystick support. +Welcome to gnuboy, one of the fastest if not the fastest GB/GBC emu- +lator available. + +gnuboy was written well over 20 years ago and achieved full speed +on most machines of that era, on today's machines it runs close to +0% CPU usage. + +Unlike most modern GB emulators, gnuboy doesn't strive to be +cycle-accurate (except where necessary), but to be fast, portable +and compatible and to provide a good gaming experience. + +This is the SDL2 port, with cross-platform controller support. Index: pkgsrc/emulators/gnuboy-sdl/Makefile diff -u pkgsrc/emulators/gnuboy-sdl/Makefile:1.16 pkgsrc/emulators/gnuboy-sdl/Makefile:1.17 --- pkgsrc/emulators/gnuboy-sdl/Makefile:1.16 Tue Aug 1 16:47:38 2017 +++ pkgsrc/emulators/gnuboy-sdl/Makefile Fri Jul 21 09:32:36 2023 @@ -1,29 +1,28 @@ -# $NetBSD: Makefile,v 1.16 2017/08/01 16:47:38 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2023/07/21 09:32:36 nia Exp $ -DISTNAME= gnuboy-1.0.3 -PKGNAME= ${DISTNAME:S/-/-sdl-/} -PKGREVISION= 7 -CATEGORIES= emulators -#MASTER_SITES= http://gnuboy.unix-fu.org/src/ +.include "../../emulators/gnuboy/Makefile.common" -MAINTAINER= pkgsrc-users@NetBSD.org -#HOMEPAGE= http://gnuboy.unix-fu.org/ -COMMENT= SDL port of Gameboy emulator +PKGNAME= ${DISTNAME:S/-/-sdl-/} -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-sdl +COMMENT= Fast gameboy emulator (SDL2 version) -INSTALLATION_DIRS= bin share/doc/gnuboy-sdl share/examples/gnuboy-sdl -BUILDLINK_TRANSFORM+= rm:-fforce-mem +CONFIGURE_ARGS+= --with-sdl2 +CONFIGURE_ARGS+= --with-sound=sdl -.include "../../devel/SDL/buildlink3.mk" +INSTALLATION_DIRS+= bin +INSTALLATION_DIRS+= ${PKGMANDIR}/man6 +INSTALLATION_DIRS+= share/doc/gnuboy-sdl +INSTALLATION_DIRS+= share/examples/gnuboy-sdl do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sdlgnuboy \ + ${INSTALL_PROGRAM} ${WRKSRC}/sdl2gnuboy \ ${DESTDIR}${PREFIX}/bin/gnuboy-sdl + ${INSTALL_MAN} ${FILESDIR}/gnuboy-sdl.6 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/gnuboy-sdl.6 ${INSTALL_DATA} ${WRKSRC}/etc/sample.rc \ ${DESTDIR}${PREFIX}/share/examples/gnuboy-sdl/ ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/docs/* \ ${DESTDIR}${PREFIX}/share/doc/gnuboy-sdl/ +.include "../../devel/SDL2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/emulators/gnuboy-sdl/PLIST diff -u pkgsrc/emulators/gnuboy-sdl/PLIST:1.2 pkgsrc/emulators/gnuboy-sdl/PLIST:1.3 --- pkgsrc/emulators/gnuboy-sdl/PLIST:1.2 Sun Jun 14 17:51:04 2009 +++ pkgsrc/emulators/gnuboy-sdl/PLIST Fri Jul 21 09:32:36 2023 @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:51:04 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2023/07/21 09:32:36 nia Exp $ bin/gnuboy-sdl +man/man6/gnuboy-sdl.6 share/doc/gnuboy-sdl/CHANGES share/doc/gnuboy-sdl/CONFIG share/doc/gnuboy-sdl/CREDITS Added files: Index: pkgsrc/emulators/gnuboy/Makefile.common diff -u /dev/null pkgsrc/emulators/gnuboy/Makefile.common:1.1 --- /dev/null Fri Jul 21 09:32:37 2023 +++ pkgsrc/emulators/gnuboy/Makefile.common Fri Jul 21 09:32:36 2023 @@ -0,0 +1,18 @@ +# $NetBSD: Makefile.common,v 1.1 2023/07/21 09:32:36 nia Exp $ +# used by emulators/gnuboy/Makefile +# used by emulators/gnuboy-sdl/Makefile + +DISTNAME= gnuboy-1.0.4 +CATEGORIES= emulators games +MASTER_SITES= ${MASTER_SITE_GITHUB:=rofl0r/} +GITHUB_RELEASE= v${PKGVERSION_NOREV} +EXTRACT_SUFX= .tar.xz + +MAINTAINER= njl@sdf.lonestar.org +HOMEPAGE= https://github.com/rofl0r/gnuboy +LICENSE= gnu-gpl-v2 + +GNU_CONFIGURE= yes + +DISTINFO_FILE= ${.CURDIR}/../../emulators/gnuboy/distinfo +PATCHDIR= ${.CURDIR}/../../emulators/gnuboy/patches Index: pkgsrc/emulators/gnuboy/options.mk diff -u /dev/null pkgsrc/emulators/gnuboy/options.mk:1.1 --- /dev/null Fri Jul 21 09:32:37 2023 +++ pkgsrc/emulators/gnuboy/options.mk Fri Jul 21 09:32:36 2023 @@ -0,0 +1,34 @@ +# $NetBSD: options.mk,v 1.1 2023/07/21 09:32:36 nia Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.gnuboy + +PKG_OPTIONS_REQUIRED_GROUPS+= sound +PKG_OPTIONS_GROUP.sound+= libao oss + +.include "../../mk/bsd.fast.prefs.mk" + +.include "../../mk/oss.buildlink3.mk" + +.if ${OSS_TYPE} == "none" || ${OPSYS} == "Linux" +PKG_SUGGESTED_OPTIONS+= libao +.else +PKG_SUGGESTED_OPTIONS+= oss +.endif + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Moss) +CONFIGURE_ARGS+= --with-sound=oss +LDFLAGS+= ${LIBOSSAUDIO} +SUBST_CLASSES+= oss +SUBST_STAGE.oss= pre-configure +SUBST_FILES.oss= sys/oss/oss.c +SUBST_SED.oss= -e 's,/dev/sound,${DEVOSSAUDIO},g' +SUBST_SED.oss+= -e 's,/dev/dsp,${DEVOSSAUDIO},g' +.endif + + +.if !empty(PKG_OPTIONS:Mlibao) +CONFIGURE_ARGS+= --with-sound=ao +. include "../../audio/libao/buildlink3.mk" +.endif Index: pkgsrc/emulators/gnuboy-sdl/files/gnuboy-sdl.6 diff -u /dev/null pkgsrc/emulators/gnuboy-sdl/files/gnuboy-sdl.6:1.1 --- /dev/null Fri Jul 21 09:32:37 2023 +++ pkgsrc/emulators/gnuboy-sdl/files/gnuboy-sdl.6 Fri Jul 21 09:32:36 2023 @@ -0,0 +1,40 @@ +.TH SDLGNUBOY "6" "July 2001" +.SH NAME +gnuboy-sdl \- gnuboy Game Boy Emulator. +.SH SYNOPSIS +.B gnuboy-sdl +[\fIoptions\fR] \fIromfile\fR +.SH DESCRIPTION +.TP +\fB\-\-source\fR FILE +read rc commands from FILE +.TP +\fB\-\-bind\fR KEY COMMAND +bind KEY to perform COMMAND +.TP +\fB\-\-VAR\fR=\fIVALUE\fR +set rc variable VAR to VALUE +.TP +\fB\-\-VAR\fR +set VAR to 1 (turn on boolean options) +.TP +\fB\-\-no\-VAR\fR +set VAR to 0 (turn off boolean options) +.TP +\fB\-\-showvars\fR +list all available rc variables +.TP +\fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit +.TP +\fB\-\-copying\fR +show copying permissions +.SH AUTHOR +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +This manual page was written by Davide Puricelli , +for the Debian GNU/Linux system (but may be used by others). Index: pkgsrc/emulators/gnuboy/files/xgnuboy.6 diff -u /dev/null pkgsrc/emulators/gnuboy/files/xgnuboy.6:1.1 --- /dev/null Fri Jul 21 09:32:37 2023 +++ pkgsrc/emulators/gnuboy/files/xgnuboy.6 Fri Jul 21 09:32:36 2023 @@ -0,0 +1,40 @@ +.TH XGNUBOY "6" "July 2001" +.SH NAME +xgnuboy \- gnuboy Game Boy Emulator. +.SH SYNOPSIS +.B xgnuboy +[\fIoptions\fR] \fIromfile\fR +.SH DESCRIPTION +.TP +\fB\-\-source\fR FILE +read rc commands from FILE +.TP +\fB\-\-bind\fR KEY COMMAND +bind KEY to perform COMMAND +.TP +\fB\-\-VAR\fR=\fIVALUE\fR +set rc variable VAR to VALUE +.TP +\fB\-\-VAR\fR +set VAR to 1 (turn on boolean options) +.TP +\fB\-\-no\-VAR\fR +set VAR to 0 (turn off boolean options) +.TP +\fB\-\-showvars\fR +list all available rc variables +.TP +\fB\-\-help\fR +display this help and exit +.TP +\fB\-\-version\fR +output version information and exit +.TP +\fB\-\-copying\fR +show copying permissions +.SH AUTHOR +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +This manual page was written by Davide Puricelli , +for the Debian GNU/Linux system (but may be used by others). --_----------=_1689931957249890--