Attachment #132725 for bug #177074




MAINTAINER=	ports@FreeBSD.org
COMMENT=	Izumo collection of Gravis Ultrasound MIDI patches

# Not useful without timidity.
RUN_DEPENDS=	timidity:${PORTSDIR}/audio/timidity++

NO_CDROM=	Some of the patches are marked no-commercial-use

NO_BUILD=	yes
NO_CDROM=	Some of the patches are marked no-commercial-use
WRKSRC=		${WRKDIR}/timidity
PLIST_SUB=	TIMIDITY_DATADIR=${TIMIDITY_DATADIR}
WRKSRC=		${WRKDIR}/timidity

TIMIDITY_DATADIR=	share/timidity

post-patch:
	@${REINPLACE_CMD} -e 's|/timidity|/guspat|g' \
		${WRKSRC}/timidity.cfg

do-install:
	@${MKDIR} ${DATADIR}
	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}




PORTVERSION=	0.2i
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES+=	http://www.onicos.com/staff/iz/timidity/dist/:timidity
DISTFILES+=	${DISTNAME}.tar.gz:timidity
DISTFILES=	${TIINS}:tiins ${DISTNAME}.tar.gz:timidity
EXTRACT_ONLY=	${DISTNAME}.tar.gz

MAINTAINER=	kevinz5000@gmail.com

INSTALL_TARGET=	install.all
MAN1=		timidity.1

OPTIONS_DEFINE=	GUS

GUS_DESC=	Use audio/guspat instead of included goemon

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGUS}
RUN_DEPENDS+=	${LOCALBASE}/share/guspat/power.cfg:${PORTSDIR}/audio/guspat
TDIR=		${LOCALBASE}/share/timidity
TCONFIG=	timidity.cfg-guspat
PLIST_SUB+=	GOEMON="@comment "
.else
# Goemon
MASTER_SITES+=	http://www.anime.net/~goemon/timidity/:tiins
DISTFILES+=	${TIINS}:tiins
TDIR=		${PREFIX}/lib/timidity
TCONFIG=	goemon.cfg
PLIST_SUB+=	GOEMON=""
.endif

post-patch:
	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
		${WRKSRC}/linux_a.c
	${REINPLACE_CMD} -e 's|%%TDIR%%|${TDIR}| ; s|%%TCONFIG%%|${TCONFIG}|' \
		${WRKSRC}/timidity.cfg

post-install:
.if ! ${PORT_OPTIONS:MGUS}
	cd ${PREFIX}/lib/timidity && \
	${TAR} --no-same-owner --no-same-permissions -zxf ${DISTDIR}/${TIINS} && \
	${REINPLACE_CMD} -i "" -e 's,dir goemon,dir ${PREFIX}/lib/timidity/goemon,' \
		goemon.cfg
.endif

.include <bsd.port.mk>




--- ./Makefile.orig	1996-05-26 04:26:46.000000000 -0500
+++ ./Makefile	2013-04-21 10:18:23.000000000 -0500
@@ -24,22 +24,22 @@
 # But where to change without revealing my secret identity?
 
 ########### Compiler and flags.
-CC = gcc
-DEBUGFLAGS = -Wall -O2
+#CC = gcc
+DEBUGFLAGS = -Wall
 
 ########### Install.
-INSTALL = /usr/bin/install
+#INSTALL = /usr/bin/install
 
 # Where to install the executable
-BIN_DIR = /usr/local/bin
+BIN_DIR = ${PREFIX}/bin
 
 # Where to install the manual pages
-MAN_DIR = /usr/local/man/man1
+MAN_DIR = ${PREFIX}/man/man1
 
 # Where to install the patches, config files, and MIDI files.
 # If you change this, it's a good idea to recompile the binary,
 # or you'll need to invoke timidity with the -L option.
-TIMID_DIR = /usr/local/lib/timidity
+TIMID_DIR = ${PREFIX}/lib/timidity
 
 # Where to install the Tcl code, if you use the Tcl code that is.
 TCL_DIR = $(TIMID_DIR)
@@ -112,9 +112,9 @@
 #EXTRALIBS += -lgen
 
 # Select the Tcl/Tk interface
-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-SYSEXTRAS += tk_c.c
-INST_TK = install.tk
+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+#SYSEXTRAS += tk_c.c
+#INST_TK = install.tk
 #EXTRAINCS +=
 #EXTRALIBS +=
 
@@ -136,7 +136,7 @@
 SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 SDISTZIP = tilib$(FNSUPPVERSION).zip
 
-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 
 ########### All relevant files.. Anybody know autoconf?
@@ -228,10 +228,10 @@
 wav2pat: wav2pat.c
 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 
-depends depend dep:
-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-
-include depends
+#depends depend dep:
+#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+#
+#include depends
 
 ########### Installation targets
 
@@ -262,9 +262,9 @@
 	mkdir -p $(TIMID_DIR)
 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 
-install.patch: $(PATCHF)
-	mkdir -p $(TIMID_DIR)/patch
-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+install.patch: #$(PATCHF)
+#        mkdir -p $(TIMID_DIR)/patch
+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 
 install.tk: $(ALLTCLF)
 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)




*** mix.c.orig	Mon May 20 17:09:46 1996
--- mix.c	Sun Nov 17 10:01:36 1996
***************
*** 23,29 ****
--- 23,33 ----
  
  #include <math.h>
  #include <stdio.h>
+ #ifdef __FreeBSD__
+ #include <stdlib.h>
+ #else
  #include <malloc.h>
+ #endif
  
  #include "config.h"
  #include "common.h"
*** resample.c.orig	Mon May 20 17:09:47 1996
--- resample.c	Sun Nov 17 09:59:29 1996
***************
*** 22,28 ****
--- 22,32 ----
  
  #include <math.h>
  #include <stdio.h>
+ #ifdef __FreeBSD__
+ #include <stdlib.h>
+ #else
  #include <malloc.h>
+ #endif
  
  #include "config.h"
  #include "common.h"




--- Makefile.orig	Sun May 26 13:26:46 1996
+++ Makefile	Mon Jan  4 04:08:35 1999
@@ -24,22 +24,22 @@
 # But where to change without revealing my secret identity?
 
 ########### Compiler and flags.
-CC = gcc
-DEBUGFLAGS = -Wall -O2
+#CC = gcc
+DEBUGFLAGS = -Wall
 
 ########### Install.
-INSTALL = /usr/bin/install
+#INSTALL = /usr/bin/install
 
 # Where to install the executable
-BIN_DIR = /usr/local/bin
+BIN_DIR = ${PREFIX}/bin
 
 # Where to install the manual pages
-MAN_DIR = /usr/local/man/man1
+MAN_DIR = ${PREFIX}/man/man1
 
 # Where to install the patches, config files, and MIDI files.
 # If you change this, it's a good idea to recompile the binary,
 # or you'll need to invoke timidity with the -L option.
-TIMID_DIR = /usr/local/lib/timidity
+TIMID_DIR = ${PREFIX}/lib/timidity
 
 # Where to install the Tcl code, if you use the Tcl code that is.
 TCL_DIR = $(TIMID_DIR)
@@ -112,9 +112,9 @@
 #EXTRALIBS += -lgen
 
 # Select the Tcl/Tk interface
-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
-SYSEXTRAS += tk_c.c
-INST_TK = install.tk
+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+#SYSEXTRAS += tk_c.c
+#INST_TK = install.tk
 #EXTRAINCS +=
 #EXTRALIBS +=
 
@@ -136,7 +136,7 @@
 SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 SDISTZIP = tilib$(FNSUPPVERSION).zip
 
-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 
 ########### All relevant files.. Anybody know autoconf?
@@ -228,10 +228,10 @@
 wav2pat: wav2pat.c
 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 
-depends depend dep:
-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-
-include depends
+#depends depend dep:
+#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+#
+#include depends
 
 ########### Installation targets
 
@@ -262,9 +262,9 @@
 	mkdir -p $(TIMID_DIR)
 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 
-install.patch: $(PATCHF)
-	mkdir -p $(TIMID_DIR)/patch
-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+install.patch: #$(PATCHF)
+#        mkdir -p $(TIMID_DIR)/patch
+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 
 install.tk: $(ALLTCLF)
 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)

Lines 1-23 Link Here

(-)timidity/files/patch-ac (-23 lines)
1	--- timidity.cfg.orig Mon May 22 02:40:27 1995
2	+++ timidity.cfg Mon Jan 4 03:55:42 1999
3	@@ -34,9 +34,9 @@
4	# This sets up the default patches in the TiMidity support package
5	# "timidity-lib-0.1.tar.gz":
6
7	-bank 0
8	- 0 patch/acpiano.pat
9	- 24 patch/nylongt2.pat
10	+#bank 0
11	+# 0 patch/acpiano.pat
12	+# 24 patch/nylongt2.pat
13
14	##############################################################################
15	# If you have Dustin McCartney's "wowpats" patches, you can source the
16	@@ -70,6 +70,7 @@
17	#source midia.cfg
18	#
19
20	+source goemon.cfg
21
22	##############################################################################
23	# End of configuration file




