Date: Mon, 20 May 2013 15:03:18 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318604 - in head/emulators: fuse fuse-utils fuse/files libspectrum Message-ID: <201305201503.r4KF3I2Z021615@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon May 20 15:03:18 2013 New Revision: 318604 URL: http://svnweb.freebsd.org/changeset/ports/318604 Log: Update libspectrum, fuse, and fuse-utils to 1.1.0 Highlights: * fuse-utils: - new tool fmfconv to convert movies recorded with fuse * fuse: - new ROMs Speccyboot 1.4 and DISCiPLE - drop ROMs without clear redistribution rights (128p, 256s, Gluck, IF1, Opus, TrDOS) - support PZX and POK files - GTK+ 3 compatibility Added: head/emulators/fuse/files/patch-sound__aosound.c (contents, props changed) Deleted: head/emulators/fuse/files/patch-screenshot.c Modified: head/emulators/fuse-utils/Makefile head/emulators/fuse-utils/distinfo (contents, props changed) head/emulators/fuse-utils/pkg-plist (contents, props changed) head/emulators/fuse/Makefile head/emulators/fuse/distinfo (contents, props changed) head/emulators/fuse/pkg-plist (contents, props changed) head/emulators/libspectrum/Makefile head/emulators/libspectrum/distinfo (contents, props changed) head/emulators/libspectrum/pkg-plist (contents, props changed) Modified: head/emulators/fuse-utils/Makefile ============================================================================== --- head/emulators/fuse-utils/Makefile Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/fuse-utils/Makefile Mon May 20 15:03:18 2013 (r318604) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fuse-utils -PORTVERSION= 1.0.0 +PORTVERSION= 1.1.0 CATEGORIES= emulators MASTER_SITES= SF/fuse-emulator/${PORTNAME}/${PORTVERSION} @@ -20,25 +20,35 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libspectrum-prefix=${LOCALBASE} \ --with-local-prefix=${LOCALBASE} -MAN1= createhdf.1 fuse-utils.1 listbasic.1 raw2hdf.1 rzxcheck.1 rzxdump.1 rzxtool.1 scl2trd.1 snap2tzx.1 snapconv.1 tapeconv.1 tzxlist.1 profile2map.1 +MAN1= createhdf.1 fmfconv.1 fuse-utils.1 listbasic.1 raw2hdf.1 rzxcheck.1 \ + rzxdump.1 rzxtool.1 scl2trd.1 snap2tzx.1 snapconv.1 tapeconv.1 \ + tzxlist.1 profile2map.1 -OPTIONS_DEFINE= AUDIOFILE DOCS +OPTIONS_DEFINE= AUDIOTOOLS DOCS +OPTIONS_DEFAULT= AUDIOTOOLS -AUDIOFILE_DESC= Build audio <-> tape utilities - -OPTIONS_DEFAULT= AUDIOFILE +AUDIOTOOLS_DESC= Build audio <-> tape utilities .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MAUDIOFILE} +.if ${PORT_OPTIONS:MAUDIOTOOLS} +CONFIGURE_ARGS+=--with-audiofile LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile -PLIST_SUB= AUDIOFILE="" +PLIST_SUB= AUDIOTOOLS="" MAN1+= audio2tape.1 tape2wav.1 .else CONFIGURE_ARGS+=--without-audiofile -PLIST_SUB= AUDIOFILE="@comment " +PLIST_SUB= AUDIOTOOLS="@comment " .endif +# FIXME no way to specify ffmpeg1 paths to configure script +#.if ${PORT_OPTIONS:MFFMPEG} +#LIB_DEPENDS+= avformat1:${PORTSDIR}/multimedia/ffmpeg1 +#CONFIGURE_ARGS+=--with-ffmpeg +#.else +CONFIGURE_ARGS+=--without-ffmpeg +#.endif + .if ${PORT_OPTIONS:MDOCS} post-install: @${MKDIR} ${DOCSDIR} Modified: head/emulators/fuse-utils/distinfo ============================================================================== --- head/emulators/fuse-utils/distinfo Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/fuse-utils/distinfo Mon May 20 15:03:18 2013 (r318604) @@ -1,2 +1,2 @@ -SHA256 (fuse-utils-1.0.0.tar.gz) = 39f110d9760b84ecd23ab4a7ad777db6480b470f1c6435889a125abb302de104 -SIZE (fuse-utils-1.0.0.tar.gz) = 415310 +SHA256 (fuse-utils-1.1.0.tar.gz) = 750d6d8d7f78365bb98e91c3e41c7f85c4963218f2d5f5ce85803f4321e3fa5e +SIZE (fuse-utils-1.1.0.tar.gz) = 500840 Modified: head/emulators/fuse-utils/pkg-plist ============================================================================== --- head/emulators/fuse-utils/pkg-plist Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/fuse-utils/pkg-plist Mon May 20 15:03:18 2013 (r318604) @@ -1,5 +1,6 @@ -%%AUDIOFILE%%bin/audio2tape +%%AUDIOTOOLS%%bin/audio2tape bin/createhdf +bin/fmfconv bin/listbasic bin/profile2map bin/raw2hdf @@ -9,7 +10,7 @@ bin/rzxtool bin/scl2trd bin/snap2tzx bin/snapconv -%%AUDIOFILE%%bin/tape2wav +%%AUDIOTOOLS%%bin/tape2wav bin/tapeconv bin/tzxlist %%PORTDOCS%%%%DOCSDIR%%/AUTHORS Modified: head/emulators/fuse/Makefile ============================================================================== --- head/emulators/fuse/Makefile Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/fuse/Makefile Mon May 20 15:03:18 2013 (r318604) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fuse -PORTVERSION= 1.0.0.1 -PORTREVISION= 3 +PORTVERSION= 1.1.0 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}-emulator/${PORTNAME}/${PORTVERSION} @@ -12,7 +11,7 @@ COMMENT= Free Unix (Sinclair ZX-)Spectru LICENSE= GPLv2 -LIB_DEPENDS= spectrum.8:${PORTSDIR}/emulators/libspectrum \ +LIB_DEPENDS= spectrum:${PORTSDIR}/emulators/libspectrum \ png15:${PORTSDIR}/graphics/png \ gcrypt:${PORTSDIR}/security/libgcrypt @@ -34,13 +33,13 @@ SAMPLERATE_DESC= Better beeper sound qua .if ${PORT_OPTIONS:MAO} CONFIGURE_ARGS+=--with-libao -LIB_DEPENDS+= ao.4:${PORTSDIR}/audio/libao +LIB_DEPENDS+= ao:${PORTSDIR}/audio/libao .else CONFIGURE_ARGS+=--without-libao .endif .if ${PORT_OPTIONS:MSAMPLERATE} -LIB_DEPENDS+= samplerate.1:${PORTSDIR}/audio/libsamplerate +LIB_DEPENDS+= samplerate:${PORTSDIR}/audio/libsamplerate .else CONFIGURE_ARGS+=--without-libsamplerate .endif Modified: head/emulators/fuse/distinfo ============================================================================== --- head/emulators/fuse/distinfo Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/fuse/distinfo Mon May 20 15:03:18 2013 (r318604) @@ -1,2 +1,2 @@ -SHA256 (fuse-1.0.0.1.tar.gz) = 4bc7be3dca87aaf244b0769387a4d9b40f74d50b5077a4cf499d88c3362b511b -SIZE (fuse-1.0.0.1.tar.gz) = 1629111 +SHA256 (fuse-1.1.0.tar.gz) = c0960b72f76e3b9fb49ad6970d2f80e0db8e8bfd257449f37c30bd76ea071617 +SIZE (fuse-1.1.0.tar.gz) = 1870034 Added: head/emulators/fuse/files/patch-sound__aosound.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/fuse/files/patch-sound__aosound.c Mon May 20 15:03:18 2013 (r318604) @@ -0,0 +1,27 @@ +--- ./sound/aosound.c.orig 2013-05-16 22:26:12.000000000 +0200 ++++ ./sound/aosound.c 2013-05-20 14:06:11.000000000 +0200 +@@ -78,14 +78,14 @@ + } + } + +-static void ++static int + parse_driver_options( const char *device, int *driver_id, ao_option **options ) + { + 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 @@ + } + + free( mutable ); ++ return 0; + } + + int Modified: head/emulators/fuse/pkg-plist ============================================================================== --- head/emulators/fuse/pkg-plist Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/fuse/pkg-plist Mon May 20 15:03:18 2013 (r318604) @@ -2,21 +2,13 @@ bin/fuse %%DATADIR%%/128-0.rom %%DATADIR%%/128-1.rom -%%DATADIR%%/128p-0.rom -%%DATADIR%%/128p-1.rom -%%DATADIR%%/256s-0.rom -%%DATADIR%%/256s-1.rom -%%DATADIR%%/256s-2.rom -%%DATADIR%%/256s-3.rom %%DATADIR%%/48.rom %%DATADIR%%/cassette.bmp +%%DATADIR%%/disciple.rom %%DATADIR%%/disk_plus3.szx -%%DATADIR%%/gluck.rom -%%DATADIR%%/if1-1.rom -%%DATADIR%%/if1-2.rom %%DATADIR%%/keyboard.scr +%%DATADIR%%/menu_data.ui %%DATADIR%%/microdrive.bmp -%%DATADIR%%/opus.rom %%DATADIR%%/plus2-0.rom %%DATADIR%%/plus2-1.rom %%DATADIR%%/plus3-0.rom @@ -31,6 +23,7 @@ bin/fuse %%DATADIR%%/plusd.rom %%DATADIR%%/se-0.rom %%DATADIR%%/se-1.rom +%%DATADIR%%/speccyboot-1.4.rom %%DATADIR%%/tape_128.szx %%DATADIR%%/tape_16.szx %%DATADIR%%/tape_2048.szx @@ -48,7 +41,6 @@ bin/fuse %%DATADIR%%/tc2048.rom %%DATADIR%%/tc2068-0.rom %%DATADIR%%/tc2068-1.rom -%%DATADIR%%/trdos.rom @dirrm %%DATADIR%% %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog Modified: head/emulators/libspectrum/Makefile ============================================================================== --- head/emulators/libspectrum/Makefile Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/libspectrum/Makefile Mon May 20 15:03:18 2013 (r318604) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libspectrum -PORTVERSION= 1.0.0 -PORTREVISION= 3 +PORTVERSION= 1.1.0 CATEGORIES= emulators devel MASTER_SITES= SF/fuse-emulator/${PORTNAME}/${PORTVERSION} @@ -28,7 +27,7 @@ AUDIOFILE_DESC= Support loading from .wa .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MAUDIOFILE} -LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile +LIB_DEPENDS+= audiofile:${PORTSDIR}/audio/libaudiofile .else CONFIGURE_ARGS+=--without-libaudiofile .endif Modified: head/emulators/libspectrum/distinfo ============================================================================== --- head/emulators/libspectrum/distinfo Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/libspectrum/distinfo Mon May 20 15:03:18 2013 (r318604) @@ -1,2 +1,2 @@ -SHA256 (libspectrum-1.0.0.tar.gz) = cdf8f5006676c0f68939e331eeadeda5d608d777f1234b080b97f677f1dd287c -SIZE (libspectrum-1.0.0.tar.gz) = 462552 +SHA256 (libspectrum-1.1.0.tar.gz) = 17938b9f62b2c80ed3e0a58f52ef5ad4e9dfab24ed9a1ca828a56145e109ab2e +SIZE (libspectrum-1.1.0.tar.gz) = 500889 Modified: head/emulators/libspectrum/pkg-plist ============================================================================== --- head/emulators/libspectrum/pkg-plist Mon May 20 14:57:46 2013 (r318603) +++ head/emulators/libspectrum/pkg-plist Mon May 20 15:03:18 2013 (r318604) @@ -3,7 +3,7 @@ include/libspectrum.h lib/libspectrum.a lib/libspectrum.la lib/libspectrum.so -lib/libspectrum.so.8 +lib/libspectrum.so.9 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/README
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305201503.r4KF3I2Z021615>