File snack.patch of Package snack

Index: unix/Makefile.in
===================================================================
--- unix/Makefile.in.orig
+++ unix/Makefile.in
@@ -12,6 +12,7 @@ XINCLUDES   = @XINCLUDES@
 
 # Install SNACK package here
 
+libdir = @libdir@
 SNACK_INSTALL_PATH = @SNACK_INSTALL_PATH@
 SNACK_HINSTALL_PATH = @SNACK_HINSTALL_PATH@
 
@@ -31,7 +32,7 @@ CC        = @CC@
 
 INCLUDES  = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@
 
-CFLAGS    = -O @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
+CFLAGS    = ${OPTFLAGS} @CFLAGS@ @AFLAG@ ${INCLUDES} @TCLAPI@ -I${GENERIC_DIR} @DEFS@
 
 LIBSO     = -lc @ALIB@ @TCL_LIB_SPEC@
 
@@ -43,13 +44,13 @@ SHLIB_SUFFIX = @SHLIB_SUFFIX@
 all: libsound${SHLIB_SUFFIX} libsnack${SHLIB_SUFFIX} @DOSTUBLIB@ @LIBNIST@ @LIBOGG@ editversion
 
 OBJSO = sound.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
-	g711.o @AOBJ@ jkFormatMP3.o jkSoundProc.o ffa.o jkPitchCmd.o \
+	g711.o @AOBJ@ jkSoundProc.o ffa.o jkPitchCmd.o \
 	@STUBINITOBJ@ jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o \
 	jkFilterIIR.o jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
 OBJSN = snack.o jkSound.o jkSoundEngine.o jkSoundEdit.o jkSoundFile.o \
 	jkCanvSpeg.o jkCanvWave.o jkCanvSect.o ffa.o g711.o @AOBJ@ \
-	jkFormatMP3.o jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
+	jkSoundProc.o jkPitchCmd.o @STUBINITOBJ@ \
 	jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o jkFilterIIR.o \
 	jkGetF0.o sigproc.o jkFormant.o sigproc2.o
 
@@ -309,11 +310,11 @@ install:
 	    chmod 755 ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}; \
         else true; \
         fi;
-	cp -f libsound${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
-	cp -f libsnack${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
-	if test -f libsnackstub${VERSION}.a; then cp -f libsnackstub${VERSION}.a ${DESTDIR}${SNACK_INSTALL_PATH}/; fi
-	if test -f libsnacksphere${SHLIB_SUFFIX}; then cp -f libsnacksphere${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
-	if test -f libsnackogg${SHLIB_SUFFIX}; then cp -f libsnackogg${SHLIB_SUFFIX} ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/; fi
+	cp -f libsound${SHLIB_SUFFIX} ${DESTDIR}${libdir}
+	cp -f libsnack${SHLIB_SUFFIX} ${DESTDIR}${libdir}
+	if test -f libsnackstub${VERSION}.a; then cp -f libsnackstub${VERSION}.a ${DESTDIR}${libdir}; fi
+	if test -f libsnacksphere${SHLIB_SUFFIX}; then cp -f libsnacksphere${SHLIB_SUFFIX} ${DESTDIR}${libdir}; fi
+	if test -f libsnackogg${SHLIB_SUFFIX}; then cp -f libsnackogg${SHLIB_SUFFIX} ${DESTDIR}${libdir}; fi
 	cp -f $(UNIX_DIR)/snack.tcl ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
 	cp -f pkgIndex.tcl ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/
 
Index: unix/pkgIndex.tcl.dll
===================================================================
--- unix/pkgIndex.tcl.dll.orig
+++ unix/pkgIndex.tcl.dll
@@ -4,10 +4,10 @@
 # http://www.wjduquette.com/tcl/namespaces.html
 #
 
-package ifneeded snack 2.2 "[list load [file join $dir libsnack.dll]];[list source [file join $dir snack.tcl]]"
+package ifneeded snack 2.2 "[list load libsnack.dll];[list source [file join $dir snack.tcl]]"
 
-package ifneeded sound 2.2 [list load [file join $dir libsound.dll]]
+package ifneeded sound 2.2 [list load libsound.dll]
 
-package ifneeded snacksphere 1.2 [list load [file join $dir libsnacksphere.dll]]
+package ifneeded snacksphere 1.2 [list load libsnacksphere.dll]
 
-package ifneeded snackogg 1.3 [list load [file join $dir libsnackogg.dll]]
+package ifneeded snackogg 1.3 [list load libsnackogg.dll]
Index: generic/jkSoundFile.c
===================================================================
--- generic/jkSoundFile.c.orig
+++ generic/jkSoundFile.c
@@ -35,9 +35,6 @@ GuessWavFile(char *buf, int len)
 {
   if (len < 21) return(QUE_STRING);
   if (strncasecmp("RIFF", buf, strlen("RIFF")) == 0) {
-    if (buf[20] == 85) {
-      return(MP3_STRING);
-    }
     if (strncasecmp("WAVE", &buf[8], strlen("WAVE")) == 0) {
       return(WAV_STRING);
     }
@@ -3305,22 +3302,6 @@ Snack_FileFormat snackRawFormat = {
   (Snack_FileFormat *) NULL
 };
 
-Snack_FileFormat snackMp3Format = {
-  MP3_STRING,
-  GuessMP3File,
-  GetMP3Header,
-  ExtMP3File,
-  NULL,
-  OpenMP3File,
-  CloseMP3File,
-  ReadMP3Samples,
-  NULL,
-  SeekMP3File,
-  FreeMP3Header,
-  ConfigMP3Header,
-  (Snack_FileFormat *) NULL
-};
-
 Snack_FileFormat snackSmpFormat = {
   SMP_STRING,
   GuessSmpFile,
@@ -3434,8 +3415,7 @@ SnackDefineFileFormats(Tcl_Interp *inter
 */
 {
   snackFileFormats        = &snackWavFormat;
-  snackWavFormat.nextPtr  = &snackMp3Format;
-  snackMp3Format.nextPtr  = &snackAiffFormat;
+  snackWavFormat.nextPtr  = &snackAiffFormat;
   snackAiffFormat.nextPtr = &snackAuFormat;
   snackAuFormat.nextPtr   = &snackSmpFormat;
   snackSmpFormat.nextPtr  = &snackCslFormat;