From c794e18e3eef5414856f70733e3a62479ce78c33 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Feb 2024 17:40:31 +0000 Subject: gentoo auto-resync : 22:02:2024 - 17:40:30 --- sci-libs/Manifest.gz | Bin 45096 -> 45089 bytes sci-libs/kissfft/Manifest | 6 +- sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch | 26 +++++++++ sci-libs/kissfft/kissfft-131.1.0-r1.ebuild | 63 +++++++++++++++++++++ sci-libs/kissfft/kissfft-9999.ebuild | 9 +-- sci-libs/kissfft/metadata.xml | 3 + 6 files changed, 101 insertions(+), 6 deletions(-) create mode 100644 sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch create mode 100644 sci-libs/kissfft/kissfft-131.1.0-r1.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index 306a943d0f7f..663d9bea36bb 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest index 99aa73f5d2b6..337386350a26 100644 --- a/sci-libs/kissfft/Manifest +++ b/sci-libs/kissfft/Manifest @@ -1,5 +1,7 @@ +AUX kissfft-131.1.0-cmake.patch 1359 BLAKE2B 138a9077a450198e21e6ad2c1052d1e63ce2fc492c9d8fbe31890e89594224507c12133fae2ac9fce37921a1f343d2fbd11c8ee6f95fee61b175d0c69be91099 SHA512 b89404aba4e5dcef665a5ef2d096384592032f0e66088f7e7d4d2f3b509f7f53647fc80928b893c4e51b61037bbeb60a8c471344cb8e05fe5c3e0373a2cdc179 AUX kissfft-131.1.0-cross.patch 877 BLAKE2B 507173b39368d597d65edbd53da7abbbb4f35e5f7a5587b04a1fd4af9d36a779e1e9c3ffcf3dcede3fd9fb4a4251a6670ceb660e0a7484fc202b1bd5c9b59c2e SHA512 afc92391929c2cabd122a2b121c43d0f496ee0c4dbb31c1bc9895b98ae52c781a88db8129a7fcbcbd33828f0d4b27852a7026b16264baae2b2171620eca08807 DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708 +EBUILD kissfft-131.1.0-r1.ebuild 1431 BLAKE2B 80a6408298f038269a6993ac49ae9327b94c7cb3aba87b2a5d51a5621410fd52cad6c5fc13724bc01c4dde63592a08175fd3affbd696cbdf8fb2acfeefd75539 SHA512 2e5f39dc7e8d77b3da5bda497e27f406b537732acc47e83bfca9f058ef22ff3397c049125726689bf264d6f0e144a1e17f8ecd4c4473bf48f04388a4872dce9d EBUILD kissfft-131.1.0.ebuild 1389 BLAKE2B 87b6a8696dc320d2a697e4c16fde1fc45f128402debd779644e21223c33a0df3532038fedcc3681d455f7015848d357f8bdd870a1650a1fd61f5eba981b8a084 SHA512 8bf8d66d4983605ce797baa6e45d2408109814fcb96b6166fcc0b443aac7352c55f7c9752b0c99ff09f63a78044076a5c5c5343558841325067456ec2cca5192 -EBUILD kissfft-9999.ebuild 1383 BLAKE2B 466bcf1812b9275857fc032b2289fdd1545884347885de77ec3e1915b9dfe9fb6855c7c649dbd8b4701bb527653ede7ec878c0ef6cd09269e824fd3dbe3d8450 SHA512 55f2c78325a9eb276a3c2c0320e54b45df2c7c38d4e08bb5732cd85615f140781d4312aa479390d403b89dcfe1f776c56316fade856194222b63300e05a72272 -MISC metadata.xml 408 BLAKE2B 14d2f480a1f7bf7bdb5bd52ae17e4746bf7413fdf7e73de686dbd1d05371dddf1d079f1d621afd2e28e9aec8c4be73f51964aff0a6b1896c5ca7398a97d2afee SHA512 390bd36cd3c2481e38808cc85cf362a67337240295ed0fdf24b9b4617fd5b93cef607eaa10f76b4dc234eb4f75055e404898f8b1fb773441707952b9512142a7 +EBUILD kissfft-9999.ebuild 1431 BLAKE2B 80a6408298f038269a6993ac49ae9327b94c7cb3aba87b2a5d51a5621410fd52cad6c5fc13724bc01c4dde63592a08175fd3affbd696cbdf8fb2acfeefd75539 SHA512 2e5f39dc7e8d77b3da5bda497e27f406b537732acc47e83bfca9f058ef22ff3397c049125726689bf264d6f0e144a1e17f8ecd4c4473bf48f04388a4872dce9d +MISC metadata.xml 492 BLAKE2B 8700b39bac1d47d9827952146812e311af69163ec354a3004f0048c585bb86c23d9c4fe7026cfc5e139fcf44c29b1a459707eea87f9a2b7e1ba47b716c3d5d43 SHA512 dd33497c7542c0ebfc25a3e232ed2b29779f85e96ea81d5ae86867ff72d662dddef68f510aa494cedd005ef8aab86bf36b69cc884c49fe582a80cbc338c2bdf6 diff --git a/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch b/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch new file mode 100644 index 000000000000..a3cb3e468e17 --- /dev/null +++ b/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch @@ -0,0 +1,26 @@ +diff --git a/kissfft-config.cmake.in b/kissfft-config.cmake.in +index cd7139a..7d6c7a2 100644 +--- a/kissfft-config.cmake.in ++++ b/kissfft-config.cmake.in +@@ -66,14 +66,19 @@ foreach(_kissfft_datatype simd int16 int32 float double) + endforeach() + + if(_kissfft_datatype_detected) +- if(NOT TARGET kissfft::kissfft-${_kissfft_datatype_detected}) +- message(FATAL_ERROR "kissfft with datatype=${_kissfft_datatype_detected} is not installed") ++ if(TARGET kissfft::kissfft-${_kissfft_datatype_detected}-openmp) ++ set(_kissfft_openmp_detected "-openmp") + endif() ++ ++ if(NOT TARGET kissfft::kissfft-${_kissfft_datatype_detected}${_kissfft_openmp_detected}) ++ message(FATAL_ERROR "kissfft with datatype=${_kissfft_datatype_detected}${_kissfft_openmp_detected} is not installed") ++ endif() ++ + if(TARGET kissfft::kissfft) + message(SEND_ERROR "kissfft::kissfft already exists. You cannot use 2 find_package's with datatype that are visible to eachother.") + else() + add_library(kissfft::kissfft INTERFACE IMPORTED) +- set_property(TARGET kissfft::kissfft PROPERTY INTERFACE_LINK_LIBRARIES kissfft::kissfft-${_kissfft_datatype_detected}) ++ set_property(TARGET kissfft::kissfft PROPERTY INTERFACE_LINK_LIBRARIES kissfft::kissfft-${_kissfft_datatype_detected}${_kissfft_openmp_detected}) + endif() + endif() diff --git a/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild b/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild new file mode 100644 index 000000000000..14e039c7eec1 --- /dev/null +++ b/sci-libs/kissfft/kissfft-131.1.0-r1.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..12} ) + +inherit cmake python-any-r1 toolchain-funcs + +DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid" +HOMEPAGE="https://github.com/mborgerding/kissfft" + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://github.com/mborgerding/kissfft" + inherit git-r3 +else + SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="alloca cpu_flags_x86_sse openmp test tools" +RESTRICT="!test? ( test )" + +DEPEND=" + test? ( + sci-libs/fftw:3.0 + $(python_gen_any_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + ') + ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-131.1.0-cross.patch + "${FILESDIR}"/${PN}-131.1.0-cmake.patch +) + +python_check_deps() { + python_has_version -d "dev-python/numpy[${PYTHON_USEDEP}]" +} + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + use test && python-any-r1_pkg_setup + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +src_configure() { + local mycmakeargs=( + -DKISSFFT_OPENMP=$(usex openmp 1 0) + -DKISSFFT_TEST=$(usex test) + -DKISSFFT_TOOLS=$(usex tools) + -DKISSFFT_USE_ALLOCA=$(usex alloca) + -DKISSFFT_DATATYPE=$(usex cpu_flags_x86_sse simd float) + ) + + cmake_src_configure +} diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild index 238fe43ab8ee..14e039c7eec1 100644 --- a/sci-libs/kissfft/kissfft-9999.ebuild +++ b/sci-libs/kissfft/kissfft-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{9..12} ) inherit cmake python-any-r1 toolchain-funcs @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" fi LICENSE="BSD" @@ -34,6 +34,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-131.1.0-cross.patch + "${FILESDIR}"/${PN}-131.1.0-cmake.patch ) python_check_deps() { diff --git a/sci-libs/kissfft/metadata.xml b/sci-libs/kissfft/metadata.xml index 06198343b639..9cc777a3ea9c 100644 --- a/sci-libs/kissfft/metadata.xml +++ b/sci-libs/kissfft/metadata.xml @@ -9,4 +9,7 @@ Use alloca(3) instead of malloc(3) for memory management Build command line tools + + mborgerding/kissfft + -- cgit v1.2.3