Update to 1.2.0

This commit is contained in:
David King 2020-06-11 14:25:07 +01:00
parent 8ee9fde9e9
commit cefc8ec59f
4 changed files with 12 additions and 51 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/speexdsp-1.2rc2.tar.gz
/speexdsp-1.2rc2.20141214git.tar.gz
/speexdsp-1.2rc3.tar.gz
/speexdsp-1.2.0.tar.gz

View File

@ -1 +1 @@
70d9d31184f7eb761192fd1ef0b73333 speexdsp-1.2rc3.tar.gz
SHA512 (speexdsp-1.2.0.tar.gz) = e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec

View File

@ -1,36 +0,0 @@
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;

View File

@ -1,18 +1,13 @@
Name: speexdsp
Version: 1.2
%global rc_ver rc3
Release: 0.17.%{rc_ver}%{?dist}
Version: 1.2.0
Release: 1%{?dist}
Summary: A voice compression format (DSP)
License: BSD
URL: http://www.speex.org/
Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz
# a patch to speex (774c87d) was done usptream to fix this issue but it seems it
# hasn't been replicated in speexdsp. Issue seen in at least pjproject
# upstream ML thread http://lists.xiph.org/pipermail/speex-dev/2014-May/008488.html
Patch0: speexdsp-fixbuilds-774c87d.patch
Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}.tar.gz
BuildRequires: libtool autoconf automake
BuildRequires: gcc
# speexdsp was split from speex in 1.2rc2. As speexdsp does not depend on
# speex, a versioned conflict is required.
Conflicts: speex <= 1.2-0.21.rc1
@ -41,21 +36,19 @@ This is the DSP package, see the speex package for the codec part.
%prep
%setup -q -n %{name}-%{version}%{rc_ver}
%patch0 -p1 -b .inc
%autosetup -p1
%build
autoreconf -vif
%configure \
%ifarch aarch64
--disable-neon \
%endif
--disable-static
make %{?_smp_mflags} V=1
%make_build
%install
make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install
%make_install
# Remove libtool archives
find %{buildroot} -type f -name "*.la" -delete
@ -74,6 +67,9 @@ find %{buildroot} -type f -name "*.la" -delete
%{_libdir}/libspeexdsp.so
%changelog
* Thu Jun 11 2020 David King <amigadave@amigadave.com> - 1.2.0-1
- Update to 1.2.0
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-0.17.rc3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild