"Anthony J. Bentley" writes: > Hi, > > Below is an update to fuse-utils-1.1.1. > > USE_GROFF is not needed. > > Adds the new fmfconv command, which pulls in ffmpeg. > > Builds fine on amd64/i386.
Anyone willing to test/ok this diff? > ok? > > > Index: Makefile > ===================================================================== > RCS file: /cvs/ports/emulators/fuse-utils/Makefile,v > retrieving revision 1.18 > diff -u -p -u -p -r1.18 Makefile > --- Makefile 21 Mar 2013 08:45:17 -0000 1.18 > +++ Makefile 29 Apr 2014 10:29:43 -0000 > @@ -2,24 +2,26 @@ > = > > COMMENT= Free Unix Spectrum Emulator utilities > = > > -DISTNAME= fuse-utils-0.10.0.1 > +DISTNAME = fuse-utils-1.1.1 > CATEGORIES= emulators > HOMEPAGE= http://fuse-emulator.sourceforge.net/ > = > > -# GPL > +# GPLv2+ > PERMIT_PACKAGE_CDROM= Yes > = > > MODULES= devel/gettext > = > > -WANTLIB= c m stdc++ z gcrypt bz2 glib-2.0 gpg-error pcre \ > - audiofile > +WANTLIB += FLAC audiofile avcodec avformat avutil bz2 c crypto > +WANTLIB += gcrypt glib-2.0 gpg-error gsm m mp3lame ogg opus orc-0.4 > +WANTLIB += pcre pthread schroedinger-1.0 speex ssl stdc++ swscale > +WANTLIB += theoradec theoraenc vorbis vorbisenc vpx x264 xvidcore z > = > > MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuse-emulator/} > = > > -LIB_DEPENDS= devel/libspectrum > +LIB_DEPENDS= devel/libspectrum \ > + graphics/ffmpeg > WANTLIB += spectrum>=5 > = > > CONFIGURE_STYLE= gnu > -USE_GROFF = Yes > = > > .include <bsd.port.mk> > Index: distinfo > ===================================================================== > RCS file: /cvs/ports/emulators/fuse-utils/distinfo,v > retrieving revision 1.7 > diff -u -p -u -p -r1.7 distinfo > --- distinfo 7 Jan 2009 18:00:20 -0000 1.7 > +++ distinfo 29 Apr 2014 10:29:43 -0000 > @@ -1,5 +1,2 @@ > -MD5 (fuse-utils-0.10.0.1.tar.gz) = XzcTUEXw20BdIpmwfJH54Q== > -RMD160 (fuse-utils-0.10.0.1.tar.gz) = KGd4FXNTB4P32i3oalg7b5sDy7U= > -SHA1 (fuse-utils-0.10.0.1.tar.gz) = 6y/eq1aIHOKPPaJoNV0P1gQz2As= > -SHA256 (fuse-utils-0.10.0.1.tar.gz) = wYuRDmv7f6B0ZrLJIx5hJQhFaeoGBQ0Vo= > hdLwCi3SRY= > -SIZE (fuse-utils-0.10.0.1.tar.gz) = 394523 > +SHA256 (fuse-utils-1.1.1.tar.gz) = fDbAtCgFZhoGwhrt40Yf/IzNtc5W/iModb+G= > 5593yTw= > +SIZE (fuse-utils-1.1.1.tar.gz) = 505766 > Index: patches/patch-configure > ===================================================================== > RCS file: patches/patch-configure > diff -N patches/patch-configure > --- patches/patch-configure 24 Sep 2006 18:17:33 -0000 1.3 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-configure,v 1.3 2006/09/24 18:17:33 grange Exp $ > ---- configure.orig Fri Jul 16 14:41:19 2004 > -+++ configure Sun Sep 24 22:07:13 2006 > -@@ -18959,7 +18959,7 @@ if test "${ac_cv_lib_gcrypt_gcry_check_v > - echo $ECHO_N "(cached) $ECHO_C" >&6 > - else > - ac_check_lib_save_LIBS=$LIBS > --LIBS="-lgcrypt $LIBS" > -+LIBS="-lgcrypt -lgpg-error -lintl -liconv $LIBS" > - cat >conftest.$ac_ext <<_ACEOF > - /* confdefs.h. */ > - _ACEOF > Index: patches/patch-fmfconv_ff_c > ===================================================================== > RCS file: patches/patch-fmfconv_ff_c > diff -N patches/patch-fmfconv_ff_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-fmfconv_ff_c 29 Apr 2014 10:29:43 -0000 > @@ -0,0 +1,66 @@ > +$OpenBSD$ > + > +Fix build with recent ffmpeg. From upstream r5072. > + > +--- fmfconv_ff.c.orig Tue Apr 29 04:21:51 2014 > ++++ fmfconv_ff.c Tue Apr 29 04:24:00 2014 > +@@ -113,6 +113,14 @@ static int res_rte = -1; > + static void setup_x264_dict( AVDictionary ** pm ); > + #endif > + = > > ++#if LIBAVCODEC_BUILD >= AV_VERSION_INT(54,25,0) > ++#define FMF_CODEC_ID AVCodecID > ++#define FMF_CODEC(name) AV_##name > ++#else > ++#define FMF_CODEC_ID CodecID > ++#define FMF_CODEC(name) name > ++#endif > ++ > + /* check that a given sample format is supported by the encoder */ > + static int > + check_sample_fmt( AVCodec *codec, enum AVSampleFormat sample_fmt ) > +@@ -224,7 +232,7 @@ ffmpeg_rescale_video( void ) > + */ > + = > > + static int > +-add_audio_stream( enum CodecID codec_id, int freq, int stereo ) > ++add_audio_stream( enum FMF_CODEC_ID codec_id, int freq, int stereo ) > + { > + AVCodecContext *c; > + = > > +@@ -440,7 +448,7 @@ check_framerate( const AVRational *frates, int timing= > = > > + = > > + /* add a video output stream */ > + static int > +-add_video_stream( enum CodecID codec_id, int w, int h, int timing ) > ++add_video_stream( enum FMF_CODEC_ID codec_id, int w, int h, int timing ) > + { > + AVCodecContext *c; > + = > > +@@ -674,7 +682,7 @@ out_write_ffmpegheader( void ) > + { > + = > > + AVCodec *ac, *vc; > +- enum CodecID acodec, vcodec; > ++ enum FMF_CODEC_ID acodec, vcodec; > + = > > + ff_picture = NULL; > + ff_tmp_picture = NULL; > +@@ -725,7 +733,7 @@ out_write_ffmpegheader( void ) > + vcodec = fmt->video_codec; > + acodec = fmt->audio_codec; > + = > > +- if( out_t == TYPE_FFMPEG && vcodec != CODEC_ID_NONE ) { > ++ if( out_t == TYPE_FFMPEG && vcodec != FMF_CODEC( CODEC_ID_NONE )= > ) { > + = > > + /* Find the video encoder requested by user selection */ > + if( ffmpeg_vcodec != NULL && *ffmpeg_vcodec != 0 ) { > +@@ -758,7 +766,7 @@ out_write_ffmpegheader( void ) > + return 1; > + } > + = > > +- if( snd_t == TYPE_FFMPEG && acodec != CODEC_ID_NONE ) { > ++ if( snd_t == TYPE_FFMPEG && acodec != FMF_CODEC( CODEC_ID_NONE )= > ) { > + = > > + /* Find the audio encoder requested by user selection */ > + if( ffmpeg_acodec != NULL && *ffmpeg_acodec != 0 ) { > Index: pkg/PLIST > ===================================================================== > RCS file: /cvs/ports/emulators/fuse-utils/pkg/PLIST,v > retrieving revision 1.6 > diff -u -p -u -p -r1.6 PLIST > --- pkg/PLIST 7 Jan 2009 18:00:20 -0000 1.6 > +++ pkg/PLIST 29 Apr 2014 10:29:43 -0000 > @@ -1,6 +1,7 @@ > @comment $OpenBSD: PLIST,v 1.6 2009/01/07 18:00:20 grange Exp $ > @bin bin/audio2tape > @bin bin/createhdf > +@bin bin/fmfconv > @bin bin/listbasic > @bin bin/profile2map > @bin bin/raw2hdf > @@ -15,6 +16,7 @@ > @bin bin/tzxlist > @man man/man1/audio2tape.1 > @man man/man1/createhdf.1 > +@man man/man1/fmfconv.1 > @man man/man1/fuse-utils.1 > @man man/man1/listbasic.1 > @man man/man1/profile2map.1
