diff --git a/srcpkgs/python3-pyopencl/patches/build-deps.patch b/srcpkgs/python3-pyopencl/patches/build-deps.patch index cf59b76c4f3..6cc93fe279b 100644 --- a/srcpkgs/python3-pyopencl/patches/build-deps.patch +++ b/srcpkgs/python3-pyopencl/patches/build-deps.patch @@ -3,17 +3,13 @@ dependencies for which Void offers no Python package. --- a/pyproject.toml +++ b/pyproject.toml -@@ -3,12 +3,9 @@ +@@ -2,8 +2,7 @@ requires = [ - "setuptools>=42.0.0", - "wheel>=0.34.2", -- "numpy;python_version >= '3.9' and platform_python_implementation == 'PyPy'", -- "oldest-supported-numpy;python_version < '3.9' or platform_python_implementation != 'PyPy'", -+ "numpy", - "scikit-build", -- "cmake>=3.17", - "nanobind>=1.9.2", -- "ninja; platform_system!='Windows'", - ] - build-backend = "setuptools.build_meta" + "scikit-build-core >=0.9.3", + "nanobind >=1.9.2", +- "numpy;python_version >= '3.9' and platform_python_implementation == 'PyPy'", +- "oldest-supported-numpy;python_version < '3.9' or platform_python_implementation != 'PyPy'", ++ "numpy", + ] + build-backend = "scikit_build_core.build" diff --git a/srcpkgs/python3-pyopencl/template b/srcpkgs/python3-pyopencl/template index 0a140650239..9449b68063a 100644 --- a/srcpkgs/python3-pyopencl/template +++ b/srcpkgs/python3-pyopencl/template @@ -1,10 +1,10 @@ # Template file for 'python3-pyopencl' pkgname=python3-pyopencl -version=2024.2.2 +version=2024.2.6 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel python3-numpy - python3-scikit-build cmake ninja python3-nanobind" + python3-scikit-build-core cmake ninja python3-nanobind" makedepends="OpenCL-Headers ocl-icd-devel python3-numpy python3-devel" depends="python3-numpy python3-pytools python3-platformdirs" short_desc="OpenCL bindings for Python 3" @@ -12,25 +12,15 @@ maintainer="Andrew J. Hesford " license="X11, Apache-2.0, BSD-3-Clause" homepage="https://mathema.tician.de/software/pyopencl" distfiles="${PYPI_SITE}/p/pyopencl/pyopencl-${version}.tar.gz" -checksum=be6f6535de310a3166e4a8fb606a615b7cf3412cdb05353127ac194cf852f4c0 +checksum=ceb9beeef0b6162e601c05922fede29b5094554a66eb473c610cabc14308ba82 # Tests require a working OpenCL platform make_check=no export CMAKE_ARGS=" - -DPYTHON_INCLUDE_DIR:PATH=${XBPS_CROSS_BASE}/${py3_inc} + -DPython_INCLUDE_DIR:PATH=${XBPS_CROSS_BASE}/${py3_inc} -DNumPy_INCLUDE_DIR:PATH=${XBPS_CROSS_BASE}/${py3_sitelib}/numpy/core/include " -post_patch() { - # Manifest generates bad wheels (even on PyPI) - rm MANIFEST.in -} - -pre_configure() { - ./configure.py --cl-inc-dir=${XBPS_CROSS_BASE}/usr/include \ - --cl-lib-dir=${XBPS_CROSS_BASE}/usr/lib -} - post_install() { vlicense LICENSE }