rpms/gt/F-7 gt-0.4-compile-fix.patch, NONE, 1.1 gt-0.4-config-default-velocity-layer.patch, NONE, 1.1 gt-0.4-noac3.patch, NONE, 1.1 gt-0.4-ppc-compile-fix.patch, NONE, 1.1 gt.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Jan 30 21:29:57 UTC 2008

Author: jwrdegoede

Update of /cvs/extras/rpms/gt/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19415

Modified Files:
	.cvsignore sources 
Added Files:
	gt-0.4-compile-fix.patch 
	gt-0.4-config-default-velocity-layer.patch gt-0.4-noac3.patch 
	gt-0.4-ppc-compile-fix.patch gt.spec 
Log Message:
* Wed Jan 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4-3
- Correct license field from GPLv2 to GPLv2+


gt-0.4-compile-fix.patch:

--- NEW FILE gt-0.4-compile-fix.patch ---
diff -up gt-0.4/src/instrum.c~ gt-0.4/src/instrum.c
--- gt-0.4/src/instrum.c~	2008-01-27 14:21:17.000000000 +0100
+++ gt-0.4/src/instrum.c	2008-01-27 14:21:17.000000000 +0100
@@ -1170,7 +1170,7 @@ load_instrument (ToneBank *b, int bank, 
 			           sp->lfo_sweep_increment,
 			           sp->lfo_phase_increment, sp->lfo_depth);
 		    }
-		    READ_CHAR ((int8)sp->aps_parameter);
+		    READ_CHAR (sp->aps_parameter);
 		    /* skip (fp, 1); */
 		}
 		else {

gt-0.4-config-default-velocity-layer.patch:

--- NEW FILE gt-0.4-config-default-velocity-layer.patch ---
diff -ur gt-0.4/utils/unsf.c gt-0.4.new/utils/unsf.c
--- gt-0.4/utils/unsf.c	2004-11-07 22:41:05.000000000 +0100
+++ gt-0.4.new/utils/unsf.c	2008-01-27 19:55:30.000000000 +0100
@@ -100,6 +100,11 @@
    unsigned char other_patches[128];
 } VelocityRangeList;
 
+/* allow the user to choose which velocity to write the first (as the first
+   one gets used by apps which do not know about the extended patch format) */
+static char melody_velocity_override[128][128];
+static char drum_velocity_override[128][128];
+
 static int opt_8bit = FALSE;
 static int opt_verbose = FALSE;
 static int opt_veryverbose = FALSE;
@@ -2980,6 +2988,8 @@
 						width = vlist->velmax[k] - vlist->velmin[k];
 					}
 				}
+				if (melody_velocity_override[i][j] != -1)
+					widest = melody_velocity_override[i][j];
 				if (widest) {
 					velmin = vlist->velmin[0];
 					velmax = vlist->velmax[0];
@@ -3020,6 +3030,8 @@
 						width = vlist->velmax[k] - vlist->velmin[k];
 					}
 				}