*** linux_a.c.orig	Mon May 20 17:09:46 1996
--- linux_a.c	Tue Jun 16 21:40:17 1998
***************
*** 71,82 ****
     then 8-bit unsigned if it fails. If you have a sound device that
     can't handle either, let me know. */
  
  static int open_output(void)
  {
    int fd, tmp, i, warnings=0;
    
    /* Open the audio device */
!   fd=open(dpm.name, O_RDWR | O_NDELAY);
    if (fd<0)
      {
        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
--- 71,85 ----
     then 8-bit unsigned if it fails. If you have a sound device that
     can't handle either, let me know. */
  
+ /* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
+ static int luigi_driver = 0;
+ 
  static int open_output(void)
  {
    int fd, tmp, i, warnings=0;
    
    /* Open the audio device */
!   fd=open(dpm.name, O_RDWR);
    if (fd<0)
      {
        ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
***************
*** 84,89 ****
--- 87,109 ----
        return -1;
      }
  
+   /* Figure out if we're running with the Luigi driver or
+      the original VoxWare driver, with code based on dburr/luigi
+      in ports/5607.  It'd be great if we could do this before
+      opening the audio device, but oh well... */
+ #if defined(AIOGFMT)	/* only defined in Luigi driver */
+   {
+     snd_chan_param s;
+     int i;
+     i = ioctl(fd, AIOGFMT, &s);
+     if (i != -1)
+       luigi_driver = 1;
+   }
+ #endif
+ 
+   ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
+ 	    luigi_driver ? "luigi" : "VoxWare");
+ 
    /* They can't mean these */
    dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
  
***************
*** 92,97 ****
--- 112,140 ----
       the other one. */
  
    i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
+   if (luigi_driver)
+     {
+       if (dpm.encoding & PE_16BIT) {
+ 	int fmt = AFMT_S16_LE ;
+ 
+ 	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
+ 	    fmt = AFMT_U8 ;
+ 	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
+ 		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+ 		      "%s doesn't support 16- or 8-bit sample width",
+ 		      dpm.name);
+ 		close(fd);
+ 		return -1;
+ 	    }
+ 	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
+ 		  "Sample width adjusted to %d bits", tmp);
+ 	    dpm.encoding ^= PE_16BIT;
+ 	    warnings = 1;
+ 	}
+       }
+     }
+   else
+     {
    if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
      {
        /* Try the other one */
***************
*** 109,114 ****
--- 152,158 ----
        dpm.encoding ^= PE_16BIT;
        warnings=1;
      }
+     }
    if (dpm.encoding & PE_16BIT)
      dpm.encoding |= PE_SIGNED;
    else
***************
*** 163,168 ****
--- 207,214 ----
    /* Set buffer fragments (in extra_param[0]) */
    
    tmp=AUDIO_BUFFER_BITS;
+   if (luigi_driver)
+     tmp += 2;
    if (!(dpm.encoding & PE_MONO)) tmp++;
    if (dpm.encoding & PE_16BIT) tmp++;
    tmp |= (dpm.extra_param[0]<<16);
***************
*** 189,216 ****
    return warnings;
  }
  
  static void output_data(int32 *buf, int32 count)
  {
    if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
    
!   if (dpm.encoding & PE_16BIT)
!     {
        /* Convert data to signed 16-bit PCM */
        s32tos16(buf, count);
!       
!       /* Write the data out. Linux likes to give an EINTR if you suspend
! 	 a program while waiting on a write, so we may need to retry. */
!       while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
! 	;
!     }
!   else
!     {
        /* Convert to 8-bit unsigned and write out. */
        s32tou8(buf, count);
!       
!       while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
! 	;
      }
  }
  
  static void close_output(void)
--- 235,269 ----
    return warnings;
  }
  
+ /* output_data comes from Luigi's linux_a.c.  This version seems to allow
+    for partial writes to the sound device, where as the original version
+    doesn't. */
  static void output_data(int32 *buf, int32 count)
  {
+   char *p;
+   int res, l;
+   
    if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
    
!   if (dpm.encoding & PE_16BIT) {
        /* Convert data to signed 16-bit PCM */
        s32tos16(buf, count);
!       res = count*2;
!   } else {
        /* Convert to 8-bit unsigned and write out. */
        s32tou8(buf, count);
!       res = count;
!   }
!   for (p = (char *) buf; res > 0; res -= l) {
! again:
!     l = write(dpm.fd, p, res);
!     if (l < 0) {
! 	if (errno == EINTR)
! 		goto again;
! 	return;
      }
+     p += l;
+   }
  }
  
  static void close_output(void)




*** config.h.orig	Sat Jun  1 07:54:49 1996
--- config.h	Sat Sep 18 15:32:38 1999
***************
*** 217,222 ****
--- 217,238 ----
  # endif
  #endif /* linux */
  
+ #ifdef __FreeBSD__
+ #include <errno.h>
+ #include <machine/endian.h>
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ #undef BIG_ENDIAN
+ #undef PDP_ENDIAN
+ #elif BYTE_ORDER == BIG_ENDIAN
+ #undef LITTLE_ENDIAN
+ #undef PDP_ENDIAN
+ #else
+ # error No valid byte sex defined
+ #endif
+ #define USE_LDEXP
+ #define PI M_PI
+ #endif
+ 
  /* Win32 on Intel machines */
  #ifdef __WIN32__
  #  define LITTLE_ENDIAN




--- common.c	2003/02/08 01:42:31	1.1
+++ common.c	2003/02/08 01:53:36
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(SOLARIS) || defined(__WIN32__)
+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 #include <string.h>
 #else
 #include <strings.h>
--- instrum.c	2003/02/08 01:42:31	1.1
+++ instrum.c	2003/02/08 01:53:50
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 
-#if defined(SOLARIS) || defined(__WIN32__)
+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 #include <string.h>
 #else
 #include <strings.h>
--- playmidi.c	2003/02/08 01:42:31	1.1
+++ playmidi.c	2003/02/08 01:54:18
@@ -27,7 +27,7 @@
 #endif
 #include <stdlib.h>
 
-#if defined(SOLARIS) || defined(__WIN32__)
+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 # include <string.h>
 #else
 #include <strings.h>
--- raw_a.c	2003/02/08 01:42:31	1.1
+++ raw_a.c	2003/02/08 01:54:38
@@ -35,6 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <stdio.h>
+#include <string.h>
 #endif
 
 #include "config.h"
--- readmidi.c	2003/02/08 01:42:31	1.1
+++ readmidi.c	2003/02/08 01:53:19
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#if defined(SOLARIS) | defined(__WIN32__)
+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 # include <string.h>
 #else
 #include <strings.h>
--- timidity.c	2003/02/08 01:42:31	1.1
+++ timidity.c	2003/02/08 01:54:51
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(SOLARIS) || defined(__WIN32__)
+#if defined(SOLARIS) || defined(__WIN32__) || defined(__FreeBSD__)
 #include <string.h>
 #else
 #include <strings.h>
--- wav2pat.c	2003/02/08 01:42:31	1.1
+++ wav2pat.c	2003/02/08 01:55:29
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#ifdef SOLARIS
+#if defined(SOLARIS) || defined(__FreeBSD__)
 #include <string.h>
 #else
 #include <strings.h>
--- wave_a.c	2003/02/08 01:42:31	1.1
+++ wave_a.c	2003/02/08 01:55:45
@@ -35,6 +35,7 @@
 
 #ifdef __FreeBSD__
 #include <stdio.h>
+#include <string.h>
 #endif
 
 #include "config.h"


Line 0 Link Here

(-)timidity/files/patch-common.c (+11 lines)
	1	--- ./common.c.orig 1996-06-01 07:20:19.000000000 -0500
	2	+++ ./common.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -24,7 +24,7 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	-#if defined(SOLARIS) \|\| defined(__WIN32__)
	8	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
	9	#include <string.h>
	10	#else
	11	#include <strings.h>




--- ./config.h.orig	1996-06-01 07:54:49.000000000 -0500
+++ ./config.h	2013-04-21 10:18:23.000000000 -0500
@@ -217,6 +217,22 @@
 # endif
 #endif /* linux */
 
+#ifdef __FreeBSD__
+#include <errno.h>
+#include <machine/endian.h>
+#if BYTE_ORDER == LITTLE_ENDIAN
+#undef BIG_ENDIAN
+#undef PDP_ENDIAN
+#elif BYTE_ORDER == BIG_ENDIAN
+#undef LITTLE_ENDIAN
+#undef PDP_ENDIAN
+#else
+# error No valid byte sex defined
+#endif
+#define USE_LDEXP
+#define PI M_PI
+#endif
+
 /* Win32 on Intel machines */
 #ifdef __WIN32__
 #  define LITTLE_ENDIAN

Lines 1-5 Link Here

