From bde3366e2d0ec53cea1d018b218d74db4e27ed9b Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 6 Aug 2019 04:41:22 +0000
Subject: user/speexdsp: unmaintained bump to 1.2.0 (Adopt me today)

---
 user/speexdsp/APKBUILD                         | 18 +++----------
 user/speexdsp/speexdsp-fixbuilds-774c87d.patch | 36 --------------------------
 2 files changed, 3 insertions(+), 51 deletions(-)
 delete mode 100644 user/speexdsp/speexdsp-fixbuilds-774c87d.patch

diff --git a/user/speexdsp/APKBUILD b/user/speexdsp/APKBUILD
index 37aa29cd3..b6a45a1f9 100644
--- a/user/speexdsp/APKBUILD
+++ b/user/speexdsp/APKBUILD
@@ -1,7 +1,6 @@
 # Maintainer: 
 pkgname=speexdsp
-pkgver=1.2_rc3
-upstreamver=1.2rc3
+pkgver=1.2.0
 pkgrel=0
 pkgdesc="A voice compression format (DSP)"
 url="https://www.speex.org/"
@@ -12,20 +11,10 @@ depends=""
 makedepends="autoconf automake libtool"
 subpackages="$pkgname-dev $pkgname-doc"
 replaces="libspeex"
-source="https://downloads.xiph.org/releases/speex/$pkgname-$upstreamver.tar.gz
-	speexdsp-fixbuilds-774c87d.patch
-	"
-builddir="$srcdir"/$pkgname-$upstreamver
-
-prepare() {
-	cd "$builddir"
-	default_prepare
-	autoreconf -vif
-}
+source="https://downloads.xiph.org/releases/speex/$pkgname-$pkgver.tar.gz"
 
 build() {
 	local _neon
-	cd "$builddir"
 	[ "$CARCH" = "aarch64" ] && _neon="--disable-neon"
 	./configure \
 		--build=$CBUILD \
@@ -44,5 +33,4 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858  speexdsp-1.2rc3.tar.gz
-0f0c8054591915a4ea06b28b13d50da41be10d594f39a0496e2e80e4514ed53db7cd0e1fdb205ce5e87f602b9c1e15409c33cf946ab25cdef8a3b147dbfcc0f3  speexdsp-fixbuilds-774c87d.patch"
+sha512sums="e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec  speexdsp-1.2.0.tar.gz"
diff --git a/user/speexdsp/speexdsp-fixbuilds-774c87d.patch b/user/speexdsp/speexdsp-fixbuilds-774c87d.patch
deleted file mode 100644
index c02ee29bd..000000000
--- a/user/speexdsp/speexdsp-fixbuilds-774c87d.patch
+++ /dev/null
@@ -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;
-- 
cgit v1.2.3-60-g2f50