+				if (drum_velocity_override[i][j] != -1)
+					widest = drum_velocity_override[i][j];
 				if (widest) {
 					velmin = vlist->velmin[0];
 					velmax = vlist->velmax[0];
@@ -3663,8 +3675,12 @@
 	int i, c;
 	char cfgname[80];
 	char *inname;
+	char *sep1, *sep2;
+	
+	memset(melody_velocity_override, -1, 128*128);
+	memset(drum_velocity_override, -1, 128*128);
 
-	while ((c = getopt (argc, argv, "FVvnsdm")) > 0)
+	while ((c = getopt (argc, argv, "FVvnsdmM:D:")) > 0)
 		switch (c) {
 			case 'v':
 	    			opt_verbose = 1;
@@ -3687,13 +3703,35 @@
 			case 'V':
 	    			opt_adjust_volume = 0;
 	    			break;
+			case 'M':
+				sep1 = strchr(optarg, ':');
+				sep2 = strchr(optarg, '=');
+				if (sep1 && sep2)
+				{
+				  melody_velocity_override[atoi(optarg)]
+				    [atoi(sep1 + 1)] = atoi(sep2 + 1);
+				  break;
+				}
+				/* error fall through, check will fail again */
+			case 'D':
+				sep1 = strchr(optarg, ':');
+				sep2 = strchr(optarg, '=');
+				if (sep1 && sep2)
+				{
+				  drum_velocity_override[atoi(optarg)]
+				    [atoi(sep1 + 1)] = atoi(sep2 + 1);
+				  break;
+				}
+				/* error fall through */
 			default:
-				fprintf(stderr, "usage: unsf [-v] [-n] [-s] [-d] [-m] [-F] [-V] filename\n");
+				fprintf(stderr, "usage: unsf [-v] [-n] [-s] [-d] [-m] [-F] [-V] [-M <bank>:<instrument>=<layer>]\n"
+						"  [-D <bank>:<instrument>=<layer>] <filename>\n");
 				return 1;
 		}
 
 	if (argc - optind != 1) {
-		fprintf(stderr, "usage: unsf [-v] [-n] [-s] [-d] [-m] [-F] [-V] filename\n");
+		fprintf(stderr, "usage: unsf [-v] [-n] [-s] [-d] [-m] [-F] [-V] [-M <bank>:<instrument>=<layer>]\n"
+		                "  [-D <bank>:<instrument>=<layer>] <filename>\n");
 		exit(1);
 	}
 
diff -ur gt-0.4/utils/unsf.man gt-0.4.new/utils/unsf.man
--- gt-0.4/utils/unsf.man	2004-11-07 23:20:37.000000000 +0100
+++ gt-0.4.new/utils/unsf.man	2008-01-27 20:03:06.000000000 +0100
@@ -6,7 +6,8 @@
 
 
 .SH SYNOPSIS
-.B unsf [-v|-s|-m|-d|-n|-V] \fBsoundfont-file\fR
+.B unsf
+[\fI-v|-s|-m|-d|-n|-V\fR] [\fI-M <bank>:<instrument>=<layer>\fR] [\fI-D <bank>:<instrument>=<layer>\fR] \fBsoundfont-file\fR
 
 
 .SH DESCRIPTION
@@ -135,6 +136,15 @@
 .TP
 .B \-v
 Verbose.
+.TP
+.B \-M \fI<bank>:<instrument>=<layer>\fR
+Make the given velocity \fIlayer\fR the default for \fIbank:instrument\fR,
+this affects programs which do not know howto handle the extended GUS patch
+format, as they will always play the default layer, and this determines which
+layer gets written when using \fB-s\fR.  
+.TP
+.B \-D \fI<bank>:<instrument>=<layer>\fR
+Same as \fB-M\fR but then for drum banks.
 
 .SH AUTHORS
 

gt-0.4-noac3.patch:

--- NEW FILE gt-0.4-noac3.patch ---
diff -up gt-0.4/src/Makefile.in~ gt-0.4/src/Makefile.in
--- gt-0.4/src/Makefile.in~	2008-01-27 14:17:25.000000000 +0100
+++ gt-0.4/src/Makefile.in	2008-01-27 14:17:25.000000000 +0100
@@ -141,7 +141,7 @@ gt_SOURCES = timidity.c common.c readmid
         wave_a.c dumb_c.c $(CURSES_SOURCE) \
         sndfont.c readsbk.c sfz.c \
 	resample.c resample32.c resample_l.c resample_f.c resample_s.c resample_m.c \
-	cfg.c ac3enc.c ac3_a.c $(ALSA_SOURCE)
+	cfg.c $(ALSA_SOURCE)
 
 
 sf2cfg_SOURCES = sf2cfg.c readsbk.c
@@ -149,7 +149,6 @@ sfz2pat_SOURCES = sfz2pat.c tables.c
 
 noinst_HEADERS = gtim.h common.h readmidi.h playmidi.h resample.h mix.h instrum.h \
 	tables.h butter.h controls.h output.h filter.h sbk.h sflayer.h effects.h \
-	ac3_codec.h ac3_common.h
 
 
 man1_MANS = gt.man sf2cfg.man sfz2pat.man
@@ -168,7 +167,7 @@ am__gt_SOURCES_DIST = timidity.c common.
 	instrum.c tables.c controls.c output.c filter.c wave_a.c \
 	dumb_c.c ncurs_c.c sndfont.c readsbk.c sfz.c resample.c \
 	resample32.c resample_l.c resample_f.c resample_s.c \
-	resample_m.c cfg.c ac3enc.c ac3_a.c alsa_a.c
+	resample_m.c cfg.c alsa_a.c
 @HAS_CURSES_TRUE at am__objects_1 = ncurs_c.$(OBJEXT)
 @HAS_ALSA_TRUE at am__objects_2 = alsa_a.$(OBJEXT)
 am_gt_OBJECTS = timidity.$(OBJEXT) common.$(OBJEXT) readmidi.$(OBJEXT) \
@@ -178,8 +177,7 @@ am_gt_OBJECTS = timidity.$(OBJEXT) commo
 	$(am__objects_1) sndfont.$(OBJEXT) readsbk.$(OBJEXT) \
 	sfz.$(OBJEXT) resample.$(OBJEXT) resample32.$(OBJEXT) \
 	resample_l.$(OBJEXT) resample_f.$(OBJEXT) resample_s.$(OBJEXT) \
-	resample_m.$(OBJEXT) cfg.$(OBJEXT) ac3enc.$(OBJEXT) \
-	ac3_a.$(OBJEXT) $(am__objects_2)
+	resample_m.$(OBJEXT) cfg.$(OBJEXT) $(am__objects_2)
 gt_OBJECTS = $(am_gt_OBJECTS)
 gt_DEPENDENCIES =
 gt_LDFLAGS =
@@ -201,8 +199,7 @@ wav2pat_LDFLAGS =
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
- at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ac3_a.Po ./$(DEPDIR)/ac3enc.Po \
- at AMDEP_TRUE@	./$(DEPDIR)/alsa_a.Po ./$(DEPDIR)/cfg.Po \
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/alsa_a.Po ./$(DEPDIR)/cfg.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/common.Po ./$(DEPDIR)/controls.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/dumb_c.Po ./$(DEPDIR)/filter.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/instrum.Po ./$(DEPDIR)/mix.Po \
@@ -301,8 +298,6 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ac3_a.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ac3enc.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alsa_a.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cfg.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/common.Po at am__quote@
diff -up gt-0.4/src/Makefile.am~ gt-0.4/src/Makefile.am
--- gt-0.4/src/Makefile.am~	2008-01-27 14:16:30.000000000 +0100
+++ gt-0.4/src/Makefile.am	2008-01-27 14:16:30.000000000 +0100
@@ -31,14 +31,13 @@ gt_SOURCES = timidity.c common.c readmid
         wave_a.c dumb_c.c $(CURSES_SOURCE) \
         sndfont.c readsbk.c sfz.c \
 	resample.c resample32.c resample_l.c resample_f.c resample_s.c resample_m.c \
-	cfg.c ac3enc.c ac3_a.c $(ALSA_SOURCE)
+	cfg.c $(ALSA_SOURCE)
 
 sf2cfg_SOURCES = sf2cfg.c readsbk.c
 sfz2pat_SOURCES = sfz2pat.c tables.c
 
 noinst_HEADERS = gtim.h common.h readmidi.h playmidi.h resample.h mix.h instrum.h \
 	tables.h butter.h controls.h output.h filter.h sbk.h sflayer.h effects.h \
-	ac3_codec.h ac3_common.h
 
 cfg.c: cfg.l
 	rm -f cfg.c
diff -up gt-0.4/src/output.c~ gt-0.4/src/output.c
--- gt-0.4/src/output.c~	2008-01-27 14:21:53.000000000 +0100
+++ gt-0.4/src/output.c	2008-01-27 14:21:53.000000000 +0100
@@ -35,8 +35,6 @@ extern PlayMode alsa_play_mode;
 #define DEFAULT_PLAY_MODE &alsa_play_mode
 #endif
 
-extern PlayMode ac3_play_mode;
-
 /* This is always compiled in. */
 extern PlayMode wave_play_mode;
 
@@ -46,7 +44,6 @@ PlayMode *play_mode_list[] = {
     DEFAULT_PLAY_MODE,
 #endif
     &wave_play_mode,
-    &ac3_play_mode,
     0
 };
 

gt-0.4-ppc-compile-fix.patch:

--- NEW FILE gt-0.4-ppc-compile-fix.patch ---
diff -up gt-0.4/src/sfz2pat.c~ gt-0.4/src/sfz2pat.c
--- gt-0.4/src/sfz2pat.c~	2008-01-30 09:53:36.000000000 +0100
+++ gt-0.4/src/sfz2pat.c	2008-01-30 09:53:36.000000000 +0100
@@ -3897,7 +3897,6 @@ int read_sample(char *name)
 		}
 	}
 #else
