Date: Friday, June 26, 2015 @ 07:32:59 Author: foutrelis Revision: 241288
archrelease: copy trunk to extra-i686, extra-x86_64 Added: speexdsp/repos/extra-i686/PKGBUILD (from rev 241287, speexdsp/trunk/PKGBUILD) speexdsp/repos/extra-i686/speexdsp-fixbuilds-774c87d.patch (from rev 241287, speexdsp/trunk/speexdsp-fixbuilds-774c87d.patch) speexdsp/repos/extra-x86_64/PKGBUILD (from rev 241287, speexdsp/trunk/PKGBUILD) speexdsp/repos/extra-x86_64/speexdsp-fixbuilds-774c87d.patch (from rev 241287, speexdsp/trunk/speexdsp-fixbuilds-774c87d.patch) Deleted: speexdsp/repos/extra-i686/PKGBUILD speexdsp/repos/extra-x86_64/PKGBUILD -----------------------------------------------+ /PKGBUILD | 76 ++++++++++++++++++++++++ extra-i686/PKGBUILD | 30 --------- extra-i686/speexdsp-fixbuilds-774c87d.patch | 36 +++++++++++ extra-x86_64/PKGBUILD | 30 --------- extra-x86_64/speexdsp-fixbuilds-774c87d.patch | 36 +++++++++++ 5 files changed, 148 insertions(+), 60 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-06-26 05:32:47 UTC (rev 241287) +++ extra-i686/PKGBUILD 2015-06-26 05:32:59 UTC (rev 241288) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=speexdsp -pkgver=1.2rc3 -pkgrel=1 -pkgdesc="DSP library derived from Speex" -arch=(i686 x86_64) -url="http://www.speex.org/" -license=(BSD) -depends=(glibc) -source=(http://downloads.us.xiph.org/releases/speex/$pkgname-$pkgver.tar.gz) -sha256sums=('4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static - make -} - -check() { - cd $pkgname-$pkgver - make -k check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: speexdsp/repos/extra-i686/PKGBUILD (from rev 241287, speexdsp/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-06-26 05:32:59 UTC (rev 241288) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=speexdsp +pkgver=1.2rc3 +pkgrel=2 +pkgdesc="DSP library derived from Speex" +arch=(i686 x86_64) +url="http://www.speex.org/" +license=(BSD) +depends=(glibc) +source=(http://downloads.us.xiph.org/releases/speex/$pkgname-$pkgver.tar.gz + speexdsp-fixbuilds-774c87d.patch) +sha256sums=('4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1' + '76cd6b1187f415d966c8d62003cd87cfb66e4030b250a316aab8f0fbc2de226a') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../speexdsp-fixbuilds-774c87d.patch + autoreconf -vi +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static + make +} + +check() { + cd $pkgname-$pkgver + make -k check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: speexdsp/repos/extra-i686/speexdsp-fixbuilds-774c87d.patch (from rev 241287, speexdsp/trunk/speexdsp-fixbuilds-774c87d.patch) =================================================================== --- extra-i686/speexdsp-fixbuilds-774c87d.patch (rev 0) +++ extra-i686/speexdsp-fixbuilds-774c87d.patch 2015-06-26 05:32:59 UTC (rev 241288) @@ -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; Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-06-26 05:32:47 UTC (rev 241287) +++ extra-x86_64/PKGBUILD 2015-06-26 05:32:59 UTC (rev 241288) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> - -pkgname=speexdsp -pkgver=1.2rc3 -pkgrel=1 -pkgdesc="DSP library derived from Speex" -arch=(i686 x86_64) -url="http://www.speex.org/" -license=(BSD) -depends=(glibc) -source=(http://downloads.us.xiph.org/releases/speex/$pkgname-$pkgver.tar.gz) -sha256sums=('4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static - make -} - -check() { - cd $pkgname-$pkgver - make -k check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} Copied: speexdsp/repos/extra-x86_64/PKGBUILD (from rev 241287, speexdsp/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-06-26 05:32:59 UTC (rev 241288) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> + +pkgname=speexdsp +pkgver=1.2rc3 +pkgrel=2 +pkgdesc="DSP library derived from Speex" +arch=(i686 x86_64) +url="http://www.speex.org/" +license=(BSD) +depends=(glibc) +source=(http://downloads.us.xiph.org/releases/speex/$pkgname-$pkgver.tar.gz + speexdsp-fixbuilds-774c87d.patch) +sha256sums=('4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1' + '76cd6b1187f415d966c8d62003cd87cfb66e4030b250a316aab8f0fbc2de226a') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../speexdsp-fixbuilds-774c87d.patch + autoreconf -vi +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static + make +} + +check() { + cd $pkgname-$pkgver + make -k check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: speexdsp/repos/extra-x86_64/speexdsp-fixbuilds-774c87d.patch (from rev 241287, speexdsp/trunk/speexdsp-fixbuilds-774c87d.patch) =================================================================== --- extra-x86_64/speexdsp-fixbuilds-774c87d.patch (rev 0) +++ extra-x86_64/speexdsp-fixbuilds-774c87d.patch 2015-06-26 05:32:59 UTC (rev 241288) @@ -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;