From 84f9d994597fdaf83786abc786f97b753226830b Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Tue, 12 May 2015 21:01:13 +0200
Subject: [PATCH] Recipe and path for fuse-utils.

---
 .../fuse-utils/fuse_utils-1.1.1.recipe        | 67 +++++++++++++++++++
 .../patches/fuse_utils-1.1.1.patchset         | 56 ++++++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 app-emulation/fuse-utils/fuse_utils-1.1.1.recipe
 create mode 100644 app-emulation/fuse-utils/patches/fuse_utils-1.1.1.patchset

diff --git a/app-emulation/fuse-utils/fuse_utils-1.1.1.recipe b/app-emulation/fuse-utils/fuse_utils-1.1.1.recipe
new file mode 100644
index 000000000..61a2bbf22
--- /dev/null
+++ b/app-emulation/fuse-utils/fuse_utils-1.1.1.recipe
@@ -0,0 +1,67 @@
+SUMMARY="ZX Spectrum emulator utilities"
+DESCRIPTION="Several tools to manage files in ZX spectrum emulator formats:
+disk and tape images, machine state snapshots, and a few other things."
+REVISION="1"
+ARCHITECTURES="x86_gcc2"
+LICENSE="GNU GPL v2"
+COPYRIGHT="2003-2015 Philip Kendall and FUSE contributors"
+HOMEPAGE="http://fuse-emulator.sourceforge.net/fuse.php"
+
+SRC_URI="http://sourceforge.net/projects/fuse-emulator/files/fuse-utils/$portVersion/fuse-utils-$portVersion.tar.gz"
+CHECKSUM_SHA256="7c36c0b42805661a06c21aede3461ffc8ccdb5ce56fe232875bf86e79f77c93c"
+SOURCE_DIR="fuse-utils-$portVersion"
+PATCHES="fuse_utils-$portVersion"
+
+PROVIDES="
+	fuse_utils = $portVersion
+	cmd:createhdf
+	cmd:fmfconv
+	cmd:listbasic
+	cmd:profile2map
+	cmd:raw2hdf
+	cmd:rzxdump
+	cmd:rzxtool
+	cmd:scl2trd
+	cmd:snap2tzx
+	cmd:snapconv
+	cmd:tapeconv
+	cmd:tzxlist
+"
+
+REQUIRES="
+	haiku
+	lib:libbz2
+	lib:libavcodec
+	lib:libavformat
+	lib:libavutil
+	lib:libswscale
+	lib:libspectrum
+	lib:libz
+"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libavformat
+	devel:libbz2
+	devel:libgcrypt
+	devel:libspectrum
+	devel:libz
+"
+
+BUILD_PREREQUIRES="
+	cmd:awk
+	cmd:gcc
+	cmd:make
+	cmd:pkg_config
+"
+
+BUILD()
+{
+	runConfigure ./configure
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
diff --git a/app-emulation/fuse-utils/patches/fuse_utils-1.1.1.patchset b/app-emulation/fuse-utils/patches/fuse_utils-1.1.1.patchset
new file mode 100644
index 000000000..0b8b816e1
--- /dev/null
+++ b/app-emulation/fuse-utils/patches/fuse_utils-1.1.1.patchset
@@ -0,0 +1,56 @@
+From c507b88d44b69c8133b77dd04c7af8f486810c0b Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@gmail.com>
+Date: Tue, 12 May 2015 20:57:47 +0200
+Subject: C89 "declaration after statement" fixes.
+
+
+diff --git a/fmfconv_ff.c b/fmfconv_ff.c
+index 7fabf94..c686c89 100644
+--- a/fmfconv_ff.c
++++ b/fmfconv_ff.c
+@@ -553,15 +553,17 @@ open_video( AVCodec *codec )
+   }
+ 
+ #ifdef HAVE_FFMPEG_AVCODEC_OPEN2
+-  AVDictionary *options = NULL;
+-  if( ffmpeg_libx264 ) {
+-    setup_x264_dict( &options );
+-  }
++  {
++    AVDictionary *options = NULL;
++    if( ffmpeg_libx264 ) {
++      setup_x264_dict( &options );
++    }
+ 
+     /* open the codec */
+-  ret = avcodec_open2( c, codec, &options );
++    ret = avcodec_open2( c, codec, &options );
+ 
+-  av_dict_free( &options );
++    av_dict_free( &options );
++  }
+ #else
+   ret = avcodec_open( c, codec );
+ #endif
+diff --git a/rzxtool.c b/rzxtool.c
+index b9717a0..24f5de4 100644
+--- a/rzxtool.c
++++ b/rzxtool.c
+@@ -370,13 +370,13 @@ write_rzx( const char *filename, libspectrum_rzx *rzx, int compressed )
+ int
+ main( int argc, char *argv[] )
+ {
+-  progname = argv[0];
+   GSList *actions = NULL;
+   options_t options;
+   unsigned char *buffer = NULL; size_t length = 0;
+   libspectrum_rzx *rzx;
+   int error;
+ 
++  progname = argv[0];
+   error = init_libspectrum(); if( error ) return error;
+ 
+   error = get_creator( &creator, "rzxtool" ); if( error ) return error;
+-- 
+2.2.2
+