aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2018-06-30 14:27:30 +0300
committerNatanael Copa <ncopa@alpinelinux.org>2018-07-13 16:05:41 +0000
commitb05ef65a34110e6d0f521fcdcaae158a99193426 (patch)
treea9016f793e1cdcd20b2df0c096de8db5926678f7
parent41a323ecb6225990dd1f2cde7b360a78b3bdca29 (diff)
downloadaports-b05ef65a34110e6d0f521fcdcaae158a99193426.tar.bz2
aports-b05ef65a34110e6d0f521fcdcaae158a99193426.tar.xz
main/fftw: upgrade to 3.3.8, clarify license
-rw-r--r--main/fftw/APKBUILD14
-rw-r--r--main/fftw/cycle.h.patch2
2 files changed, 8 insertions, 8 deletions
diff --git a/main/fftw/APKBUILD b/main/fftw/APKBUILD
index 23ed395dd4..ca5a83c42d 100644
--- a/main/fftw/APKBUILD
+++ b/main/fftw/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=fftw
-pkgver=3.3.6p2
-pkgrel=2
-pkgdesc="fastest fourier transform in the west"
-url="http://www.fftw.org/"
+pkgver=3.3.8
+pkgrel=0
+pkgdesc="Discrete Fourier transform (DFT) library"
+url="http://www.fftw.org"
arch="all"
-license="GPL-2.0+"
+license="GPL-2.0-or-later"
makedepends="texinfo"
# order of the libs split functions are important because of lib naming
subpackages="$pkgname-dev $pkgname-doc $pkgname-single-libs:single
@@ -93,5 +93,5 @@ long_double() {
"$subpkgdir"/usr/lib/
}
-sha512sums="e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472 fftw-3.3.6-pl2.tar.gz
-522b57654401372d219be58e4566c1d7b9f691ead8ae6c718ecff3edccb2a5b9db9afb763acb85ec63b26a17099b1826a0680b4010973ac84a66116c3f80422b cycle.h.patch"
+sha512sums="ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38 fftw-3.3.8.tar.gz
+7da269fc43dabd02ae6fad2ebad92b07e06825b6b7c6f8987fc6444f02e0d55080db4ba6e401760e071f5c33015faf8c710f643636cab7a79bdf1af5d434dbb4 cycle.h.patch"
diff --git a/main/fftw/cycle.h.patch b/main/fftw/cycle.h.patch
index 2b2adde334..7e55d3e90f 100644
--- a/main/fftw/cycle.h.patch
+++ b/main/fftw/cycle.h.patch
@@ -31,7 +31,7 @@ index a0e86f3..3ff4c0e 100644
#endif
-/*----------------------------------------------------------------*/
-/* SGI/Irix */
--#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) && !defined(HAVE_TICK_COUNTER)
+-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) && !defined(HAVE_TICK_COUNTER) && !defined(__ANDROID__)
-typedef struct timespec ticks;
-
-static inline ticks getticks(void)