diff --git a/dev-python/scipy/patches/scipy-1.3.3.patchset b/dev-python/scipy/patches/scipy-1.3.3.patchset deleted file mode 100644 index a7fcee9f7..000000000 --- a/dev-python/scipy/patches/scipy-1.3.3.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 8e314a5e6f9faf2d527d6572d1b05c47bc791090 Mon Sep 17 00:00:00 2001 -From: Aleksei Gerasimov -Date: Thu, 15 Oct 2020 14:13:11 +0200 -Subject: disable ndimage - - -diff --git a/scipy/setup.py b/scipy/setup.py -index 0a17f94..f0fe37a 100644 ---- a/scipy/setup.py -+++ b/scipy/setup.py -@@ -22,7 +22,7 @@ def configuration(parent_package='',top_path=None): - config.add_subpackage('spatial') - config.add_subpackage('special') - config.add_subpackage('stats') -- config.add_subpackage('ndimage') -+ #config.add_subpackage('ndimage') - config.add_subpackage('_build_utils') - config.add_subpackage('_lib') - config.make_config_py() --- -2.28.0 - diff --git a/dev-python/scipy/patches/scipy-1.6.3.patchset b/dev-python/scipy/patches/scipy-1.6.3.patchset new file mode 100644 index 000000000..30ec4cad5 --- /dev/null +++ b/dev-python/scipy/patches/scipy-1.6.3.patchset @@ -0,0 +1,49 @@ +From b6e0d70785f85e4a8b9ab61b37f684ad0eca4d28 Mon Sep 17 00:00:00 2001 +From: Aleksei Gerasimov +Date: Thu, 15 Oct 2020 14:13:11 +0200 +Subject: disable ndimage + + +diff --git a/scipy/setup.py b/scipy/setup.py +index 3bcdd48..b3ede6f 100644 +--- a/scipy/setup.py ++++ b/scipy/setup.py +@@ -21,7 +21,7 @@ def configuration(parent_package='',top_path=None): + config.add_subpackage('spatial') + config.add_subpackage('special') + config.add_subpackage('stats') +- config.add_subpackage('ndimage') ++ #config.add_subpackage('ndimage') + config.add_subpackage('_build_utils') + config.add_subpackage('_lib') + config.make_config_py() +-- +2.30.2 + + +From f9e25e090297e27de3395bab18f104c70358d9ec Mon Sep 17 00:00:00 2001 +From: begasus +Date: Mon, 24 May 2021 18:40:26 +0000 +Subject: Haiku doesn't use -pthread, use -lpthread instead + + +diff --git a/scipy/fft/_pocketfft/setup.py b/scipy/fft/_pocketfft/setup.py +index 7e44565..3b0ead2 100644 +--- a/scipy/fft/_pocketfft/setup.py ++++ b/scipy/fft/_pocketfft/setup.py +@@ -15,9 +15,9 @@ def pre_build_hook(build_ext, ext): + 'int main(int argc, char **argv) {}') + if has_pthreads: + ext.define_macros.append(('POCKETFFT_PTHREADS', None)) +- if has_flag(cc, '-pthread'): +- args.append('-pthread') +- ext.extra_link_args.append('-pthread') ++ if has_flag(cc, '-lpthread'): ++ args.append('-lpthread') ++ ext.extra_link_args.append('-lpthread') + else: + raise RuntimeError("Build failed: System has pthreads header " + "but could not compile with -pthread option") +-- +2.30.2 + diff --git a/dev-python/scipy/scipy-1.3.3.recipe b/dev-python/scipy/scipy-1.6.3.recipe similarity index 92% rename from dev-python/scipy/scipy-1.3.3.recipe rename to dev-python/scipy/scipy-1.6.3.recipe index 58fecc513..47acd4d10 100644 --- a/dev-python/scipy/scipy-1.3.3.recipe +++ b/dev-python/scipy/scipy-1.6.3.recipe @@ -9,11 +9,11 @@ others. This package does not contain ndimage module." HOMEPAGE="https://www.scipy.org/" COPYRIGHT=" 2001-2002 Enthought, Inc. - 2003-2019 SciPy Developers" + 2003-2021 SciPy Developers" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/scipy/scipy/releases/download/v$portVersion/scipy-$portVersion.tar.xz" -CHECKSUM_SHA256="6de202d30b9e9e0704972f2b9272b1ff1090e2b089ddbdccfcf6271ce5ffb2d9" +CHECKSUM_SHA256="3851fdcb1e6877241c3377aa971c85af0d44f90c57f4dd4e54e1b2bbd742635e" SOURCE_DIR="scipy-$portVersion" PATCHES="scipy-$portVersion.patchset" @@ -21,14 +21,14 @@ ARCHITECTURES="!x86_gcc2 !x86_64" # scipy can be build directly on x86 # but I was unable to make recipe do # in the same way as "setarch x86" do -SECONDARY_ARCHITECTURES="!x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" $portName = $portVersion " REQUIRES=" haiku$secondaryArchSuffix - cblas_reference$secondaryArchSuffix + lib:libcblas$secondaryArchSuffix lib:libarpack$secondaryArchSuffix lib:libblis$secondaryArchSuffix lib:liblapack$secondaryArchSuffix @@ -55,12 +55,13 @@ done BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:cblas$secondaryArchSuffix + devel:libcblas$secondaryArchSuffix devel:libarpack$secondaryArchSuffix devel:libblis$secondaryArchSuffix devel:liblapack$secondaryArchSuffix devel:libopenblas$secondaryArchSuffix devel:libumfpack$secondaryArchSuffix + pybind11${secondaryArchSuffix}_python3 numpy${secondaryArchSuffix}_python3 setuptools_python3 " diff --git a/dev-python/scipy/scipy_python-1.2.1.recipe b/dev-python/scipy/scipy_python-1.2.1.recipe deleted file mode 100644 index 0b08242fa..000000000 --- a/dev-python/scipy/scipy_python-1.2.1.recipe +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY="Scientific algorithms library for Python" -DESCRIPTION="SciPy is an open source library of scientific tools for Python. \ -SciPy supplements the popular numpy module, gathering a variety of high level \ -science and engineering modules together as a single package. SciPy includes \ -modules for graphics and plotting, optimization, integration, special \ -functions, signal and image processing, genetic algorithms, ODE solvers, and \ -others." -HOMEPAGE="https://www.scipy.org/" -COPYRIGHT="2011-2018 The OpenBLAS Project" -LICENSE="BSD (3-clause) - GNU LGPL v2" -REVISION="1" -SOURCE_URI="https://github.com/scipy/scipy/releases/download/v$portVersion/scipy-$portVersion.tar.xz" -CHECKSUM_SHA256="be0e1b322b4b9f2ab88a35db32c494f12639937cf671d4cc210238feb8d5a89d" -SOURCE_DIR="scipy-$portVersion" - -ARCHITECTURES="!x86_gcc2 ?x86 x86_64" -SECONDARY_ARCHITECTURES="?x86" - -PROVIDES=" - $portName = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - cmd:f2py2 - cmd:python2 - lib:libopenblas$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - setuptools_python - devel:cblas$secondaryArchSuffix - devel:libarpack$secondaryArchSuffix - devel:libblis$secondaryArchSuffix - devel:liblapack$secondaryArchSuffix - devel:libopenblas$secondaryArchSuffix - devel:libumfpack$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - pillow_python - cmd:f2py2 - cmd:g++$secondaryArchSuffix - cmd:gfortran$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:python2 - cmd:swig$secondaryArchSuffix - " - -BUILD() -{ -# Check at every update in site.cfg.example! -cat > site.cfg << EOF -[ALL] -library_dirs = /system/`echo ${relativeDevelopLibDir}` -include_dirs = /system/`echo ${relativeIncludeDir}` -[openblas] -libraries = openblas -library_dirs = /system/`echo ${relativeDevelopLibDir}` -include_dirs = /system/`echo ${relativeIncludeDir}` -runtime_library_dirs = /system/`echo ${relativeLibDir}` -[lapack] -library_dirs = /system/`echo ${relativeDevelopLibDir}` -lapack_libs = /system/`echo ${relativeIncludeDir}` -EOF - - rm -rf doc/sphinxext/.git - $portPackageLinksDir/cmd~python2/bin/python2 setup.py build $jobArgs -} - -INSTALL() -{ - # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python2/bin/python2 - pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) - installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ - export PYTHONPATH=$installLocation:$PYTHONPATH - mkdir -p $installLocation - - $python setup.py build $jobArgs install \ - --prefix $prefix -}