diff --git a/libsndfile-example-fix.diff b/libsndfile-example-fix.diff index eaa8221..d4a759a 100644 --- a/libsndfile-example-fix.diff +++ b/libsndfile-example-fix.diff @@ -1,26 +1,6 @@ ---- examples/sfprocess.c-dist 2008-02-07 14:39:26.000000000 +0100 -+++ examples/sfprocess.c 2008-02-07 14:39:54.000000000 +0100 -@@ -69,6 +69,7 @@ main (void) - ** sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16 ; - ** sfinfo.channels = 2 ; - */ -+ memset(&sfinfo, 0, sizeof(sfinfo)); - if (! (infile = sf_open (infilename, SFM_READ, &sfinfo))) - { /* Open failed so print an error message. */ - printf ("Not able to open input file %s.\n", infilename) ; ---- examples/sndfile-convert.c-dist 2008-02-07 14:39:26.000000000 +0100 -+++ examples/sndfile-convert.c 2008-02-07 14:41:12.000000000 +0100 -@@ -242,6 +242,7 @@ main (int argc, char * argv []) - exit (1) ; - } ; - -+ memset(&sfinfo, 0, sizeof(sfinfo)); - if ((infile = sf_open (infilename, SFM_READ, &sfinfo)) == NULL) - { printf ("Not able to open input file %s.\n", infilename) ; - puts (sf_strerror (NULL)) ; ---- examples/cooledit-fixer.c-dist 2008-02-07 14:39:26.000000000 +0100 -+++ examples/cooledit-fixer.c 2008-02-07 14:40:36.000000000 +0100 -@@ -48,7 +48,9 @@ main (int argc, char *argv []) +--- examples/cooledit-fixer.c ++++ examples/cooledit-fixer.c +@@ -48,7 +48,9 @@ usage_exit (argv [0]) ; for (k = 1 ; k < argc ; k++) @@ -31,9 +11,9 @@ { /*-printf ("Failed to open : %s\n", argv [k]) ;-*/ continue ; } ; ---- examples/generate.c-dist 2008-02-07 14:39:26.000000000 +0100 -+++ examples/generate.c 2008-02-07 14:40:53.000000000 +0100 -@@ -84,6 +84,7 @@ encode_file (const char *infilename, con +--- examples/generate.c ++++ examples/generate.c +@@ -84,6 +84,7 @@ k = 16 - strlen (outfilename) ; PUT_DOTS (k) ; @@ -41,3 +21,31 @@ if (! (infile = sf_open (infilename, SFM_READ, &sfinfo))) { printf ("Error : could not open file : %s\n", infilename) ; puts (sf_strerror (NULL)) ; +--- examples/sfprocess.c ++++ examples/sfprocess.c +@@ -17,6 +17,7 @@ + */ + + #include ++#include + + /* Include this header file to use functions from libsndfile. */ + #include +@@ -69,6 +70,7 @@ + ** sfinfo.format = SF_FORMAT_RAW | SF_FORMAT_PCM_16 ; + ** sfinfo.channels = 2 ; + */ ++ memset(&sfinfo, 0, sizeof(sfinfo)); + if (! (infile = sf_open (infilename, SFM_READ, &sfinfo))) + { /* Open failed so print an error message. */ + printf ("Not able to open input file %s.\n", infilename) ; +--- examples/sndfile-convert.c ++++ examples/sndfile-convert.c +@@ -242,6 +242,7 @@ + exit (1) ; + } ; + ++ memset(&sfinfo, 0, sizeof(sfinfo)); + if ((infile = sf_open (infilename, SFM_READ, &sfinfo)) == NULL) + { printf ("Not able to open input file %s.\n", infilename) ; + puts (sf_strerror (NULL)) ; diff --git a/libsndfile.changes b/libsndfile.changes index 51c9467..4d3daf3 100644 --- a/libsndfile.changes +++ b/libsndfile.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 14 17:53:37 CEST 2008 - meissner@suse.de + +- prototype for memset + ------------------------------------------------------------------- Tue May 6 15:10:55 CEST 2008 - tiwai@suse.de diff --git a/libsndfile.spec b/libsndfile.spec index 32f99d0..e3e340c 100644 --- a/libsndfile.spec +++ b/libsndfile.spec @@ -2,9 +2,16 @@ # spec file for package libsndfile (Version 1.0.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,7 @@ Name: libsndfile BuildRequires: alsa-devel flac-devel gcc-c++ pkgconfig sqlite-devel Summary: A Library to Handle Various Audio File Formats Version: 1.0.17 -Release: 134 +Release: 171 License: LGPL v2.1 or later Group: System/Libraries Obsoletes: libsnd @@ -152,6 +159,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/octave/site/m/sndfile_save.m %changelog +* Tue Oct 14 2008 meissner@suse.de +- prototype for memset * Tue May 06 2008 tiwai@suse.de - fix missing initializations in demo programs (bnc#351128) * Tue Apr 15 2008 schwab@suse.de