Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id C67637A270 for ; Fri, 26 May 2017 19:35:50 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6BCD184DB8; Fri, 26 May 2017 19:35:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F00AD84DA8 for ; Fri, 26 May 2017 19:35:49 +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 eJAx8zTAtJYn for ; Fri, 26 May 2017 19:35:49 +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 29EAD84CDD for ; Fri, 26 May 2017 19:35:49 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 248ACFBE4; Fri, 26 May 2017 19:35:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1495827349230810" MIME-Version: 1.0 Date: Fri, 26 May 2017 19:35:49 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/emulators/fuse-emulator To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20170526193549.248ACFBE4@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. --_----------=_1495827349230810 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri May 26 19:35:49 UTC 2017 Modified Files: pkgsrc/emulators/fuse-emulator: Makefile PLIST distinfo options.mk pkgsrc/emulators/fuse-emulator/patches: patch-configure Added Files: pkgsrc/emulators/fuse-emulator/patches: patch-sound_osssound.c patch-ui_gtk_gtkmouse.c patch-ui_gtk_gtkui.c Removed Files: pkgsrc/emulators/fuse-emulator/patches: patch-aa patch-ac patch-ad patch-screenshot.c Log Message: Fuse 1.3.5: Emulation core improvements: * Disable tape traps when playing/recording RZX files Miscellaneous improvements: * Fix typo in LOG disk format * Replace old ticket numbers from Trac to Allura * WidgetUI: Fix memory leak in file selector * Fix allocator sizeof operand mismatch and remove dead assignment * Remove prototypes of old plus3 disk functions * Increase allocated memory to keep GCC7 happy To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/fuse-emulator/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/fuse-emulator/PLIST \ pkgsrc/emulators/fuse-emulator/distinfo \ pkgsrc/emulators/fuse-emulator/options.mk cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/fuse-emulator/patches/patch-aa \ pkgsrc/emulators/fuse-emulator/patches/patch-ac \ pkgsrc/emulators/fuse-emulator/patches/patch-ad \ pkgsrc/emulators/fuse-emulator/patches/patch-screenshot.c cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/emulators/fuse-emulator/patches/patch-configure cvs rdiff -u -r0 -r1.1 \ pkgsrc/emulators/fuse-emulator/patches/patch-sound_osssound.c \ pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkmouse.c \ pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkui.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1495827349230810 Content-Disposition: inline Content-Length: 7850 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/fuse-emulator/Makefile diff -u pkgsrc/emulators/fuse-emulator/Makefile:1.5 pkgsrc/emulators/fuse-emulator/Makefile:1.6 --- pkgsrc/emulators/fuse-emulator/Makefile:1.5 Sun Feb 12 06:25:18 2017 +++ pkgsrc/emulators/fuse-emulator/Makefile Fri May 26 19:35:48 2017 @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2017/02/12 06:25:18 ryoon Exp $ +# $NetBSD: Makefile,v 1.6 2017/05/26 19:35:48 adam Exp $ -DISTNAME= fuse-1.1.1 +DISTNAME= fuse-1.3.5 PKGNAME= ${DISTNAME:S/fuse/fuse-emulator/} -PKGREVISION= 11 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-emulator/} Index: pkgsrc/emulators/fuse-emulator/PLIST diff -u pkgsrc/emulators/fuse-emulator/PLIST:1.1 pkgsrc/emulators/fuse-emulator/PLIST:1.2 --- pkgsrc/emulators/fuse-emulator/PLIST:1.1 Sun Jan 17 14:27:38 2016 +++ pkgsrc/emulators/fuse-emulator/PLIST Fri May 26 19:35:48 2017 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2016/01/17 14:27:38 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/05/26 19:35:48 adam Exp $ bin/fuse man/man1/fuse.1 share/fuse/128-0.rom @@ -7,8 +7,9 @@ share/fuse/48.rom share/fuse/cassette.bmp share/fuse/disciple.rom share/fuse/disk_plus3.szx +${PLIST.sdl}share/fuse/fuse.font share/fuse/keyboard.scr -share/fuse/menu_data.ui +${PLIST.gtk}share/fuse/menu_data.ui share/fuse/microdrive.bmp share/fuse/plus2-0.rom share/fuse/plus2-1.rom Index: pkgsrc/emulators/fuse-emulator/distinfo diff -u pkgsrc/emulators/fuse-emulator/distinfo:1.1 pkgsrc/emulators/fuse-emulator/distinfo:1.2 --- pkgsrc/emulators/fuse-emulator/distinfo:1.1 Sun Jan 17 14:27:38 2016 +++ pkgsrc/emulators/fuse-emulator/distinfo Fri May 26 19:35:48 2017 @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.1 2016/01/17 14:27:38 wiz Exp $ +$NetBSD: distinfo,v 1.2 2017/05/26 19:35:48 adam Exp $ -SHA1 (fuse-1.1.1.tar.gz) = 92dc42bf9e8d26c42858059d59d522255041ab5d -RMD160 (fuse-1.1.1.tar.gz) = 5bb00bf401050101fe2da3ec9a7f9ccc3069e82c -SHA512 (fuse-1.1.1.tar.gz) = 67d12c56057a13121d8a5c073002dd2168268894669bdb50f3aba977cb1f53afa48774bfcb438a627a5afdbd2288248d4449e57d744e17b9e3eba00970685a14 -Size (fuse-1.1.1.tar.gz) = 1881332 bytes -SHA1 (patch-aa) = 68d610ec43b220400e7781ae84327926c9d5c498 -SHA1 (patch-ac) = 356002f998673f4a5ac2a78285e3bd7b1139be64 -SHA1 (patch-ad) = bdd8fab4de20b906128d3c19b9faffcbc6781e50 -SHA1 (patch-configure) = 7108d14dec459121301f93bf797671408861beb3 -SHA1 (patch-screenshot.c) = e09bf2cd264bf66bed57a41b623c1fa20e216c6b +SHA1 (fuse-1.3.5.tar.gz) = 9bd104e7acd45847a1816882e59c0a77f3f4b507 +RMD160 (fuse-1.3.5.tar.gz) = 5aa1e5266ce55ea4176cdb3d0de71c43b4e119ee +SHA512 (fuse-1.3.5.tar.gz) = 4176d4245f64c50ce6b36954eb142a2303650cfd9f34bd245eaa65fee72b04a09df4a8764c020c4948c08fbd379c0f410607a6a7809a2dc13d5330b6de4f292a +Size (fuse-1.3.5.tar.gz) = 1635381 bytes +SHA1 (patch-configure) = 0b8b90751bd34efcee5c1bd9e4cb8687e972b127 +SHA1 (patch-sound_osssound.c) = e83d80c984592b4e52faccbea35cdc9b54b71933 +SHA1 (patch-ui_gtk_gtkmouse.c) = 95cd6a5515bfad7a118ddb0c3b2f36ba0b08d9ed +SHA1 (patch-ui_gtk_gtkui.c) = 4789f241793ab9449d5df3b019b48607d4d24e9c Index: pkgsrc/emulators/fuse-emulator/options.mk diff -u pkgsrc/emulators/fuse-emulator/options.mk:1.1 pkgsrc/emulators/fuse-emulator/options.mk:1.2 --- pkgsrc/emulators/fuse-emulator/options.mk:1.1 Sun Jan 17 14:27:38 2016 +++ pkgsrc/emulators/fuse-emulator/options.mk Fri May 26 19:35:48 2017 @@ -1,17 +1,21 @@ -# $NetBSD: options.mk,v 1.1 2016/01/17 14:27:38 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2017/05/26 19:35:48 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fuse -PKG_SUPPORTED_OPTIONS= sdl gtk +PKG_SUPPORTED_OPTIONS= gtk sdl PKG_SUGGESTED_OPTIONS= gtk .include "../../mk/bsd.options.mk" +PLIST_VARS+= gtk sdl + .if !empty(PKG_OPTIONS:Mgtk) -CONFIGURE_ARGS+= --with-gtk2 -.include "../../x11/gtk2/buildlink3.mk" +CONFIGURE_ARGS+= --with-gtk3 +PLIST.gtk= yes +.include "../../x11/gtk3/buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Msdl) CONFIGURE_ARGS+= --with-sdl +PLIST.sdl= yes .include "../../devel/SDL/buildlink3.mk" .endif Index: pkgsrc/emulators/fuse-emulator/patches/patch-configure diff -u pkgsrc/emulators/fuse-emulator/patches/patch-configure:1.1 pkgsrc/emulators/fuse-emulator/patches/patch-configure:1.2 --- pkgsrc/emulators/fuse-emulator/patches/patch-configure:1.1 Sun Jan 17 14:27:38 2016 +++ pkgsrc/emulators/fuse-emulator/patches/patch-configure Fri May 26 19:35:48 2017 @@ -1,15 +1,14 @@ -$NetBSD: patch-configure,v 1.1 2016/01/17 14:27:38 wiz Exp $ +$NetBSD: patch-configure,v 1.2 2017/05/26 19:35:48 adam Exp $ -Fix unportable test(1) construct. +Do not assume GTK requires linking against X11. ---- configure.orig 2013-06-14 20:38:14.000000000 +0000 +--- configure.orig 2017-05-26 17:54:18.000000000 +0000 +++ configure -@@ -17868,7 +17868,7 @@ if test "$desktopdir" = yes; then - else - DESKTOP_DATADIR="$datadir" +@@ -15004,7 +15004,6 @@ $as_echo "$as_me: WARNING: GTK+ not foun + $as_echo "#define UI_GTK 1" >>confdefs.h + + UI=gtk; +- LIBS="$LIBS -lX11"; + fi fi -- if test "$desktopdir" == yes; then -+ if test "$desktopdir" = yes; then - DESKTOP_DATADIR_TRUE= - DESKTOP_DATADIR_FALSE='#' - else + Added files: Index: pkgsrc/emulators/fuse-emulator/patches/patch-sound_osssound.c diff -u /dev/null pkgsrc/emulators/fuse-emulator/patches/patch-sound_osssound.c:1.1 --- /dev/null Fri May 26 19:35:49 2017 +++ pkgsrc/emulators/fuse-emulator/patches/patch-sound_osssound.c Fri May 26 19:35:48 2017 @@ -0,0 +1,15 @@ +$NetBSD: patch-sound_osssound.c,v 1.1 2017/05/26 19:35:48 adam Exp $ + +Use correct OSS device across platforms. + +--- sound/osssound.c.orig 2007-12-21 17:43:10.000000000 +0100 ++++ sound/osssound.c +@@ -52,7 +52,7 @@ int sound_lowlevel_init(const char *devi + int frag,tmp,flags; + + /* select a default device if we weren't explicitly given one */ +-if(device==NULL) device = "/dev/dsp"; ++if(device==NULL) device = DEVOSSAUDIO; + + /* Open the sound device non-blocking to avoid hangs if it is being + * used by something else, but then set it blocking again as that's what Index: pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkmouse.c diff -u /dev/null pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkmouse.c:1.1 --- /dev/null Fri May 26 19:35:49 2017 +++ pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkmouse.c Fri May 26 19:35:48 2017 @@ -0,0 +1,28 @@ +$NetBSD: patch-ui_gtk_gtkmouse.c,v 1.1 2017/05/26 19:35:48 adam Exp $ + +Fix for a case when GTK has been compiled with Quartz support. + +--- ui/gtk/gtkmouse.c.orig 2017-05-26 17:42:26.000000000 +0000 ++++ ui/gtk/gtkmouse.c +@@ -31,8 +31,10 @@ + #include "ui/ui.h" + + /* For XWarpPointer *only* - see below */ ++#ifndef GDK_WINDOWING_QUARTZ + #include + #include ++#endif + + static GdkCursor *nullpointer = NULL; + +@@ -48,8 +50,10 @@ gtkmouse_reset_pointer( void ) + */ + GdkWindow *window = gtk_widget_get_window( gtkui_drawing_area ); + ++#ifndef GDK_WINDOWING_QUARTZ + XWarpPointer( GDK_WINDOW_XDISPLAY( window ), None, + GDK_WINDOW_XID( window ), 0, 0, 0, 0, 128, 128 ); ++#endif + } + + gboolean Index: pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkui.c diff -u /dev/null pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkui.c:1.1 --- /dev/null Fri May 26 19:35:49 2017 +++ pkgsrc/emulators/fuse-emulator/patches/patch-ui_gtk_gtkui.c Fri May 26 19:35:48 2017 @@ -0,0 +1,18 @@ +$NetBSD: patch-ui_gtk_gtkui.c,v 1.1 2017/05/26 19:35:48 adam Exp $ + +Fix for a case when GTK has been compiled with Quartz support. + +--- ui/gtk/gtkui.c.orig 2010-12-20 20:17:04.000000000 +0000 ++++ ui/gtk/gtkui.c +@@ -28,8 +28,10 @@ + #include + + #include +-#include + #include ++#ifndef GDK_WINDOWING_QUARTZ ++#include ++#endif + + #include + --_----------=_1495827349230810--