"Anthony J. Bentley" writes: > Hi, > > Below is an update to fuse-1.1.1. > > Tested on amd64/i386.
Anyone willing to test/ok this diff? > ok? > > Index: Makefile > ===================================================================== > RCS file: /cvs/ports/emulators/fuse/Makefile,v > retrieving revision 1.31 > diff -u -p -u -p -r1.31 Makefile > --- Makefile 4 Jun 2013 18:41:41 -0000 1.31 > +++ Makefile 29 Apr 2014 09:19:52 -0000 > @@ -1,8 +1,7 @@ > # $OpenBSD: Makefile,v 1.31 2013/06/04 18:41:41 naddy Exp $ > = > > COMMENT= Free Unix Spectrum Emulator > -DISTNAME= fuse-0.10.0.2 > -REVISION= 7 > +DISTNAME = fuse-1.1.1 > CATEGORIES= emulators > HOMEPAGE= http://fuse-emulator.sourceforge.net/ > = > > @@ -10,14 +9,17 @@ HOMEPAGE= http://fuse-emulator.sourcefo > PERMIT_PACKAGE_CDROM= Yes > = > > WANTLIB += X11 Xext ao audiofile bz2 c gcrypt glib-2.0 gpg-error > -WANTLIB += m pcre png pthread samplerate spectrum xcb xml2 z > +WANTLIB += m pcre png pthread spectrum xcb xml2 z > +WANTLIB += FLAC SDL ogg sndio usbhid > = > > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-emulator/} > = > > MODULES= devel/gettext > LIB_DEPENDS= devel/glib2 \ > - audio/libsamplerate \ > + audio/flac \ > + audio/libogg \ > devel/libspectrum \ > + devel/sdl \ > graphics/png \ > textproc/libxml \ > audio/libao > @@ -36,10 +38,10 @@ LIB_DEPENDS+= x11/gtk+2 \ > devel/glib2 > CONFIGURE_ARGS+= --with-gtk2 > = > > -WANTLIB += GL Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr > +WANTLIB += Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr > WANTLIB += Xrender atk-1.0 cairo expat ffi fontconfig freetype > WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 gmodule-2.0 gobject-2.0 > -WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz icudata icule icuuc > +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz graphite2 > WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 pthread-stubs > WANTLIB += xcb-render xcb-shm > .else > Index: distinfo > ===================================================================== > RCS file: /cvs/ports/emulators/fuse/distinfo,v > retrieving revision 1.11 > diff -u -p -u -p -r1.11 distinfo > --- distinfo 17 Jan 2009 10:10:01 -0000 1.11 > +++ distinfo 29 Apr 2014 09:19:52 -0000 > @@ -1,5 +1,2 @@ > -MD5 (fuse-0.10.0.2.tar.gz) = 9uRK2dPvZmjL+mDNRkfgJA== > -RMD160 (fuse-0.10.0.2.tar.gz) = 1vP4sQZpVztivjjcxjs1rddD4P4= > -SHA1 (fuse-0.10.0.2.tar.gz) = HUNhmpLyVXZmoWWvXQteyodJfVU= > -SHA256 (fuse-0.10.0.2.tar.gz) = hD1aF7eVbYF0HzKAkQJSop9UOgLPmaF3q3i9t9x= > 3hnI= > -SIZE (fuse-0.10.0.2.tar.gz) = 1579106 > +SHA256 (fuse-1.1.1.tar.gz) = qFfUvWLgHRhCmJdGdQivFWJMuvNDyu2Lm6GrOoh5RE= > 4= > +SIZE (fuse-1.1.1.tar.gz) = 1881332 > Index: patches/patch-screenshot_c > ===================================================================== > RCS file: patches/patch-screenshot_c > diff -N patches/patch-screenshot_c > --- patches/patch-screenshot_c 8 Jul 2011 20:38:01 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,11 +0,0 @@ > -$OpenBSD: patch-screenshot_c,v 1.1 2011/07/08 20:38:01 naddy Exp $ > ---- screenshot.c.orig Tue Jul 5 23:21:29 2011 > -+++ screenshot.c Tue Jul 5 23:21:41 2011 > -@@ -49,6 +49,7 @@ > - #ifdef USE_LIBPNG > - = > > - #include <png.h> > -+#include <zlib.h> > - = > > - static int get_rgb32_data( libspectrum_byte *rgb32_data, size_t stride, > - size_t height, size_t width ); > Index: patches/patch-sound_aosound_c > ===================================================================== > RCS file: patches/patch-sound_aosound_c > diff -N patches/patch-sound_aosound_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-sound_aosound_c 29 Apr 2014 09:19:52 -0000 > @@ -0,0 +1,29 @@ > +$OpenBSD$ > +From upstream r5016. > +--- sound/aosound.c.orig Thu May 16 14:26:12 2013 > ++++ sound/aosound.c Tue Apr 29 03:15:05 2014 > +@@ -78,14 +78,14 @@ driver_error( void ) > + } > + } > + = > > +-static void > ++static int > + parse_driver_options( const char *device, int *driver_id, ao_option **op= > tions ) > + { > + char *mutable, *option, *key, *value; > + = > > + /* Get a copy of the device string we can modify */ > + if( !device || *device == '\0' ) > +- return; > ++ return 1; > + = > > + mutable = utils_safe_strdup( device ); > + = > > +@@ -119,6 +119,7 @@ parse_driver_options( const char *device, int *driver= > _ > + } > + = > > + free( mutable ); > ++ return 0; > + } > + = > > + int > Index: pkg/PFRAG.gtk > ===================================================================== > RCS file: pkg/PFRAG.gtk > diff -N pkg/PFRAG.gtk > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ pkg/PFRAG.gtk 29 Apr 2014 09:19:52 -0000 > @@ -0,0 +1,2 @@ > +@comment $OpenBSD: PFRAG.no-gtk,v 1.1 2009/01/07 17:59:40 grange Exp $ > +share/fuse/menu_data.ui > Index: pkg/PLIST > ===================================================================== > RCS file: /cvs/ports/emulators/fuse/pkg/PLIST,v > retrieving revision 1.8 > diff -u -p -u -p -r1.8 PLIST > --- pkg/PLIST 7 Jan 2009 17:59:40 -0000 1.8 > +++ pkg/PLIST 29 Apr 2014 09:19:52 -0000 > @@ -1,22 +1,15 @@ > @comment $OpenBSD: PLIST,v 1.8 2009/01/07 17:59:40 grange Exp $ > !%%gtk%% > +%%gtk%% > @bin bin/fuse > @man man/man1/fuse.1 > share/fuse/ > share/fuse/128-0.rom > share/fuse/128-1.rom > -share/fuse/128p-0.rom > -share/fuse/128p-1.rom > -share/fuse/256s-0.rom > -share/fuse/256s-1.rom > -share/fuse/256s-2.rom > -share/fuse/256s-3.rom > share/fuse/48.rom > share/fuse/cassette.bmp > +share/fuse/disciple.rom > share/fuse/disk_plus3.szx > -share/fuse/gluck.rom > -share/fuse/if1-1.rom > -share/fuse/if1-2.rom > share/fuse/keyboard.scr > share/fuse/microdrive.bmp > share/fuse/plus2-0.rom > @@ -33,11 +26,13 @@ share/fuse/plus3e-3.rom > share/fuse/plusd.rom > share/fuse/se-0.rom > share/fuse/se-1.rom > +share/fuse/speccyboot-1.4.rom > share/fuse/tape_128.szx > share/fuse/tape_16.szx > share/fuse/tape_2048.szx > share/fuse/tape_2068.szx > share/fuse/tape_48.szx > +share/fuse/tape_48_ntsc.szx > share/fuse/tape_pentagon.szx > share/fuse/tape_plus2.szx > share/fuse/tape_plus2a.szx > @@ -49,4 +44,3 @@ share/fuse/tape_ts2068.szx > share/fuse/tc2048.rom > share/fuse/tc2068-0.rom > share/fuse/tc2068-1.rom > -share/fuse/trdos.rom
