diff options
| -rw-r--r-- | media-libs/speexdsp/Manifest | 1 | ||||
| -rw-r--r-- | media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch | 61 | ||||
| -rw-r--r-- | media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch | 44 | ||||
| -rw-r--r-- | media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch | 66 | ||||
| -rw-r--r-- | media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild | 59 |
5 files changed, 0 insertions, 231 deletions
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest index dc23d895ce61..fcff49ea4f20 100644 --- a/media-libs/speexdsp/Manifest +++ b/media-libs/speexdsp/Manifest @@ -1,2 +1 @@ DIST speexdsp-1.2.0.tar.gz 919621 BLAKE2B 70c7d07f4b23abbb70cfb212a6541288c71f57fffd5fe22ddd94901a7d01fa403a69b7884e3a4a2267ffd45a7e053b1ae7c7fd662e57053a06d4a7efb7889610 SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec -DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858 diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch deleted file mode 100644 index 835769dde707..000000000000 --- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c470e2e89a6ca75b507437467692cd684b71a526 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> -Date: Sun, 5 Jul 2015 18:10:19 +0300 -Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined - -Not everyone who includes speexdsp_config_types.h will have a test -which defines those, and if we've chosen to use the stdint types at -configure time then we know exactly which header(s) are available, so -just choose the best one then and generate the header to use it. - -This patch, including the above text, is copied from a commit in the -speex repository[1]. The original commit for speex was made by Ron -<ron@debian.org>. - -[1] https://git.xiph.org/?p=speex.git;a=commitdiff;h=774c87d6cb7dd8dabdd17677fc6da753ecf4aa87 - -Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> ---- - configure.ac | 6 ++++++ - include/speex/speexdsp_config_types.h.in | 8 +------- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2cd2d1e..1de0c23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -334,6 +334,12 @@ AC_SUBST([USIZE16]) - AC_SUBST([SIZE32]) - AC_SUBST([USIZE32]) - -+AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include <stdint.h>"], -+ [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include <inttypes.h>"], -+ [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"]) -+ -+AC_SUBST([INCLUDE_STDINT]) -+ - AC_CONFIG_FILES([ - Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec - include/Makefile include/speex/Makefile speexdsp.pc -diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in -index 02b82fd..5ea7b55 100644 ---- a/include/speex/speexdsp_config_types.h.in -+++ b/include/speex/speexdsp_config_types.h.in -@@ -1,13 +1,7 @@ - #ifndef __SPEEX_TYPES_H__ - #define __SPEEX_TYPES_H__ - --#if defined HAVE_STDINT_H --# include <stdint.h> --#elif defined HAVE_INTTYPES_H --# include <inttypes.h> --#elif defined HAVE_SYS_TYPES_H --# include <sys/types.h> --#endif -+@INCLUDE_STDINT@ - - typedef @SIZE16@ spx_int16_t; - typedef @USIZE16@ spx_uint16_t; --- -2.1.4 - diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch deleted file mode 100644 index ae29da58438b..000000000000 --- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur speexdsp-1.2rc3.orig/configure.ac speexdsp-1.2rc3/configure.ac ---- speexdsp-1.2rc3.orig/configure.ac 2016-12-12 20:04:48.710853453 -0800 -+++ speexdsp-1.2rc3/configure.ac 2016-12-12 20:05:07.588052415 -0800 -@@ -151,10 +151,17 @@ - AC_ARG_ENABLE(sse, [ --enable-sse Enable SSE support], [ - if test "x$enableval" != xno; then - has_sse=yes --has_sse2=yes --CFLAGS="$CFLAGS -O3 -msse -msse2" -+CFLAGS="$CFLAGS -msse" - else - has_sse=no -+fi -+]) -+ -+AC_ARG_ENABLE(sse2, [ --enable-sse2 Enable SSE2 support], [ -+if test "x$enableval" != xno; then -+has_sse2=yes -+CFLAGS="$CFLAGS -msse2" -+else - has_sse2=no - fi - ]) -@@ -162,7 +169,7 @@ - AC_ARG_ENABLE(neon, [ --enable-neon Enable NEON support], [ - if test "x$enableval" != xno; then - has_neon=yes --CFLAGS="$CFLAGS -O3 -march=armv7-a -mfpu=neon" -+CFLAGS="$CFLAGS -mfpu=neon" - else - has_neon=no - fi -diff -Naur speexdsp-1.2rc3.orig/libspeexdsp/Makefile.am speexdsp-1.2rc3/libspeexdsp/Makefile.am ---- speexdsp-1.2rc3.orig/libspeexdsp/Makefile.am 2016-12-12 20:04:48.690853242 -0800 -+++ speexdsp-1.2rc3/libspeexdsp/Makefile.am 2016-12-12 20:08:27.740161974 -0800 -@@ -29,7 +29,7 @@ - pseudofloat.h smallft.h vorbis_psy.h resample_sse.h resample_neon.h - - libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEXDSP_LT_CURRENT@:@SPEEXDSP_LT_REVISION@:@SPEEXDSP_LT_AGE@ --libspeexdsp_la_LIBADD = $(LIBM) -+libspeexdsp_la_LIBADD = $(LIBM) $(FFT_LIBS) - - if BUILD_EXAMPLES - noinst_PROGRAMS = testdenoise testecho testjitter testresample diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch deleted file mode 100644 index 3a413625085e..000000000000 --- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch +++ /dev/null @@ -1,66 +0,0 @@ -From a2133f5904ddb616b6578920bd2199f5accb484d Mon Sep 17 00:00:00 2001 -From: Tristan Matthews <tmatth@videolan.org> -Date: Fri, 24 Apr 2015 15:55:32 -0400 -Subject: [PATCH] preprocess: prevent rare overflow on overlap-add - -Reported-by: Fabian Henze <flyser42@gmx.de> ---- - libspeexdsp/arch.h | 3 +++ - libspeexdsp/preprocess.c | 2 +- - libspeexdsp/resample.c | 6 ------ - 3 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/libspeexdsp/arch.h b/libspeexdsp/arch.h -index 6b3bc5d..c2de991 100644 ---- a/libspeexdsp/arch.h -+++ b/libspeexdsp/arch.h -@@ -101,6 +101,8 @@ typedef spx_word32_t spx_sig_t; - #define SIG_SHIFT 14 - #define GAIN_SHIFT 6 - -+#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x))) -+ - #define VERY_SMALL 0 - #define VERY_LARGE32 ((spx_word32_t)2147483647) - #define VERY_LARGE16 ((spx_word16_t)32767) -@@ -203,6 +205,7 @@ typedef float spx_word32_t; - #define DIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b)) - #define PDIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b)) - -+#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x)))) - - #endif - -diff --git a/libspeexdsp/preprocess.c b/libspeexdsp/preprocess.c -index c080581..3053eb5 100644 ---- a/libspeexdsp/preprocess.c -+++ b/libspeexdsp/preprocess.c -@@ -980,7 +980,7 @@ EXPORT int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x) - - /* Perform overlap and add */ - for (i=0;i<N3;i++) -- x[i] = st->outbuf[i] + st->frame[i]; -+ x[i] = WORD2INT(ADD32(EXTEND32(st->outbuf[i]), EXTEND32(st->frame[i]))); - for (i=0;i<N4;i++) - x[N3+i] = st->frame[N3+i]; - -diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c -index 4940a64..4e47d67 100644 ---- a/libspeexdsp/resample.c -+++ b/libspeexdsp/resample.c -@@ -83,12 +83,6 @@ static void speex_free (void *ptr) {free(ptr);} - #define M_PI 3.14159265358979323846 - #endif - --#ifdef FIXED_POINT --#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x))) --#else --#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x)))) --#endif -- - #define IMAX(a,b) ((a) > (b) ? (a) : (b)) - #define IMIN(a,b) ((a) < (b) ? (a) : (b)) - --- -2.1.4 - diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild deleted file mode 100644 index 6d75678b32b3..000000000000 --- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic multilib-minimal - -MY_P=${P/_} -MY_P=${MY_P/_p/.} - -DESCRIPTION="Audio compression format designed for speech -- DSP" -HOMEPAGE="https://www.speex.org/" -SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon" - -RDEPEND="!<media-libs/speex-1.2.0" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-configure.patch - "${FILESDIR}"/${P}-config_types.h.patch - "${FILESDIR}"/${P}-overflow.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:noinst_PROGRAMS:check_PROGRAMS:' \ - libspeexdsp/Makefile.am || die - - eautoreconf - - append-lfs-flags -} - -multilib_src_configure() { - # Can also be configured with one of: - # --enable-fixed-point (no floating point) - # --with-fft=proprietary-intel-mkl (mkl) - # --with-fft=gpl-fftw3 (fftw) - ECONF_SOURCE="${S}" econf \ - --disable-static \ - $(use_enable cpu_flags_x86_sse sse) \ - $(use_enable cpu_flags_x86_sse2 sse2) \ - $(use_enable cpu_flags_arm_neon neon) -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name '*.la' -type f -delete || die -} |