(-)timidity/files/patch-dumb_c.c (-2 / +2 lines)
1	--- dumb_c.c.orig Mon May 20 16:01:17 1996	1	--- ./dumb_c.c.orig 1996-05-20 09:01:17.000000000 -0500
2	+++ dumb_c.c Tue Dec 4 23:45:01 2001	2	+++ ./dumb_c.c 2013-04-21 10:18:23.000000000 -0500
3	@@ -66,10 +66,12 @@	3	@@ -66,10 +66,12 @@
4	ctl_expression, ctl_panning, ctl_sustain, ctl_pitch_bend	4	ctl_expression, ctl_panning, ctl_sustain, ctl_pitch_bend
5	};	5	};

Line 0 Link Here

(-)timidity/files/patch-instrum.c (+11 lines)
	1	--- ./instrum.c.orig 1996-05-20 08:15:10.000000000 -0500
	2	+++ ./instrum.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -25,7 +25,7 @@
	4
	5	#include <stdio.h>
	6
	7	-#if defined(SOLARIS) \|\| defined(__WIN32__)
	8	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
	9	#include <string.h>
	10	#else
	11	#include <strings.h>




--- ./linux_a.c.orig	1996-05-20 08:09:46.000000000 -0500
+++ ./linux_a.c	2013-04-21 10:18:23.000000000 -0500
@@ -71,12 +71,15 @@
    then 8-bit unsigned if it fails. If you have a sound device that
    can't handle either, let me know. */
 
+/* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
+static int luigi_driver = 0;
+
 static int open_output(void)
 {
   int fd, tmp, i, warnings=0;
   
   /* Open the audio device */
-  fd=open(dpm.name, O_RDWR | O_NDELAY);
+  fd=open(dpm.name, O_RDWR);
   if (fd<0)
     {
       ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
@@ -84,6 +87,23 @@
       return -1;
     }
 
+  /* Figure out if we're running with the Luigi driver or
+     the original VoxWare driver, with code based on dburr/luigi
+     in ports/5607.  It'd be great if we could do this before
+     opening the audio device, but oh well... */
+#if defined(AIOGFMT)	/* only defined in Luigi driver */
+  {
+    snd_chan_param s;
+    int i;
+    i = ioctl(fd, AIOGFMT, &s);
+    if (i != -1)
+      luigi_driver = 1;
+  }
+#endif
+
+  ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
+	    luigi_driver ? "luigi" : "VoxWare");
+
   /* They can't mean these */
   dpm.encoding &= ~(PE_ULAW|PE_BYTESWAP);
 
@@ -92,6 +112,29 @@
      the other one. */
 
   i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
+  if (luigi_driver)
+    {
+      if (dpm.encoding & PE_16BIT) {
+	int fmt = AFMT_S16_LE ;
+
+	if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_S16_LE) {
+	    fmt = AFMT_U8 ;
+	    if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 || fmt != AFMT_U8) {
+		ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
+		      "%s doesn't support 16- or 8-bit sample width",
+		      dpm.name);
+		close(fd);
+		return -1;
+	    }
+	    ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
+		  "Sample width adjusted to %d bits", tmp);
+	    dpm.encoding ^= PE_16BIT;
+	    warnings = 1;
+	}
+      }
+    }
+  else
+    {
   if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 || tmp!=i)
     {
       /* Try the other one */
@@ -109,6 +152,7 @@
       dpm.encoding ^= PE_16BIT;
       warnings=1;
     }
+    }
   if (dpm.encoding & PE_16BIT)
     dpm.encoding |= PE_SIGNED;
   else
@@ -163,6 +207,8 @@
   /* Set buffer fragments (in extra_param[0]) */
   
   tmp=AUDIO_BUFFER_BITS;
+  if (luigi_driver)
+    tmp += 2;
   if (!(dpm.encoding & PE_MONO)) tmp++;
   if (dpm.encoding & PE_16BIT) tmp++;
   tmp |= (dpm.extra_param[0]<<16);
@@ -189,28 +235,35 @@
   return warnings;
 }
 
