Date: Friday, February 15, 2019 @ 16:40:20 Author: heftig Revision: 432782
1.2rc3-4 Added: lib32-speexdsp/trunk/speexdsp-fixbuilds-774c87d.patch Modified: lib32-speexdsp/trunk/PKGBUILD ----------------------------------+ PKGBUILD | 33 +++++++++++++++++++-------------- speexdsp-fixbuilds-774c87d.patch | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 14 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-15 16:40:15 UTC (rev 432781) +++ PKGBUILD 2019-02-15 16:40:20 UTC (rev 432782) @@ -1,24 +1,29 @@ # Maintainer: Jan Alexander Steffens (heftig) <[email protected]> -_pkgbasename=speexdsp -pkgname=lib32-$_pkgbasename +pkgname=lib32-speexdsp pkgver=1.2rc3 -pkgrel=2 +pkgrel=4 pkgdesc="DSP library derived from Speex (32-bit)" arch=(x86_64) -url="http://www.speex.org/"; +url="https://www.speex.org/"; license=(BSD) -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib) -source=(https://downloads.us.xiph.org/releases/speex/$_pkgbasename-$pkgver.tar.gz) -sha512sums=('29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858') +depends=(lib32-glibc speexdsp) +source=(https://downloads.us.xiph.org/releases/speex/speexdsp-$pkgver.tar.gz + speexdsp-fixbuilds-774c87d.patch) +sha512sums=('29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858' + '0f0c8054591915a4ea06b28b13d50da41be10d594f39a0496e2e80e4514ed53db7cd0e1fdb205ce5e87f602b9c1e15409c33cf946ab25cdef8a3b147dbfcc0f3') +prepare() { + cd speexdsp-$pkgver + patch -Np1 -i ../speexdsp-fixbuilds-774c87d.patch + autoreconf -vi +} + build() { - cd $_pkgbasename-$pkgver - export CC="gcc -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + cd speexdsp-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static \ --libdir=/usr/lib32 make @@ -25,14 +30,14 @@ } check() { - cd $_pkgbasename-$pkgver + cd speexdsp-$pkgver make -k check } package() { - cd $_pkgbasename-$pkgver + cd speexdsp-$pkgver make DESTDIR="$pkgdir" install - rm -rf "${pkgdir}"/usr/{include,share} + rm -rf "$pkgdir"/usr/{include,share} mkdir -p "$pkgdir/usr/share/licenses" - ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" + ln -s speexdsp "$pkgdir/usr/share/licenses/$pkgname" } Added: speexdsp-fixbuilds-774c87d.patch =================================================================== --- speexdsp-fixbuilds-774c87d.patch (rev 0) +++ speexdsp-fixbuilds-774c87d.patch 2019-02-15 16:40:20 UTC (rev 432782) @@ -0,0 +1,36 @@ +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;
