Hello community, here is the log from the commit of package snack for openSUSE:Factory checked in at Tue Oct 6 04:43:33 CEST 2009. -------- --- snack/snack.changes 2009-07-29 17:18:37.000000000 +0200 +++ snack/snack.changes 2009-10-02 15:34:55.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Oct 2 15:31:27 CEST 2009 - max@suse.de + +- Fix loading of libsnack by removing the rest of the MP3-related + symbols. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snack.spec ++++++ --- /var/tmp/diff_new_pack.wPHx8v/_old 2009-10-06 04:42:19.000000000 +0200 +++ /var/tmp/diff_new_pack.wPHx8v/_new 2009-10-06 04:42:19.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: fdupes libvorbis-devel python tk-devel xorg-x11-devel Summary: Sound Extension for Tcl/Tk and Python Version: 2.2.10 -Release: 189 +Release: 190 Group: Development/Libraries/Tcl Requires: tcl tk %{py_requires} ++++++ snack.patch ++++++ --- /var/tmp/diff_new_pack.wPHx8v/_old 2009-10-06 04:42:20.000000000 +0200 +++ /var/tmp/diff_new_pack.wPHx8v/_new 2009-10-06 04:42:20.000000000 +0200 @@ -1,6 +1,8 @@ ---- unix/Makefile.in +Index: unix/Makefile.in +=================================================================== +--- unix/Makefile.in.orig +++ unix/Makefile.in -@@ -12,6 +12,7 @@ +@@ -12,6 +12,7 @@ XINCLUDES = @XINCLUDES@ # Install SNACK package here @@ -8,7 +10,7 @@ SNACK_INSTALL_PATH = @SNACK_INSTALL_PATH@ SNACK_HINSTALL_PATH = @SNACK_HINSTALL_PATH@ -@@ -31,7 +32,7 @@ +@@ -31,7 +32,7 @@ CC = @CC@ INCLUDES = ${XINCLUDES} @TCL_INCLUDE_SPEC@ -I${TCL_INCPATH} -I${TK_INCPATH} @AINC@ @NISTINC@ @@ -17,7 +19,7 @@ LIBSO = -lc @ALIB@ @TCL_LIB_SPEC@ -@@ -43,13 +44,13 @@ +@@ -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 \ @@ -33,7 +35,7 @@ jkAudio.o jkMixer.o shape.o jkFilter.o jkSynthesis.o jkFilterIIR.o \ jkGetF0.o sigproc.o jkFormant.o sigproc2.o -@@ -309,11 +310,11 @@ +@@ -309,11 +310,11 @@ install: chmod 755 ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}; \ else true; \ fi; @@ -50,7 +52,9 @@ cp -f $(UNIX_DIR)/snack.tcl ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/ cp -f pkgIndex.tcl ${DESTDIR}${SNACK_INSTALL_PATH}/snack${VERSION}/ ---- unix/pkgIndex.tcl.dll +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 @@ -67,3 +71,50 @@ -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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org