+/* output_data comes from Luigi's linux_a.c.  This version seems to allow
+   for partial writes to the sound device, where as the original version
+   doesn't. */
 static void output_data(int32 *buf, int32 count)
 {
+  char *p;
+  int res, l;
+  
   if (!(dpm.encoding & PE_MONO)) count*=2; /* Stereo samples */
   
-  if (dpm.encoding & PE_16BIT)
-    {
+  if (dpm.encoding & PE_16BIT) {
       /* Convert data to signed 16-bit PCM */
       s32tos16(buf, count);
-      
-      /* Write the data out. Linux likes to give an EINTR if you suspend
-	 a program while waiting on a write, so we may need to retry. */
-      while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
-	;
-    }
-  else
-    {
+      res = count*2;
+  } else {
       /* Convert to 8-bit unsigned and write out. */
       s32tou8(buf, count);
-      
-      while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
-	;
+      res = count;
+  }
+  for (p = (char *) buf; res > 0; res -= l) {
+again:
+    l = write(dpm.fd, p, res);
+    if (l < 0) {
+	if (errno == EINTR)
+		goto again;
+	return;
     }
+    p += l;
+  }
 }
 
 static void close_output(void)

Line 0 Link Here

(-)timidity/files/patch-mix.c (+14 lines)
	1	--- ./mix.c.orig 1996-05-20 08:09:46.000000000 -0500
	2	+++ ./mix.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -23,7 +23,11 @@
	4
	5	#include <math.h>
	6	#include <stdio.h>
	7	+#ifdef __FreeBSD__
	8	+#include <stdlib.h>
	9	+#else
	10	#include <malloc.h>
	11	+#endif
	12
	13	#include "config.h"
	14	#include "common.h"

Line 0 Link Here

(-)timidity/files/patch-playmidi.c (+11 lines)
	1	--- ./playmidi.c.orig 1996-05-20 08:09:46.000000000 -0500
	2	+++ ./playmidi.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -27,7 +27,7 @@
	4	#endif
	5	#include <stdlib.h>
	6
	7	-#if defined(SOLARIS) \|\| defined(__WIN32__)
	8	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
	9	# include <string.h>
	10	#else
	11	#include <strings.h>

Line 0 Link Here

(-)timidity/files/patch-raw_a.c (+10 lines)
	1	--- ./raw_a.c.orig 1996-05-20 08:09:47.000000000 -0500
	2	+++ ./raw_a.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -35,6 +35,7 @@
	4
	5	#ifdef __FreeBSD__
	6	#include <stdio.h>
	7	+#include <string.h>
	8	#endif
	9
	10	#include "config.h"

Line 0 Link Here

(-)timidity/files/patch-readmidi.c (+11 lines)
	1	--- ./readmidi.c.orig 1996-05-20 08:09:47.000000000 -0500
	2	+++ ./readmidi.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -23,7 +23,7 @@
	4	#include <stdlib.h>
	5	#include <errno.h>
	6
	7	-#if defined(SOLARIS) \| defined(__WIN32__)
	8	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
	9	# include <string.h>
	10	#else
	11	#include <strings.h>

Line 0 Link Here

(-)timidity/files/patch-resample.c (+14 lines)
	1	--- ./resample.c.orig 1996-05-20 08:09:47.000000000 -0500
	2	+++ ./resample.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -22,7 +22,11 @@
	4
	5	#include <math.h>
	6	#include <stdio.h>
	7	+#ifdef __FreeBSD__
	8	+#include <stdlib.h>
	9	+#else
	10	#include <malloc.h>
	11	+#endif
	12
	13	#include "config.h"
	14	#include "common.h"

Line 0 Link Here

(-)timidity/files/patch-timidity.c (+11 lines)
	1	--- ./timidity.c.orig 1996-05-21 14:16:20.000000000 -0500
	2	+++ ./timidity.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -21,7 +21,7 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6
	7	-#if defined(SOLARIS) \|\| defined(__WIN32__)
	8	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
	9	#include <string.h>
	10	#else
	11	#include <strings.h>

Line 0 Link Here

(-)timidity/files/patch-timidity.cfg (+31 lines)
	1	--- ./timidity.cfg.orig 1995-05-21 17:40:27.000000000 -0500
	2	+++ ./timidity.cfg 2013-04-21 10:18:23.000000000 -0500
	3	@@ -27,16 +27,16 @@
	4	# If you've moved things around since compiling, uncomment and edit this to
	5	# point to the library directory:
	6	#
	7	-#dir /usr/local/lib/timidity
	8	+dir %%TDIR%%
	9	#
	10
	11	##############################################################################
	12	# This sets up the default patches in the TiMidity support package
	13	# "timidity-lib-0.1.tar.gz":
	14
	15	-bank 0
	16	- 0 patch/acpiano.pat
	17	- 24 patch/nylongt2.pat
	18	+#bank 0
	19	+# 0 patch/acpiano.pat
	20	+# 24 patch/nylongt2.pat
	21
	22	##############################################################################
	23	# If you have Dustin McCartney's "wowpats" patches, you can source the
	24	@@ -70,6 +70,7 @@
	25	#source midia.cfg
	26	#
	27
	28	+source %%TCONFIG%%
	29
	30	##############################################################################
	31	# End of configuration file

Line 0 Link Here

(-)timidity/files/patch-wav2pat.c (+11 lines)
	1	--- ./wav2pat.c.orig 1996-05-20 08:09:47.000000000 -0500
	2	+++ ./wav2pat.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -28,7 +28,7 @@
	4	#include <unistd.h>
	5	#include <fcntl.h>
	6
	7	-#ifdef SOLARIS
	8	+#if defined(SOLARIS) \|\| defined(__FreeBSD__)
	9	#include <string.h>
	10	#else
	11	#include <strings.h>

Line 0 Link Here

(-)timidity/files/patch-wave_a.c (+10 lines)
	1	--- ./wave_a.c.orig 1996-05-20 08:10:15.000000000 -0500
	2	+++ ./wave_a.c 2013-04-21 10:18:23.000000000 -0500
	3	@@ -35,6 +35,7 @@
	4
	5	#ifdef __FreeBSD__
	6	#include <stdio.h>
	7	+#include <string.h>
	8	#endif
	9
	10	#include "config.h"




bin/timidity
bin/bag
bin/wav2pat
%%GOEMON%%lib/timidity/goemon.cfg
%%GOEMON%%lib/timidity/goemon/acbass.pat
%%GOEMON%%lib/timidity/goemon/accordn.pat
%%GOEMON%%lib/timidity/goemon/acguitar2.pat
%%GOEMON%%lib/timidity/goemon/agogo.pat
%%GOEMON%%lib/timidity/goemon/agogohi.pat
%%GOEMON%%lib/timidity/goemon/agogolo.pat
%%GOEMON%%lib/timidity/goemon/airpipe.pat
%%GOEMON%%lib/timidity/goemon/altosax.pat
%%GOEMON%%lib/timidity/goemon/an_trmp1.pat
%%GOEMON%%lib/timidity/goemon/applause.pat
%%GOEMON%%lib/timidity/goemon/atmosphr.pat
%%GOEMON%%lib/timidity/goemon/aurora.pat
%%GOEMON%%lib/timidity/goemon/bagpipes.pat
%%GOEMON%%lib/timidity/goemon/banjo.pat
%%GOEMON%%lib/timidity/goemon/barisax.pat
%%GOEMON%%lib/timidity/goemon/basslead.pat
%%GOEMON%%lib/timidity/goemon/bassoon.pat
%%GOEMON%%lib/timidity/goemon/bellpad.pat
%%GOEMON%%lib/timidity/goemon/bells.pat
%%GOEMON%%lib/timidity/goemon/belltree.pat
%%GOEMON%%lib/timidity/goemon/bongohi.pat
%%GOEMON%%lib/timidity/goemon/bongolo.pat
%%GOEMON%%lib/timidity/goemon/bottleit.pat
%%GOEMON%%lib/timidity/goemon/bowglass.pat
%%GOEMON%%lib/timidity/goemon/britenss.pat
%%GOEMON%%lib/timidity/goemon/britepno.pat
%%GOEMON%%lib/timidity/goemon/cabasa.pat
%%GOEMON%%lib/timidity/goemon/carillon.pat
%%GOEMON%%lib/timidity/goemon/castinet.pat
%%GOEMON%%lib/timidity/goemon/celeste.pat
%%GOEMON%%lib/timidity/goemon/cello.pat
%%GOEMON%%lib/timidity/goemon/charang.pat
%%GOEMON%%lib/timidity/goemon/chiflead.pat
%%GOEMON%%lib/timidity/goemon/choir.pat
%%GOEMON%%lib/timidity/goemon/church.pat
%%GOEMON%%lib/timidity/goemon/claps.pat
%%GOEMON%%lib/timidity/goemon/clarinet.pat
%%GOEMON%%lib/timidity/goemon/clave.pat
%%GOEMON%%lib/timidity/goemon/clavinet.pat
%%GOEMON%%lib/timidity/goemon/cleangtr.pat
%%GOEMON%%lib/timidity/goemon/concrtna.pat
%%GOEMON%%lib/timidity/goemon/congahi1.pat
%%GOEMON%%lib/timidity/goemon/congahi2.pat
%%GOEMON%%lib/timidity/goemon/congalo.pat
%%GOEMON%%lib/timidity/goemon/contraba.pat
%%GOEMON%%lib/timidity/goemon/cowbell.pat
%%GOEMON%%lib/timidity/goemon/cuica1.pat
%%GOEMON%%lib/timidity/goemon/cuica2.pat
%%GOEMON%%lib/timidity/goemon/cymbell.pat
%%GOEMON%%lib/timidity/goemon/cymchina.pat
%%GOEMON%%lib/timidity/goemon/cymcrsh1.pat
%%GOEMON%%lib/timidity/goemon/cymcrsh2.pat
%%GOEMON%%lib/timidity/goemon/cymride1.pat
%%GOEMON%%lib/timidity/goemon/cymride2.pat
%%GOEMON%%lib/timidity/goemon/cymsplsh.pat
%%GOEMON%%lib/timidity/goemon/digitel.pat
%%GOEMON%%lib/timidity/goemon/distgtr2.pat
%%GOEMON%%lib/timidity/goemon/englhorn.pat
%%GOEMON%%lib/timidity/goemon/epiano1.pat
%%GOEMON%%lib/timidity/goemon/epiano2.pat
%%GOEMON%%lib/timidity/goemon/fiddle.pat
%%GOEMON%%lib/timidity/goemon/flute.pat
%%GOEMON%%lib/timidity/goemon/fngrbass.pat
%%GOEMON%%lib/timidity/goemon/frenchrn.pat
%%GOEMON%%lib/timidity/goemon/freshair.pat
%%GOEMON%%lib/timidity/goemon/fretless.pat
%%GOEMON%%lib/timidity/goemon/fretnoyz.pat
%%GOEMON%%lib/timidity/goemon/fx-blow.pat
%%GOEMON%%lib/timidity/goemon/ghostie.pat
%%GOEMON%%lib/timidity/goemon/glocken.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/bank.inf
%%GOEMON%%lib/timidity/goemon/gsdrum00/bongohi.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/bongolo.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cabasa.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/congahi1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/congahi2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/congalo.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cowbell.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cuica1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cuica2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cymbell.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cymchina.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cymcrsh1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cymcrsh2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cymride1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cymride2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/cymsplsh.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/gsdrum00.doc
%%GOEMON%%lib/timidity/goemon/gsdrum00/gsdrum00.txt
%%GOEMON%%lib/timidity/goemon/gsdrum00/guiro1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/guiro2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/hihatcl.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/hihatop.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/hihatpd.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/kick1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/kick2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/scratch1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/scratch2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/shaker.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/snare1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/snare2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/stickrim.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/tamborin.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/tomhi1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/tomhi2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/tomlo1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/tomlo2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/tommid1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/tommid2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/woodblk1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum00/woodblk2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum08/bank.inf
%%GOEMON%%lib/timidity/goemon/gsdrum08/gsdrum08.doc
%%GOEMON%%lib/timidity/goemon/gsdrum08/gsdrum08.txt
%%GOEMON%%lib/timidity/goemon/gsdrum08/roomhi1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum08/roomhi2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum08/roomlow1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum08/roomlow2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum08/roommid1.pat
%%GOEMON%%lib/timidity/goemon/gsdrum08/roommid2.pat
%%GOEMON%%lib/timidity/goemon/gsdrum40/bank.inf
%%GOEMON%%lib/timidity/goemon/gsdrum40/br_slap.pat
%%GOEMON%%lib/timidity/goemon/gsdrum40/br_swirl.pat
%%GOEMON%%lib/timidity/goemon/gsdrum40/br_swish.pat
%%GOEMON%%lib/timidity/goemon/gsdrum40/gsdrum40.bak
%%GOEMON%%lib/timidity/goemon/gsdrum40/gsdrum40.doc
%%GOEMON%%lib/timidity/goemon/gsdrum40/gsdrum40.txt
%%GOEMON%%lib/timidity/goemon/gsdrum40/hihatcl.pat
%%GOEMON%%lib/timidity/goemon/gsdrum40/hihatop.pat
%%GOEMON%%lib/timidity/goemon/gtrharm.pat
%%GOEMON%%lib/timidity/goemon/guiro1.pat
%%GOEMON%%lib/timidity/goemon/guiro2.pat
%%GOEMON%%lib/timidity/goemon/gunshot.pat
%%GOEMON%%lib/timidity/goemon/halopad.pat
%%GOEMON%%lib/timidity/goemon/hammond.pat
%%GOEMON%%lib/timidity/goemon/harmonca.pat
%%GOEMON%%lib/timidity/goemon/harp.pat
%%GOEMON%%lib/timidity/goemon/helicptr.pat
%%GOEMON%%lib/timidity/goemon/highq.pat
%%GOEMON%%lib/timidity/goemon/hihatcl.pat
%%GOEMON%%lib/timidity/goemon/hihatop.pat
%%GOEMON%%lib/timidity/goemon/hihatpd.pat
%%GOEMON%%lib/timidity/goemon/hitbrass.pat
%%GOEMON%%lib/timidity/goemon/homeorg.pat
%%GOEMON%%lib/timidity/goemon/honky.pat
%%GOEMON%%lib/timidity/goemon/hrpschrd.pat
%%GOEMON%%lib/timidity/goemon/jazzgtr2.pat
%%GOEMON%%lib/timidity/goemon/jingles.pat
%%GOEMON%%lib/timidity/goemon/jungle.pat
%%GOEMON%%lib/timidity/goemon/kalimba.pat
%%GOEMON%%lib/timidity/goemon/kick1.pat
%%GOEMON%%lib/timidity/goemon/kick2.pat
%%GOEMON%%lib/timidity/goemon/koto.pat
%%GOEMON%%lib/timidity/goemon/lcalliop.pat
%%GOEMON%%lib/timidity/goemon/lead5th.pat
%%GOEMON%%lib/timidity/goemon/maracas.pat
%%GOEMON%%lib/timidity/goemon/marcato.pat
%%GOEMON%%lib/timidity/goemon/marimba.pat
%%GOEMON%%lib/timidity/goemon/metalpad.pat
%%GOEMON%%lib/timidity/goemon/metbell.pat
%%GOEMON%%lib/timidity/goemon/metclick.pat
%%GOEMON%%lib/timidity/goemon/mutegtr2.pat
%%GOEMON%%lib/timidity/goemon/mutetrum.pat
%%GOEMON%%lib/timidity/goemon/nyguitar.pat
%%GOEMON%%lib/timidity/goemon/ob8.pat
%%GOEMON%%lib/timidity/goemon/oboe.pat
%%GOEMON%%lib/timidity/goemon/ocarina.pat
%%GOEMON%%lib/timidity/goemon/odguitar.pat
%%GOEMON%%lib/timidity/goemon/orchhit.pat
%%GOEMON%%lib/timidity/goemon/percorg.pat
%%GOEMON%%lib/timidity/goemon/piccolo.pat
%%GOEMON%%lib/timidity/goemon/pickbass.pat
%%GOEMON%%lib/timidity/goemon/pizzcato.pat
%%GOEMON%%lib/timidity/goemon/recorder.pat
%%GOEMON%%lib/timidity/goemon/reedorg.pat
%%GOEMON%%lib/timidity/goemon/revcym.pat
%%GOEMON%%lib/timidity/goemon/rhodes.pat
%%GOEMON%%lib/timidity/goemon/rvrbxylo.pat
%%GOEMON%%lib/timidity/goemon/santur.pat
%%GOEMON%%lib/timidity/goemon/sawwave.pat
%%GOEMON%%lib/timidity/goemon/scratch1.pat
%%GOEMON%%lib/timidity/goemon/scratch2.pat
%%GOEMON%%lib/timidity/goemon/seagulls.pat
%%GOEMON%%lib/timidity/goemon/shakazul.pat
%%GOEMON%%lib/timidity/goemon/shaker.pat
%%GOEMON%%lib/timidity/goemon/shamisen.pat
%%GOEMON%%lib/timidity/goemon/shannai.pat
%%GOEMON%%lib/timidity/goemon/sitar.pat
%%GOEMON%%lib/timidity/goemon/slap.pat
%%GOEMON%%lib/timidity/goemon/slapbas1.pat
%%GOEMON%%lib/timidity/goemon/slapbas2.pat
%%GOEMON%%lib/timidity/goemon/slapbass.pat
%%GOEMON%%lib/timidity/goemon/snare1.pat
%%GOEMON%%lib/timidity/goemon/snare2.pat
%%GOEMON%%lib/timidity/goemon/sologrnd.pat
%%GOEMON%%lib/timidity/goemon/soundtrk.pat
%%GOEMON%%lib/timidity/goemon/spctbell.pat
%%GOEMON%%lib/timidity/goemon/sprnosax.pat
%%GOEMON%%lib/timidity/goemon/sqrclick.pat
%%GOEMON%%lib/timidity/goemon/sqrwave.pat
%%GOEMON%%lib/timidity/goemon/startrak.pat
%%GOEMON%%lib/timidity/goemon/steeldrm.pat
%%GOEMON%%lib/timidity/goemon/stickrim.pat
%%GOEMON%%lib/timidity/goemon/sticks.pat
%%GOEMON%%lib/timidity/goemon/strings.pat
%%GOEMON%%lib/timidity/goemon/surdo1.pat
%%GOEMON%%lib/timidity/goemon/surdo2.pat
%%GOEMON%%lib/timidity/goemon/sweeper.pat
%%GOEMON%%lib/timidity/goemon/synbass1.pat
%%GOEMON%%lib/timidity/goemon/synbass2.pat
%%GOEMON%%lib/timidity/goemon/synbras1.pat
%%GOEMON%%lib/timidity/goemon/synbras2.pat
%%GOEMON%%lib/timidity/goemon/synstr1.pat
%%GOEMON%%lib/timidity/goemon/synstr2.pat
%%GOEMON%%lib/timidity/goemon/syntom.pat
%%GOEMON%%lib/timidity/goemon/synvoic1.pat
%%GOEMON%%lib/timidity/goemon/taiko.pat
%%GOEMON%%lib/timidity/goemon/tamborin.pat
%%GOEMON%%lib/timidity/goemon/tenorsax.pat
%%GOEMON%%lib/timidity/goemon/timbaleh.pat
%%GOEMON%%lib/timidity/goemon/timbalel.pat
%%GOEMON%%lib/timidity/goemon/timpani.pat
%%GOEMON%%lib/timidity/goemon/tomhi1.pat
%%GOEMON%%lib/timidity/goemon/tomhi2.pat
%%GOEMON%%lib/timidity/goemon/tomlo1.pat
%%GOEMON%%lib/timidity/goemon/tomlo2.pat
%%GOEMON%%lib/timidity/goemon/tommid1.pat
%%GOEMON%%lib/timidity/goemon/tommid2.pat
%%GOEMON%%lib/timidity/goemon/toms.pat
%%GOEMON%%lib/timidity/goemon/tremstr.pat
%%GOEMON%%lib/timidity/goemon/triangl1.pat
%%GOEMON%%lib/timidity/goemon/triangl2.pat
%%GOEMON%%lib/timidity/goemon/trombone.pat
%%GOEMON%%lib/timidity/goemon/tuba.pat
%%GOEMON%%lib/timidity/goemon/tubebell.pat
%%GOEMON%%lib/timidity/goemon/unicorn.pat
%%GOEMON%%lib/timidity/goemon/vibes.pat
%%GOEMON%%lib/timidity/goemon/vibslap.pat
%%GOEMON%%lib/timidity/goemon/viola.pat
%%GOEMON%%lib/timidity/goemon/violin.pat
%%GOEMON%%lib/timidity/goemon/voicedoo.pat
%%GOEMON%%lib/timidity/goemon/voices.pat
%%GOEMON%%lib/timidity/goemon/warmpad.pat
%%GOEMON%%lib/timidity/goemon/whistle.pat
%%GOEMON%%lib/timidity/goemon/whistle1.pat
%%GOEMON%%lib/timidity/goemon/whistle2.pat
%%GOEMON%%lib/timidity/goemon/woodblk.pat
%%GOEMON%%lib/timidity/goemon/woodblk1.pat
%%GOEMON%%lib/timidity/goemon/woodblk2.pat
%%GOEMON%%lib/timidity/goemon/woodflut.pat
lib/timidity/gravis.cfg
lib/timidity/gsdrum.cfg
lib/timidity/midia.cfg
lib/timidity/mt32.cfg
lib/timidity/timidity.cfg
lib/timidity/wowpats.cfg
%%GOEMON%%@dirrm lib/timidity/goemon/gsdrum40
%%GOEMON%%@dirrm lib/timidity/goemon/gsdrum08
%%GOEMON%%@dirrm lib/timidity/goemon/gsdrum00
%%GOEMON%%@dirrm lib/timidity/goemon
@dirrm lib/timidity

Return to bug 177074

Lines 14-31 Link Here

(-)guspat/Makefile (-7 / +6 lines)
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Izumo collection of Gravis Ultrasound MIDI patches	15	COMMENT= Izumo collection of Gravis Ultrasound MIDI patches
16		16
17	# Not useful without timidity.
18	RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++
19
20	NO_CDROM= Some of the patches are marked no-commercial-use
21
22	NO_BUILD= yes	17	NO_BUILD= yes
23		18	NO_CDROM= Some of the patches are marked no-commercial-use
24	WRKSRC= ${WRKDIR}/timidity
25	PLIST_SUB= TIMIDITY_DATADIR=${TIMIDITY_DATADIR}	19	PLIST_SUB= TIMIDITY_DATADIR=${TIMIDITY_DATADIR}
		20	WRKSRC= ${WRKDIR}/timidity
26		21
27	TIMIDITY_DATADIR= share/timidity	22	TIMIDITY_DATADIR= share/timidity
28		23
		24	post-patch:
		25	@${REINPLACE_CMD} -e 's\|/timidity\|/guspat\|g' \
		26	${WRKSRC}/timidity.cfg
		27
29	do-install:	28	do-install:
30	@${MKDIR} ${DATADIR}	29	@${MKDIR} ${DATADIR}
31	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}	30	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${DATADIR}