-	else
 	    /* convert to machine byte order */
 	{
 	    int32   data_len = datasize / 2;
diff -up gt-0.4/src/sfz2pat.l~ gt-0.4/src/sfz2pat.l
--- gt-0.4/src/sfz2pat.l~	2008-01-30 09:57:29.000000000 +0100
+++ gt-0.4/src/sfz2pat.l	2008-01-30 09:57:29.000000000 +0100
@@ -1878,7 +1878,6 @@ int read_sample(char *name)
 		}
 	}
 #else
-	else
 	    /* convert to machine byte order */
 	{
 	    int32   data_len = datasize / 2;


--- NEW FILE gt.spec ---
Name:           gt
Version:        0.4
Release:        3%{?dist}
Summary:        Modified Timidity which supportes enhanced gus format patches
Group:          Applications/Multimedia
License:        GPLv2+
URL:            http://alsa.opensrc.org/index.php/GusSoundfont
# This is ftp://ling.lll.hawaii.edu/pub/greg/gt-0.4.tar.gz
# with the examples/patch and sfz directories removed as the license of the
# samples in these dirs is unclear. Also the src/ac3* files have been removed
# as these contain patented code.
Source0:        %{name}-%{version}-clean.tar.gz
Patch0:         gt-0.4-noac3.patch
Patch1:         gt-0.4-compile-fix.patch
Patch2:         gt-0.4-optflags.patch
Patch3:         gt-0.4-config-default-velocity-layer.patch
Patch4:         gt-0.4-ppc-compile-fix.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  alsa-lib-devel libvorbis-devel
Requires:       timidity++-patches

%description
Modified timidity midi player which supportes enhanced gus format patches and
surround audio output.


%package -n soundfont-utils
Summary:        Utilities for converting from / to various soundfont formats
Group:          Applications/Multimedia

%description -n soundfont-utils
Utilities for converting from / to various soundfont formats and a midi file
disassembler.


%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
cp -p src/README README.timidity


%build
%configure
# doesn't build properly with %{?_smp_mflags}
make


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# rename somewhat genericly named dim to midi-disasm
mv $RPM_BUILD_ROOT%{_bindir}/dim $RPM_BUILD_ROOT%{_bindir}/midi-disasm
mv $RPM_BUILD_ROOT%{_mandir}/man1/dim.1 \
   $RPM_BUILD_ROOT%{_mandir}/man1/midi-disasm.1
sed -i 's/dim/midi-disasm/g' $RPM_BUILD_ROOT%{_mandir}/man1/midi-disasm.1
touch -r utils/midifile.c $RPM_BUILD_ROOT%{_mandir}/man1/midi-disasm.1
 

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog FEATURES NEWS README*
%{_bindir}/gt
%{_mandir}/man1/gt.1*

%files -n soundfont-utils
%doc utils/README* utils/GUSSF2-SPEC
%{_bindir}/*
%exclude %{_bindir}/gt
%{_mandir}/man1/*
%exclude %{_mandir}/man1/gt.1*


%changelog
* Wed Jan 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4-3
- Correct license field from GPLv2 to GPLv2+

* Wed Jan 30 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4-2
- Fix compilation on big endian archs

* Sun Jan 27 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.4-1
- Initial Fedora Package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gt/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Jan 2008 20:39:26 -0000	1.1
+++ .cvsignore	30 Jan 2008 21:29:22 -0000	1.2
@@ -0,0 +1 @@
+gt-0.4-clean.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gt/F-7/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Jan 2008 20:39:26 -0000	1.1
+++ sources	30 Jan 2008 21:29:22 -0000	1.2
@@ -0,0 +1 @@
+d595e464e6403f4bd8c3cfc7c42b2aec  gt-0.4-clean.tar.gz


