Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package speex for openSUSE:Factory checked in at 2022-07-13 14:31:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/speex (Old) and /work/SRC/openSUSE:Factory/.speex.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "speex" Wed Jul 13 14:31:45 2022 rev:32 rq:988546 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/speex/speex.changes 2021-11-15 00:06:23.211604097 +0100 +++ /work/SRC/openSUSE:Factory/.speex.new.1523/speex.changes 2022-07-13 14:31:50.705246323 +0200 @@ -1,0 +2,15 @@ +Mon Jul 11 16:31:04 UTC 2022 - Dirk M??ller <[email protected]> + +- update to 1.2.1: + * Check for _WIN32 instead of WIN32 in preprocessor checks + * wav_io: check for EOF when seeking in wav (fixes hang discovered by fuzzing) + * CI: add gitlab CI integration + * fixed-point: make left shift macros use unsigned to avoid undefined behaviour + * math_approx: use unsigned int for LCG pseudorandom generator (avoids integer overflow) + * oss-fuzz: add integration and fuzzing target + * speexenc: guard against invalid channel numbers) + * speexdec: make left shift macros use unsigned to avoid undefined behaviour + * autotools: do not use deprecated macros +- drop speex-CVE-2020-23903.patch (upstream) + +------------------------------------------------------------------- Old: ---- speex-1.2.0.tar.gz speex-CVE-2020-23903.patch New: ---- speex-1.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ speex.spec ++++++ --- /var/tmp/diff_new_pack.w40kSL/_old 2022-07-13 14:31:51.721247653 +0200 +++ /var/tmp/diff_new_pack.w40kSL/_new 2022-07-13 14:31:51.725247659 +0200 @@ -1,7 +1,7 @@ # # spec file for package speex # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,20 @@ # -%define upstream_version 1.2.0 %define libname libspeex1 Name: speex -Version: 1.2 +Version: 1.2.1 Release: 0 Summary: An Open Source, Patent Free Speech Codec License: BSD-3-Clause Group: System/Libraries -URL: http://www.speex.org/ -Source0: http://downloads.xiph.org/releases/speex/%{name}-%{upstream_version}.tar.gz +URL: https://www.speex.org/ +Source0: https://downloads.xiph.org/releases/speex/%{name}-%{version}.tar.gz Source1: baselibs.conf Patch0: speex-no-build-date.patch -Patch1: speex-CVE-2020-23903.patch -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(speexdsp) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Speex is a patent free audio codec designed especially for voice @@ -65,19 +62,18 @@ SpeeX library. %prep -%setup -q -n %{name}-%{upstream_version} +%setup -q %patch0 -%patch1 -p1 %build %configure \ --enable-binaries \ --disable-static -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install # remove duped documents rm -rf %{buildroot}%{_datadir}/doc/speex* # remove unneeded *.la files @@ -85,21 +81,18 @@ rm -f %{buildroot}%{_libdir}/*.a %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING NEWS README TODO +%license COPYING +%doc AUTHORS ChangeLog NEWS README TODO %{_bindir}/speex* %{_mandir}/man?/* %files -n %{libname} -%defattr(-,root,root) %{_libdir}/libspeex.so.* %files devel -%defattr(-,root,root) %doc doc/manual.pdf %{_includedir}/* %{_libdir}/lib*.so ++++++ speex-1.2.0.tar.gz -> speex-1.2.1.tar.gz ++++++ ++++ 20864 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/COPYING new/speex-1.2.1/COPYING --- old/speex-1.2.0/COPYING 2015-07-06 17:02:10.000000000 +0200 +++ new/speex-1.2.1/COPYING 2022-05-09 15:36:46.000000000 +0200 @@ -1,7 +1,7 @@ Copyright 2002-2008 Xiph.org Foundation Copyright 2002-2008 Jean-Marc Valin Copyright 2005-2007 Analog Devices Inc. -Copyright 2005-2008 Commonwealth Scientific and Industrial Research +Copyright 2005-2008 Commonwealth Scientific and Industrial Research Organisation (CSIRO) Copyright 1993, 2002, 2006 David Rowe Copyright 2003 EpicGames diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/Speex.spec new/speex-1.2.1/Speex.spec --- old/speex-1.2.0/Speex.spec 2016-12-08 00:21:07.000000000 +0100 +++ new/speex-1.2.1/Speex.spec 2022-06-16 19:09:01.000000000 +0200 @@ -1,5 +1,5 @@ %define name speex -%define ver 1.2.0 +%define ver 1.2.1 %define rel 1 Summary: An open-source, patent-free speech codec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/compile new/speex-1.2.1/compile --- old/speex-1.2.0/compile 2016-12-07 20:52:53.000000000 +0100 +++ new/speex-1.2.1/compile 2022-06-16 19:08:58.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/config.h.in new/speex-1.2.1/config.h.in --- old/speex-1.2.0/config.h.in 2016-12-08 00:21:08.000000000 +0100 +++ new/speex-1.2.1/config.h.in 2022-06-16 19:08:57.000000000 +0200 @@ -48,12 +48,12 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -141,7 +141,9 @@ /* Complete version string */ #undef SPEEX_VERSION -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Enable support for TI C55X DSP */ @@ -197,14 +199,15 @@ /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is - supported directly. */ + supported only directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict or - __restrict__, even though the corresponding Sun C compiler ends up with - "#define restrict _Restrict" or "#define restrict __restrict__" in the - previous line. Perhaps some future version of Sun C++ will work with - restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ -#if defined __SUNPRO_CC && !defined __RESTRICT +/* Work around a bug in older versions of Sun C++, which did not + #define __restrict__ or support _Restrict or __restrict__ + even though the corresponding Sun C compiler ended up with + "#define restrict _Restrict" or "#define restrict __restrict__" + in the previous line. This workaround can be removed once + we assume Oracle Developer Studio 12.5 (2016) or later. */ +#if defined __SUNPRO_CC && !defined __RESTRICT && !defined __restrict__ # define _Restrict # define __restrict__ #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/configure.ac new/speex-1.2.1/configure.ac --- old/speex-1.2.0/configure.ac 2016-12-08 00:20:14.000000000 +0100 +++ new/speex-1.2.1/configure.ac 2022-06-16 19:07:29.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*- -AC_INIT([speex],[1.2.0],[[email protected]]) +AC_INIT([speex],[1.2.1],[[email protected]]) AC_CONFIG_SRCDIR([libspeex/speex.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -10,12 +10,12 @@ SPEEX_MAJOR_VERSION=1 -SPEEX_MINOR_VERSION=1 -SPEEX_MICRO_VERSION=16 +SPEEX_MINOR_VERSION=2 +SPEEX_MICRO_VERSION=1 SPEEX_EXTRA_VERSION= SPEEX_LT_CURRENT=6 -SPEEX_LT_REVISION=1 +SPEEX_LT_REVISION=2 SPEEX_LT_AGE=5 @@ -27,8 +27,8 @@ AM_MAINTAINER_MODE([enable]) AC_CANONICAL_HOST -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL +_LT_SET_OPTION([LT_INIT],[win32-dll]) +LT_INIT AC_C_BIGENDIAN AC_C_CONST @@ -37,15 +37,13 @@ AC_MSG_CHECKING(for C99 variable-size arrays) -AC_TRY_COMPILE( , [ ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ int foo; foo = 10; int array[foo]; -], -[has_var_arrays=yes;AC_DEFINE([VAR_ARRAYS], [], [Use C99 variable-size arrays]) -], -has_var_arrays=no -) +]])],[has_var_arrays=yes;AC_DEFINE([VAR_ARRAYS], [], [Use C99 variable-size arrays]) +],[has_var_arrays=no +]) AC_MSG_RESULT($has_var_arrays) AC_CHECK_HEADERS([alloca.h getopt.h]) @@ -167,13 +165,12 @@ fi]) AC_ARG_ENABLE(binaries, [ --disable-binaries Do not build the encoder and decoder programs, only the library]) -if test "$enableval" != no; then +AS_IF([test "x$enable_binaries" != "xno"], [ PKG_CHECK_MODULES([OGG], [ogg], AM_CONDITIONAL([BUILD_BINARIES], true), - AM_CONDITIONAL([BUILD_BINARIES], false)) -else - AM_CONDITIONAL([BUILD_BINARIES], false) -fi + [AC_MSG_WARN([Ogg not found, not building example programs]) + AM_CONDITIONAL([BUILD_BINARIES], false)])], + [AM_CONDITIONAL([BUILD_BINARIES], false)]) AC_ARG_ENABLE(vbr, [ --disable-vbr Disable VBR and VAD from the codec], [if test "$enableval" = no; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/include/speex/speex.h new/speex-1.2.1/include/speex/speex.h --- old/speex-1.2.0/include/speex/speex.h 2015-07-06 17:02:11.000000000 +0200 +++ new/speex-1.2.1/include/speex/speex.h 2022-05-03 05:09:25.000000000 +0200 @@ -412,7 +412,7 @@ /** Obtain one of the modes available */ const SpeexMode * speex_lib_get_mode (int mode); -#ifndef WIN32 +#ifndef _WIN32 /* We actually override the function in the narrowband case so that we can avoid linking in the wideband stuff */ #define speex_lib_get_mode(mode) ((mode)==SPEEX_MODEID_NB ? &speex_nb_mode : speex_lib_get_mode (mode)) #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/include/speex/speex_stereo.h new/speex-1.2.1/include/speex/speex_stereo.h --- old/speex-1.2.0/include/speex/speex_stereo.h 2015-07-06 17:02:11.000000000 +0200 +++ new/speex-1.2.1/include/speex/speex_stereo.h 2022-05-03 05:09:25.000000000 +0200 @@ -61,7 +61,7 @@ #define SPEEX_STEREO_STATE_INIT {1,.5,1,1,0,0} /** Initialise/create a stereo stereo state */ -SpeexStereoState *speex_stereo_state_init(); +SpeexStereoState *speex_stereo_state_init(void); /** Reset/re-initialise an already allocated stereo state */ void speex_stereo_state_reset(SpeexStereoState *stereo); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/arch.h new/speex-1.2.1/libspeex/arch.h --- old/speex-1.2.0/libspeex/arch.h 2016-12-07 22:05:02.000000000 +0100 +++ new/speex-1.2.1/libspeex/arch.h 2022-06-16 19:07:29.000000000 +0200 @@ -37,10 +37,10 @@ #ifndef SPEEX_VERSION #define SPEEX_MAJOR_VERSION 1 /**< Major Speex version. */ -#define SPEEX_MINOR_VERSION 1 /**< Minor Speex version. */ -#define SPEEX_MICRO_VERSION 16 /**< Micro Speex version. */ +#define SPEEX_MINOR_VERSION 2 /**< Minor Speex version. */ +#define SPEEX_MICRO_VERSION 1 /**< Micro Speex version. */ #define SPEEX_EXTRA_VERSION "" /**< Extra Speex version. */ -#define SPEEX_VERSION "speex-1.2.0" /**< Speex version string. */ +#define SPEEX_VERSION "speex-1.2.1" /**< Speex version string. */ #endif /* A couple test to catch stupid option combinations */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/cb_search.c new/speex-1.2.1/libspeex/cb_search.c --- old/speex-1.2.0/libspeex/cb_search.c 2015-07-23 20:05:56.000000000 +0200 +++ new/speex-1.2.1/libspeex/cb_search.c 2022-05-03 05:09:25.000000000 +0200 @@ -524,7 +524,7 @@ int nsf, /* number of samples in subframe */ SpeexBits *bits, char *stack, -spx_int32_t *seed +spx_uint32_t *seed ) { int i,j; @@ -612,7 +612,7 @@ int nsf, /* number of samples in subframe */ SpeexBits *bits, char *stack, -spx_int32_t *seed +spx_uint32_t *seed ) { int i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/cb_search.h new/speex-1.2.1/libspeex/cb_search.h --- old/speex-1.2.0/libspeex/cb_search.h 2015-07-06 17:01:59.000000000 +0200 +++ new/speex-1.2.1/libspeex/cb_search.h 2022-05-03 05:09:25.000000000 +0200 @@ -70,7 +70,7 @@ int nsf, /* number of samples in subframe */ SpeexBits *bits, char *stack, -spx_int32_t *seed +spx_uint32_t *seed ); @@ -97,7 +97,7 @@ int nsf, /* number of samples in subframe */ SpeexBits *bits, char *stack, -spx_int32_t *seed +spx_uint32_t *seed ); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/fixed_debug.h new/speex-1.2.1/libspeex/fixed_debug.h --- old/speex-1.2.0/libspeex/fixed_debug.h 2015-07-06 17:01:58.000000000 +0200 +++ new/speex-1.2.1/libspeex/fixed_debug.h 2022-05-03 05:09:25.000000000 +0200 @@ -122,7 +122,7 @@ { fprintf (stderr, "SHL16: inputs are not short: %d %d in %s: line %d\n", a, shift, file, line); } - res = a<<shift; + res = (int)((unsigned)a<<shift); if (!VERIFY_SHORT(res)) fprintf (stderr, "SHL16: output is not short: %d in %s: line %d\n", res, file, line); spx_mips++; @@ -151,7 +151,7 @@ { fprintf (stderr, "SHL32: inputs are not int: %d %d\n", (int)a, shift); } - res = a<<shift; + res = (long long)((unsigned long long)a<<shift); if (!VERIFY_INT(res)) { fprintf (stderr, "SHL32: output is not int: %d\n", (int)res); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/fixed_generic.h new/speex-1.2.1/libspeex/fixed_generic.h --- old/speex-1.2.0/libspeex/fixed_generic.h 2015-07-06 17:01:58.000000000 +0200 +++ new/speex-1.2.1/libspeex/fixed_generic.h 2022-05-03 05:09:25.000000000 +0200 @@ -43,9 +43,9 @@ #define EXTRACT16(x) ((spx_word16_t)(x)) #define EXTEND32(x) ((spx_word32_t)(x)) #define SHR16(a,shift) ((a) >> (shift)) -#define SHL16(a,shift) ((a) << (shift)) +#define SHL16(a,shift) ((spx_int16_t)((spx_uint16_t)(a) << (shift))) #define SHR32(a,shift) ((a) >> (shift)) -#define SHL32(a,shift) ((a) << (shift)) +#define SHL32(a,shift) ((spx_int32_t)((spx_uint32_t)(a) << (shift))) #define PSHR16(a,shift) (SHR16((a)+((1<<((shift))>>1)),shift)) #define PSHR32(a,shift) (SHR32((a)+((EXTEND32(1)<<((shift))>>1)),shift)) #define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift))) @@ -53,7 +53,7 @@ #define SATURATE32(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x))) #define SHR(a,shift) ((a) >> (shift)) -#define SHL(a,shift) ((spx_word32_t)(a) << (shift)) +#define SHL(a,shift) ((spx_int32_t)((spx_uint32_t)(a) << (shift))) #define PSHR(a,shift) (SHR((a)+((EXTEND32(1)<<((shift))>>1)),shift)) #define SATURATE(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/math_approx.h new/speex-1.2.1/libspeex/math_approx.h --- old/speex-1.2.0/libspeex/math_approx.h 2015-07-06 17:01:58.000000000 +0200 +++ new/speex-1.2.1/libspeex/math_approx.h 2022-05-03 05:09:25.000000000 +0200 @@ -46,7 +46,7 @@ #define spx_atan atan /** Generate a pseudo-random number */ -static inline spx_word16_t speex_rand(spx_word16_t std, spx_int32_t *seed) +static inline spx_word16_t speex_rand(spx_word16_t std, spx_uint32_t *seed) { const unsigned int jflone = 0x3f800000; const unsigned int jflmsk = 0x007fffff; @@ -119,7 +119,7 @@ #ifdef FIXED_POINT /** Generate a pseudo-random number */ -static inline spx_word16_t speex_rand(spx_word16_t std, spx_int32_t *seed) +static inline spx_word16_t speex_rand(spx_word16_t std, spx_uint32_t *seed) { spx_word32_t res; *seed = 1664525 * *seed + 1013904223; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/modes.h new/speex-1.2.1/libspeex/modes.h --- old/speex-1.2.0/libspeex/modes.h 2015-07-06 17:01:57.000000000 +0200 +++ new/speex-1.2.1/libspeex/modes.h 2022-05-03 05:09:25.000000000 +0200 @@ -85,7 +85,7 @@ spx_sig_t *, spx_word16_t *, SpeexBits *, char *, int, int); /** Innovation unquantization function */ -typedef void (*innovation_unquant_func)(spx_sig_t *, const void *, int, SpeexBits*, char *, spx_int32_t *); +typedef void (*innovation_unquant_func)(spx_sig_t *, const void *, int, SpeexBits*, char *, spx_uint32_t *); /** Description of a Speex sub-mode (wither narrowband or wideband */ typedef struct SpeexSubmode { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/nb_celp.h new/speex-1.2.1/libspeex/nb_celp.h --- old/speex-1.2.0/libspeex/nb_celp.h 2015-07-06 17:02:00.000000000 +0200 +++ new/speex-1.2.1/libspeex/nb_celp.h 2022-05-03 05:09:25.000000000 +0200 @@ -149,7 +149,7 @@ spx_word16_t last_pitch_gain; /**< Pitch gain of last correctly decoded frame */ spx_word16_t pitch_gain_buf[3]; /**< Pitch gain of last decoded frames */ int pitch_gain_buf_idx; /**< Tail of the buffer */ - spx_int32_t seed; /** Seed used for random number generation */ + spx_uint32_t seed; /** Seed used for random number generation */ int encode_submode; const SpeexSubmode * const *submodes; /**< Sub-mode data */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/sb_celp.h new/speex-1.2.1/libspeex/sb_celp.h --- old/speex-1.2.0/libspeex/sb_celp.h 2015-07-06 17:01:58.000000000 +0200 +++ new/speex-1.2.1/libspeex/sb_celp.h 2022-05-03 05:09:25.000000000 +0200 @@ -120,7 +120,7 @@ spx_word16_t *innov_save; /** If non-NULL, innovation is copied here */ spx_word16_t last_ener; - spx_int32_t seed; + spx_uint32_t seed; int encode_submode; const SpeexSubmode * const *submodes; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/libspeex/stack_alloc.h new/speex-1.2.1/libspeex/stack_alloc.h --- old/speex-1.2.0/libspeex/stack_alloc.h 2015-07-06 17:01:58.000000000 +0200 +++ new/speex-1.2.1/libspeex/stack_alloc.h 2022-05-03 05:09:25.000000000 +0200 @@ -36,7 +36,7 @@ #define STACK_ALLOC_H #ifdef USE_ALLOCA -# ifdef WIN32 +# ifdef _WIN32 # include <malloc.h> # else # ifdef HAVE_ALLOCA_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/m4/libtool.m4 new/speex-1.2.1/m4/libtool.m4 --- old/speex-1.2.0/m4/libtool.m4 2016-12-07 20:52:48.000000000 +0100 +++ new/speex-1.2.1/m4/libtool.m4 2022-06-16 19:08:56.000000000 +0200 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -1042,8 +1041,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1072,11 +1071,11 @@ # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) + 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; 10.[[012]][[,.]]*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) + 10.*|11.*) _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; @@ -1493,7 +1492,7 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} +: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) _LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) @@ -4064,7 +4063,8 @@ if AC_TRY_EVAL(ac_compile); then # Now try to grab the symbols. nlist=conftest.nm - if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then + $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD + if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then mv -f "$nlist"T "$nlist" @@ -4704,6 +4704,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + # flang / f18. f95 an alias for gfortran or flang on Debian + flang* | f18* | f95*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -6439,7 +6445,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else GXX=no @@ -6814,7 +6820,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6879,7 +6885,7 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7218,7 +7224,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # FIXME: insert proper C++ library support @@ -7302,7 +7308,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7313,7 +7319,7 @@ # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/missing new/speex-1.2.1/missing --- old/speex-1.2.0/missing 2016-12-07 20:52:53.000000000 +0100 +++ new/speex-1.2.1/missing 2022-06-16 19:08:58.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/src/skeleton.h new/speex-1.2.1/src/skeleton.h --- old/speex-1.2.0/src/skeleton.h 2015-07-06 17:02:09.000000000 +0200 +++ new/speex-1.2.1/src/skeleton.h 2022-05-03 05:09:25.000000000 +0200 @@ -10,7 +10,7 @@ extern "C" { #endif -#ifdef WIN32 +#ifdef _WIN32 #define snprintf _snprintf #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/src/speexdec.c new/speex-1.2.1/src/speexdec.c --- old/speex-1.2.0/src/speexdec.c 2015-07-23 20:05:56.000000000 +0200 +++ new/speex-1.2.1/src/speexdec.c 2022-05-03 14:40:08.000000000 +0200 @@ -86,10 +86,10 @@ #define MAX_FRAME_SIZE 2000 -#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \ - ((buf[base+2]<<16)&0xff0000)| \ - ((buf[base+1]<<8)&0xff00)| \ - (buf[base]&0xff)) +#define readint(buf) ((((unsigned)buf[3]<<24)&0xff000000)| \ + (((unsigned)buf[2]<<16)&0xff0000)| \ + (((unsigned)buf[1]<<8)&0xff00)| \ + ((unsigned)buf[0]&0xff)) static void print_comments(char *comments, int length) { @@ -103,7 +103,7 @@ return; } end = c+length; - len=readint(c, 0); + len=readint(c); c+=4; if (len < 0 || c+len>end) { @@ -118,7 +118,7 @@ fprintf (stderr, "Invalid/corrupted comments\n"); return; } - nb_fields=readint(c, 0); + nb_fields=readint(c); c+=4; for (i=0;i<nb_fields;i++) { @@ -127,7 +127,7 @@ fprintf (stderr, "Invalid/corrupted comments\n"); return; } - len=readint(c, 0); + len=readint(c); c+=4; if (len < 0 || c+len>end) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/src/wav_io.c new/speex-1.2.1/src/wav_io.c --- old/speex-1.2.0/src/wav_io.c 2015-07-23 20:05:56.000000000 +0200 +++ new/speex-1.2.1/src/wav_io.c 2022-05-03 05:09:25.000000000 +0200 @@ -75,8 +75,11 @@ itmp = le_int(itmp); /*fprintf (stderr, "skip=%d\n", itmp);*/ /*strange way of seeking, but it works even for pipes*/ - for (i=0;i<itmp;i++) - fgetc(file); + for (i=0;i<itmp;i++) { + if (fgetc(file) == EOF) { + break; + } + } /*fseek(file, itmp, SEEK_CUR);*/ fread(ch, 1, 4, file); if (feof(file)) @@ -108,7 +111,7 @@ stmp = le_short(stmp); *channels = stmp; - if (stmp>2) + if (stmp>2 || stmp<1) { fprintf (stderr, "Only mono and (intensity) stereo supported\n"); return -1; @@ -152,9 +155,13 @@ /*strange way of seeking, but it works even for pipes*/ - if (skip_bytes>0) - for (i=0;i<skip_bytes;i++) - fgetc(file); + if (skip_bytes>0) { + for (i=0;i<skip_bytes;i++) { + if (fgetc(file) == EOF) { + break; + } + } + } /*fseek(file, skip_bytes, SEEK_CUR);*/ @@ -164,8 +171,11 @@ fread(&itmp, 4, 1, file); itmp = le_int(itmp); /*strange way of seeking, but it works even for pipes*/ - for (i=0;i<itmp;i++) - fgetc(file); + for (i=0;i<itmp;i++) { + if (fgetc(file) == EOF) { + break; + } + } /*fseek(file, itmp, SEEK_CUR);*/ fread(ch, 1, 4, file); if (feof(file)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/speex-1.2.0/win32/libspeex.def new/speex-1.2.1/win32/libspeex.def --- old/speex-1.2.0/win32/libspeex.def 2015-07-06 17:02:14.000000000 +0200 +++ new/speex-1.2.1/win32/libspeex.def 2022-05-03 05:09:25.000000000 +0200 @@ -61,6 +61,7 @@ speex_init_header speex_header_to_packet speex_packet_to_header +speex_header_free ; ; speex_stereo.h ++++++ speex-no-build-date.patch ++++++ --- /var/tmp/diff_new_pack.w40kSL/_old 2022-07-13 14:31:51.945247946 +0200 +++ /var/tmp/diff_new_pack.w40kSL/_new 2022-07-13 14:31:51.945247946 +0200 @@ -1,8 +1,8 @@ Index: src/speexdec.c =================================================================== ---- src/speexdec.c.orig 2008-05-30 09:34:16.000000000 +0200 -+++ src/speexdec.c 2010-09-04 01:48:51.580370000 +0200 -@@ -292,7 +292,7 @@ void version() +--- src/speexdec.c.orig ++++ src/speexdec.c +@@ -291,7 +291,7 @@ void version() { const char* speex_version; speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version); @@ -13,9 +13,9 @@ Index: src/speexenc.c =================================================================== ---- src/speexenc.c.orig 2010-09-04 01:48:13.000000000 +0200 -+++ src/speexenc.c 2010-09-04 01:49:30.654133000 +0200 -@@ -185,7 +185,7 @@ void version() +--- src/speexenc.c.orig ++++ src/speexenc.c +@@ -203,7 +203,7 @@ void version() { const char* speex_version; speex_lib_ctl(SPEEX_LIB_GET_VERSION_STRING, (void*)&speex_version); @@ -23,4 +23,5 @@ + printf ("speexenc (Speex encoder) version %s\n", speex_version); printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n"); } +