Lines 4-12 Link Here

(-)timidity/Makefile (-3 / +26 lines)
4	PORTVERSION= 0.2i	4	PORTVERSION= 0.2i
5	PORTREVISION= 1	5	PORTREVISION= 1
6	CATEGORIES= audio	6	CATEGORIES= audio
7	MASTER_SITES= http://www.onicos.com/staff/iz/timidity/dist/:timidity \	7	MASTER_SITES+= http://www.onicos.com/staff/iz/timidity/dist/:timidity
8	http://www.anime.net/~goemon/timidity/:tiins	8	DISTFILES+= ${DISTNAME}.tar.gz:timidity
9	DISTFILES= ${TIINS}:tiins ${DISTNAME}.tar.gz:timidity
10	EXTRACT_ONLY= ${DISTNAME}.tar.gz	9	EXTRACT_ONLY= ${DISTNAME}.tar.gz
11		10
12	MAINTAINER= kevinz5000@gmail.com	11	MAINTAINER= kevinz5000@gmail.com
Lines 18-31 Link Here
18	INSTALL_TARGET= install.all	17	INSTALL_TARGET= install.all
19	MAN1= timidity.1	18	MAN1= timidity.1
20		19
		20	OPTIONS_DEFINE= GUS
		21
		22	GUS_DESC= Use audio/guspat instead of included goemon
		23
		24	.include <bsd.port.options.mk>
		25
		26	.if ${PORT_OPTIONS:MGUS}
		27	RUN_DEPENDS+= ${LOCALBASE}/share/guspat/power.cfg:${PORTSDIR}/audio/guspat
		28	TDIR= ${LOCALBASE}/share/timidity
		29	TCONFIG= timidity.cfg-guspat
		30	PLIST_SUB+= GOEMON="@comment "
		31	.else
		32	# Goemon
		33	MASTER_SITES+= http://www.anime.net/~goemon/timidity/:tiins
		34	DISTFILES+= ${TIINS}:tiins
		35	TDIR= ${PREFIX}/lib/timidity
		36	TCONFIG= goemon.cfg
		37	PLIST_SUB+= GOEMON=""
		38	.endif
		39
21	post-patch:	40	post-patch:
22	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \	41	${REINPLACE_CMD} -e 's,machine/soundcard.h,sys/soundcard.h,' \
23	${WRKSRC}/linux_a.c	42	${WRKSRC}/linux_a.c
		43	${REINPLACE_CMD} -e 's\|%%TDIR%%\|${TDIR}\| ; s\|%%TCONFIG%%\|${TCONFIG}\|' \
		44	${WRKSRC}/timidity.cfg
24		45
25	post-install:	46	post-install:
		47	.if ! ${PORT_OPTIONS:MGUS}
26	cd ${PREFIX}/lib/timidity && \	48	cd ${PREFIX}/lib/timidity && \
27	${TAR} --no-same-owner --no-same-permissions -zxf ${DISTDIR}/${TIINS} && \	49	${TAR} --no-same-owner --no-same-permissions -zxf ${DISTDIR}/${TIINS} && \
28	${REINPLACE_CMD} -i "" -e 's,dir goemon,dir ${PREFIX}/lib/timidity/goemon,' \	50	${REINPLACE_CMD} -i "" -e 's,dir goemon,dir ${PREFIX}/lib/timidity/goemon,' \
29	goemon.cfg	51	goemon.cfg
		52	.endif
30		53
31	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Line 0 Link Here

(-)timidity/files/patch-Makefile (+81 lines)
		1	--- ./Makefile.orig 1996-05-26 04:26:46.000000000 -0500
		2	+++ ./Makefile 2013-04-21 10:18:23.000000000 -0500
		3	@@ -24,22 +24,22 @@
		4	# But where to change without revealing my secret identity?
		5
		6	########### Compiler and flags.
		7	-CC = gcc
		8	-DEBUGFLAGS = -Wall -O2
		9	+#CC = gcc
		10	+DEBUGFLAGS = -Wall
		11
		12	########### Install.
		13	-INSTALL = /usr/bin/install
		14	+#INSTALL = /usr/bin/install
		15
		16	# Where to install the executable
		17	-BIN_DIR = /usr/local/bin
		18	+BIN_DIR = ${PREFIX}/bin
		19
		20	# Where to install the manual pages
		21	-MAN_DIR = /usr/local/man/man1
		22	+MAN_DIR = ${PREFIX}/man/man1
		23
		24	# Where to install the patches, config files, and MIDI files.
		25	# If you change this, it's a good idea to recompile the binary,
		26	# or you'll need to invoke timidity with the -L option.
		27	-TIMID_DIR = /usr/local/lib/timidity
		28	+TIMID_DIR = ${PREFIX}/lib/timidity
		29
		30	# Where to install the Tcl code, if you use the Tcl code that is.
		31	TCL_DIR = $(TIMID_DIR)
		32	@@ -112,9 +112,9 @@
		33	#EXTRALIBS += -lgen
		34
		35	# Select the Tcl/Tk interface
		36	-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
		37	-SYSEXTRAS += tk_c.c
		38	-INST_TK = install.tk
		39	+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
		40	+#SYSEXTRAS += tk_c.c
		41	+#INST_TK = install.tk
		42	#EXTRAINCS +=
		43	#EXTRALIBS +=
		44
		45	@@ -136,7 +136,7 @@
		46	SDIST = timidity-lib-$(SUPPVERSION).tar.gz
		47	SDISTZIP = tilib$(FNSUPPVERSION).zip
		48
		49	-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
		50	+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
		51	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
		52
		53	########### All relevant files.. Anybody know autoconf?
		54	@@ -228,10 +228,10 @@
		55	wav2pat: wav2pat.c
		56	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
		57
		58	-depends depend dep:
		59	- $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
		60	-
		61	-include depends
		62	+#depends depend dep:
		63	+# $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
		64	+#
65	+#include depends
66
67	########### Installation targets
68
69	@@ -262,9 +262,9 @@
70	mkdir -p $(TIMID_DIR)
71	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
72
73	-install.patch: $(PATCHF)
74	- mkdir -p $(TIMID_DIR)/patch
75	- $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
76	+install.patch: #$(PATCHF)
77	+# mkdir -p $(TIMID_DIR)/patch
78	+# $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
79
80	install.tk: $(ALLTCLF)
81	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)

Lines 1-32 Link Here

(-)timidity/files/patch-aa (-32 lines)
1	*** mix.c.orig Mon May 20 17:09:46 1996
2	--- mix.c Sun Nov 17 10:01:36 1996
3	***************
4	* 23,29 **
5	--- 23,33 ----
6
7	#include <math.h>
8	#include <stdio.h>
9	+ #ifdef __FreeBSD__
10	+ #include <stdlib.h>
11	+ #else
12	#include <malloc.h>
13	+ #endif
14
15	#include "config.h"
16	#include "common.h"
17	*** resample.c.orig Mon May 20 17:09:47 1996
18	--- resample.c Sun Nov 17 09:59:29 1996
19	***************
20	* 22,28 **
21	--- 22,32 ----
22
23	#include <math.h>
24	#include <stdio.h>
25	+ #ifdef __FreeBSD__
26	+ #include <stdlib.h>
27	+ #else
28	#include <malloc.h>
29	+ #endif
30
31	#include "config.h"
32	#include "common.h"

Lines 1-81 Link Here

(-)timidity/files/patch-ab (-81 lines)
1	--- Makefile.orig Sun May 26 13:26:46 1996
2	+++ Makefile Mon Jan 4 04:08:35 1999
3	@@ -24,22 +24,22 @@
4	# But where to change without revealing my secret identity?
5
6	########### Compiler and flags.
7	-CC = gcc
8	-DEBUGFLAGS = -Wall -O2
9	+#CC = gcc
10	+DEBUGFLAGS = -Wall
11
12	########### Install.
13	-INSTALL = /usr/bin/install
14	+#INSTALL = /usr/bin/install
15
16	# Where to install the executable
17	-BIN_DIR = /usr/local/bin
18	+BIN_DIR = ${PREFIX}/bin
19
20	# Where to install the manual pages
21	-MAN_DIR = /usr/local/man/man1
22	+MAN_DIR = ${PREFIX}/man/man1
23
24	# Where to install the patches, config files, and MIDI files.
25	# If you change this, it's a good idea to recompile the binary,
26	# or you'll need to invoke timidity with the -L option.
27	-TIMID_DIR = /usr/local/lib/timidity
28	+TIMID_DIR = ${PREFIX}/lib/timidity
29
30	# Where to install the Tcl code, if you use the Tcl code that is.
31	TCL_DIR = $(TIMID_DIR)
32	@@ -112,9 +112,9 @@
33	#EXTRALIBS += -lgen
34
35	# Select the Tcl/Tk interface
36	-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
37	-SYSEXTRAS += tk_c.c
38	-INST_TK = install.tk
39	+#SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
40	+#SYSEXTRAS += tk_c.c
41	+#INST_TK = install.tk
42	#EXTRAINCS +=
43	#EXTRALIBS +=
44
45	@@ -136,7 +136,7 @@
46	SDIST = timidity-lib-$(SUPPVERSION).tar.gz
47	SDISTZIP = tilib$(FNSUPPVERSION).zip
48
49	-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
50	+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
51	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
52
53	########### All relevant files.. Anybody know autoconf?
54	@@ -228,10 +228,10 @@
55	wav2pat: wav2pat.c
56	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
57
58	-depends depend dep:
59	- $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
60	-
61	-include depends
62	+#depends depend dep:
63	+# $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
64	+#
65	+#include depends
66
67	########### Installation targets
68
69	@@ -262,9 +262,9 @@
70	mkdir -p $(TIMID_DIR)
71	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
72
73	-install.patch: $(PATCHF)
74	- mkdir -p $(TIMID_DIR)/patch
75	- $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
76	+install.patch: #$(PATCHF)
77	+# mkdir -p $(TIMID_DIR)/patch
78	+# $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
79
80	install.tk: $(ALLTCLF)
81	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)

Lines 1-177 Link Here

(-)timidity/files/patch-ae (-177 lines)
1	*** linux_a.c.orig Mon May 20 17:09:46 1996
2	--- linux_a.c Tue Jun 16 21:40:17 1998
3	***************
4	* 71,82 **
5	then 8-bit unsigned if it fails. If you have a sound device that
6	can't handle either, let me know. */
7
8	static int open_output(void)
9	{
10	int fd, tmp, i, warnings=0;
11
12	/* Open the audio device */
13	! fd=open(dpm.name, O_RDWR \| O_NDELAY);
14	if (fd<0)
15	{
16	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
17	--- 71,85 ----
18	then 8-bit unsigned if it fails. If you have a sound device that
19	can't handle either, let me know. */
20
21	+ /* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
22	+ static int luigi_driver = 0;
23	+
24	static int open_output(void)
25	{
26	int fd, tmp, i, warnings=0;
27
28	/* Open the audio device */
29	! fd=open(dpm.name, O_RDWR);
30	if (fd<0)
31	{
32	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
33	***************
34	* 84,89 **
35	--- 87,109 ----
36	return -1;
37	}
38
39	+ /* Figure out if we're running with the Luigi driver or
40	+ the original VoxWare driver, with code based on dburr/luigi
41	+ in ports/5607. It'd be great if we could do this before
42	+ opening the audio device, but oh well... */
43	+ #if defined(AIOGFMT) /* only defined in Luigi driver */
44	+ {
45	+ snd_chan_param s;
46	+ int i;
47	+ i = ioctl(fd, AIOGFMT, &s);
48	+ if (i != -1)
49	+ luigi_driver = 1;
50	+ }
51	+ #endif
52	+
53	+ ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
54	+ luigi_driver ? "luigi" : "VoxWare");
55	+
56	/* They can't mean these */
57	dpm.encoding &= ~(PE_ULAW\|PE_BYTESWAP);
58
59	***************
60	* 92,97 **
61	--- 112,140 ----
62	the other one. */
63
64	i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
65	+ if (luigi_driver)
66	+ {
67	+ if (dpm.encoding & PE_16BIT) {
68	+ int fmt = AFMT_S16_LE ;
69	+
70	+ if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 \|\| fmt != AFMT_S16_LE) {
71	+ fmt = AFMT_U8 ;
72	+ if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 \|\| fmt != AFMT_U8) {
73	+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
74	+ "%s doesn't support 16- or 8-bit sample width",
75	+ dpm.name);
76	+ close(fd);
77	+ return -1;
78	+ }
79	+ ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
80	+ "Sample width adjusted to %d bits", tmp);
81	+ dpm.encoding ^= PE_16BIT;
82	+ warnings = 1;
83	+ }
84	+ }
85	+ }
86	+ else
87	+ {
88	if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 \|\| tmp!=i)
89	{
90	/* Try the other one */
91	***************
92	* 109,114 **
93	--- 152,158 ----
94	dpm.encoding ^= PE_16BIT;
95	warnings=1;
96	}
97	+ }
98	if (dpm.encoding & PE_16BIT)
99	dpm.encoding \|= PE_SIGNED;
100	else
101	***************
102	* 163,168 **
103	--- 207,214 ----
104	/* Set buffer fragments (in extra_param[0]) */
105
106	tmp=AUDIO_BUFFER_BITS;
107	+ if (luigi_driver)
108	+ tmp += 2;
109	if (!(dpm.encoding & PE_MONO)) tmp++;
110	if (dpm.encoding & PE_16BIT) tmp++;
111	tmp \|= (dpm.extra_param[0]<<16);
112	***************
113	* 189,216 **
114	return warnings;
115	}
116
117	static void output_data(int32 *buf, int32 count)
118	{
119	if (!(dpm.encoding & PE_MONO)) count=2; / Stereo samples */
120
121	! if (dpm.encoding & PE_16BIT)
122	! {
123	/* Convert data to signed 16-bit PCM */
124	s32tos16(buf, count);
125	!
126	! /* Write the data out. Linux likes to give an EINTR if you suspend
127	! a program while waiting on a write, so we may need to retry. */
128	! while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
129	! ;
130	! }
131	! else
132	! {
133	/* Convert to 8-bit unsigned and write out. */
134	s32tou8(buf, count);
135	!
136	! while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
137	! ;
138	}
139	}
140
141	static void close_output(void)
142	--- 235,269 ----
143	return warnings;
144	}
145
146	+ /* output_data comes from Luigi's linux_a.c. This version seems to allow
147	+ for partial writes to the sound device, where as the original version
148	+ doesn't. */
149	static void output_data(int32 *buf, int32 count)
150	{
151	+ char *p;
152	+ int res, l;
153	+
154	if (!(dpm.encoding & PE_MONO)) count=2; / Stereo samples */
155
156	! if (dpm.encoding & PE_16BIT) {
157	/* Convert data to signed 16-bit PCM */
158	s32tos16(buf, count);
159	! res = count*2;
160	! } else {
161	/* Convert to 8-bit unsigned and write out. */
162	s32tou8(buf, count);
163	! res = count;
164	! }
165	! for (p = (char *) buf; res > 0; res -= l) {
166	! again:
167	! l = write(dpm.fd, p, res);
168	! if (l < 0) {
169	! if (errno == EINTR)
170	! goto again;
171	! return;
172	}
173	+ p += l;
174	+ }
175	}
176
177	static void close_output(void)

Lines 1-27 Link Here

(-)timidity/files/patch-af (-27 lines)
1	*** config.h.orig Sat Jun 1 07:54:49 1996
2	--- config.h Sat Sep 18 15:32:38 1999
3	***************
4	* 217,222 **
5	--- 217,238 ----
6	# endif
7	#endif /* linux */
8
9	+ #ifdef __FreeBSD__
10	+ #include <errno.h>
11	+ #include <machine/endian.h>
12	+ #if BYTE_ORDER == LITTLE_ENDIAN
13	+ #undef BIG_ENDIAN
14	+ #undef PDP_ENDIAN
15	+ #elif BYTE_ORDER == BIG_ENDIAN
16	+ #undef LITTLE_ENDIAN
17	+ #undef PDP_ENDIAN
18	+ #else
19	+ # error No valid byte sex defined
20	+ #endif
21	+ #define USE_LDEXP
22	+ #define PI M_PI
23	+ #endif
24	+
25	/* Win32 on Intel machines */
26	#ifdef __WIN32__
27	# define LITTLE_ENDIAN

Lines 1-87 Link Here

(-)timidity/files/patch-ag (-87 lines)
1	--- common.c 2003/02/08 01:42:31 1.1
2	+++ common.c 2003/02/08 01:53:36
3	@@ -24,7 +24,7 @@
4	#include <stdio.h>
5	#include <stdlib.h>
6
7	-#if defined(SOLARIS) \|\| defined(__WIN32__)
8	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
9	#include <string.h>
10	#else
11	#include <strings.h>
12	--- instrum.c 2003/02/08 01:42:31 1.1
13	+++ instrum.c 2003/02/08 01:53:50
14	@@ -25,7 +25,7 @@
15
16	#include <stdio.h>
17
18	-#if defined(SOLARIS) \|\| defined(__WIN32__)
19	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
20	#include <string.h>
21	#else
22	#include <strings.h>
23	--- playmidi.c 2003/02/08 01:42:31 1.1
24	+++ playmidi.c 2003/02/08 01:54:18
25	@@ -27,7 +27,7 @@
26	#endif
27	#include <stdlib.h>
28
29	-#if defined(SOLARIS) \|\| defined(__WIN32__)
30	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
31	# include <string.h>
32	#else
33	#include <strings.h>
34	--- raw_a.c 2003/02/08 01:42:31 1.1
35	+++ raw_a.c 2003/02/08 01:54:38
36	@@ -35,6 +35,7 @@
37
38	#ifdef __FreeBSD__
39	#include <stdio.h>
40	+#include <string.h>
41	#endif
42
43	#include "config.h"
44	--- readmidi.c 2003/02/08 01:42:31 1.1
45	+++ readmidi.c 2003/02/08 01:53:19
46	@@ -23,7 +23,7 @@
47	#include <stdlib.h>
48	#include <errno.h>
49
50	-#if defined(SOLARIS) \| defined(__WIN32__)
51	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
52	# include <string.h>
53	#else
54	#include <strings.h>
55	--- timidity.c 2003/02/08 01:42:31 1.1
56	+++ timidity.c 2003/02/08 01:54:51
57	@@ -21,7 +21,7 @@
58	#include <stdio.h>
59	#include <stdlib.h>
60
61	-#if defined(SOLARIS) \|\| defined(__WIN32__)
62	+#if defined(SOLARIS) \|\| defined(__WIN32__) \|\| defined(__FreeBSD__)
63	#include <string.h>
64	#else
65	#include <strings.h>
66	--- wav2pat.c 2003/02/08 01:42:31 1.1
67	+++ wav2pat.c 2003/02/08 01:55:29
68	@@ -28,7 +28,7 @@
69	#include <unistd.h>
70	#include <fcntl.h>
71
72	-#ifdef SOLARIS
73	+#if defined(SOLARIS) \|\| defined(__FreeBSD__)
74	#include <string.h>
75	#else
76	#include <strings.h>
77	--- wave_a.c 2003/02/08 01:42:31 1.1
78	+++ wave_a.c 2003/02/08 01:55:45
79	@@ -35,6 +35,7 @@
80
81	#ifdef __FreeBSD__
82	#include <stdio.h>
83	+#include <string.h>
84	#endif
85
86	#include "config.h"
87

Line 0 Link Here

(-)timidity/files/patch-config.h (+25 lines)
	1	--- ./config.h.orig 1996-06-01 07:54:49.000000000 -0500
	2	+++ ./config.h 2013-04-21 10:18:23.000000000 -0500
	3	@@ -217,6 +217,22 @@
	4	# endif
	5	#endif /* linux */
	6
	7	+#ifdef __FreeBSD__
	8	+#include <errno.h>
	9	+#include <machine/endian.h>
	10	+#if BYTE_ORDER == LITTLE_ENDIAN
	11	+#undef BIG_ENDIAN
	12	+#undef PDP_ENDIAN
	13	+#elif BYTE_ORDER == BIG_ENDIAN
	14	+#undef LITTLE_ENDIAN
	15	+#undef PDP_ENDIAN
	16	+#else
	17	+# error No valid byte sex defined
	18	+#endif
	19	+#define USE_LDEXP
	20	+#define PI M_PI
	21	+#endif
	22	+
	23	/* Win32 on Intel machines */
	24	#ifdef __WIN32__
	25	# define LITTLE_ENDIAN

Line 0 Link Here

(-)timidity/files/patch-linux_a.c (+139 lines)
		1	--- ./linux_a.c.orig 1996-05-20 08:09:46.000000000 -0500
		2	+++ ./linux_a.c 2013-04-21 10:18:23.000000000 -0500
		3	@@ -71,12 +71,15 @@
		4	then 8-bit unsigned if it fails. If you have a sound device that
		5	can't handle either, let me know. */
		6
		7	+/* Flag for Luigi Rizzo new sound driver (as opposed to VoxWare) */
		8	+static int luigi_driver = 0;
		9	+
		10	static int open_output(void)
		11	{
		12	int fd, tmp, i, warnings=0;
		13
		14	/* Open the audio device */
		15	- fd=open(dpm.name, O_RDWR \| O_NDELAY);
		16	+ fd=open(dpm.name, O_RDWR);
		17	if (fd<0)
		18	{
		19	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: %s",
		20	@@ -84,6 +87,23 @@
		21	return -1;
		22	}
		23
		24	+ /* Figure out if we're running with the Luigi driver or
		25	+ the original VoxWare driver, with code based on dburr/luigi
		26	+ in ports/5607. It'd be great if we could do this before
		27	+ opening the audio device, but oh well... */
		28	+#if defined(AIOGFMT) /* only defined in Luigi driver */
		29	+ {
		30	+ snd_chan_param s;
		31	+ int i;
		32	+ i = ioctl(fd, AIOGFMT, &s);
		33	+ if (i != -1)
		34	+ luigi_driver = 1;
		35	+ }
		36	+#endif
		37	+
		38	+ ctl->cmsg(CMSG_INFO, VERB_VERBOSE, "Using %s sound driver",
		39	+ luigi_driver ? "luigi" : "VoxWare");
		40	+
		41	/* They can't mean these */
		42	dpm.encoding &= ~(PE_ULAW\|PE_BYTESWAP);
		43
		44	@@ -92,6 +112,29 @@
		45	the other one. */
		46
		47	i=tmp=(dpm.encoding & PE_16BIT) ? 16 : 8;
		48	+ if (luigi_driver)
		49	+ {
		50	+ if (dpm.encoding & PE_16BIT) {
		51	+ int fmt = AFMT_S16_LE ;
		52	+
		53	+ if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 \|\| fmt != AFMT_S16_LE) {
		54	+ fmt = AFMT_U8 ;
		55	+ if (ioctl(fd, SNDCTL_DSP_SETFMT, &fmt) < 0 \|\| fmt != AFMT_U8) {
		56	+ ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
		57	+ "%s doesn't support 16- or 8-bit sample width",
		58	+ dpm.name);
		59	+ close(fd);
		60	+ return -1;
		61	+ }
		62	+ ctl->cmsg(CMSG_WARNING, VERB_VERBOSE,
		63	+ "Sample width adjusted to %d bits", tmp);
		64	+ dpm.encoding ^= PE_16BIT;
65	+ warnings = 1;
66	+ }
67	+ }
68	+ }
69	+ else
70	+ {
71	if (ioctl(fd, SNDCTL_DSP_SAMPLESIZE, &tmp)<0 \|\| tmp!=i)
72	{
73	/* Try the other one */
74	@@ -109,6 +152,7 @@
75	dpm.encoding ^= PE_16BIT;
76	warnings=1;
77	}
78	+ }
79	if (dpm.encoding & PE_16BIT)
80	dpm.encoding \|= PE_SIGNED;
81	else
82	@@ -163,6 +207,8 @@
83	/* Set buffer fragments (in extra_param[0]) */
84
85	tmp=AUDIO_BUFFER_BITS;
86	+ if (luigi_driver)
87	+ tmp += 2;
88	if (!(dpm.encoding & PE_MONO)) tmp++;
89	if (dpm.encoding & PE_16BIT) tmp++;
90	tmp \|= (dpm.extra_param[0]<<16);
91	@@ -189,28 +235,35 @@
92	return warnings;
93	}
94
95	+/* output_data comes from Luigi's linux_a.c. This version seems to allow
96	+ for partial writes to the sound device, where as the original version
97	+ doesn't. */
98	static void output_data(int32 *buf, int32 count)
99	{
100	+ char *p;
101	+ int res, l;
102	+
103	if (!(dpm.encoding & PE_MONO)) count=2; / Stereo samples */
104
105	- if (dpm.encoding & PE_16BIT)
106	- {
107	+ if (dpm.encoding & PE_16BIT) {
108	/* Convert data to signed 16-bit PCM */
109	s32tos16(buf, count);
110	-
111	- /* Write the data out. Linux likes to give an EINTR if you suspend
112	- a program while waiting on a write, so we may need to retry. */
113	- while ((-1==write(dpm.fd, buf, count * 2)) && errno==EINTR)
114	- ;
115	- }
116	- else
117	- {
118	+ res = count*2;
119	+ } else {
120	/* Convert to 8-bit unsigned and write out. */
121	s32tou8(buf, count);
122	-
123	- while ((-1==write(dpm.fd, buf, count)) && errno==EINTR)
124	- ;
125	+ res = count;
126	+ }
127	+ for (p = (char *) buf; res > 0; res -= l) {
128	+again:
129	+ l = write(dpm.fd, p, res);
130	+ if (l < 0) {
131	+ if (errno == EINTR)
132	+ goto again;
133	+ return;
134	}
135	+ p += l;
136	+ }
137	}
138
139	static void close_output(void)