d4d99e1c44
- Update to version 9.1.0, see: https://gitlab.kitware.com/vtk/vtk/-/blob/master/Documentation/release/9.1.md - Drop upstream patches: + 0001-clean-up-some-old-opengl-es-stuff.patch + 0001-expose-1d-texture-options.patch + 0001-Remove-duplicate-check-for-QOpenGLFunctions_3_2_Core.patch + 0001-Allow-compilation-on-GLES-platforms.patch + 0001-Replace-last-glDrawBuffer-call-with-glDrawBuffers-1.patch + 0001-Guard-glPointSize-with-GL_ES_VERSION_3_0.patch + 0002-Guard-GL_LINE_SMOOTH-for-GLES.patch + 0001-Fix-PyVTKAddFile_-function-signature-mismatch.patch + 0001-Replace-invalid-GL_LINE-with-GL_LINES-for-glDrawArra.patch + vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch + vtk-std_numeric_limits.patch - Rebase: + 0001-Add-missing-guard-required-for-GLES-to-disable-stere.patch + 0001-Correct-GL_BACK-GL_BACK_LEFT-mapping-on-GLES.patch + 0001-GL_POINT_SPRITE-is-only-available-for-Compatibility-.patch - Replace openSUSE python hack with upstreamable solution: + vtk-opensuse-python-metadata.patch -> 0001-Always-generate-Python-Metadata-when-WRAP_PYTHON-is-.patch, 0001-Consider-VTK_PYTHON_SITE_PACKAGES_SUFFIX-for-Python-.patch - Add: + 0001-Add-missing-libm-link-library-to-kissfft-module.patch - Remove Leap 15.1 support from specfile - Remove openmpi1 flavor, add openmpi4 OBS-URL: https://build.opensuse.org/request/show/933294 OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=170
69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From 0cf33c4bf04596e368978e663aa4a2ea42289651 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Sun, 21 Nov 2021 19:14:37 +0100
|
|
Subject: [PATCH] Consider VTK_PYTHON_SITE_PACKAGES_SUFFIX for Python Metadata
|
|
files
|
|
|
|
When building wheels, VTK_PYTHON_SITE_PACKAGES_SUFFIX is ".", so in this
|
|
case nothing is changed. For all other builds, e.g. setup.py should be
|
|
located in the same directory as e.g. vtk.py, otherwise setup.py fails.
|
|
---
|
|
CMake/vtkPythonMetadata.cmake | 8 ++++----
|
|
CMake/vtkWheelFinalization.cmake | 2 +-
|
|
CMakeLists.txt | 2 +-
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/CMake/vtkPythonMetadata.cmake b/CMake/vtkPythonMetadata.cmake
|
|
index 44fb591321..f88f9e8aaa 100644
|
|
--- a/CMake/vtkPythonMetadata.cmake
|
|
+++ b/CMake/vtkPythonMetadata.cmake
|
|
@@ -1,17 +1,17 @@
|
|
configure_file(
|
|
"${CMAKE_CURRENT_LIST_DIR}/setup.py.in"
|
|
- "${CMAKE_BINARY_DIR}/setup.py"
|
|
+ "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/setup.py"
|
|
@ONLY)
|
|
configure_file(
|
|
"${CMAKE_CURRENT_LIST_DIR}/MANIFEST.in.in"
|
|
- "${CMAKE_BINARY_DIR}/MANIFEST.in"
|
|
+ "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/MANIFEST.in"
|
|
@ONLY)
|
|
configure_file(
|
|
"${CMAKE_SOURCE_DIR}/Copyright.txt"
|
|
- "${CMAKE_BINARY_DIR}/LICENSE"
|
|
+ "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/LICENSE"
|
|
COPYONLY)
|
|
configure_file(
|
|
"${CMAKE_SOURCE_DIR}/README.md"
|
|
- "${CMAKE_BINARY_DIR}/README.md"
|
|
+ "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/README.md"
|
|
COPYONLY)
|
|
|
|
diff --git a/CMake/vtkWheelFinalization.cmake b/CMake/vtkWheelFinalization.cmake
|
|
index 23c17fd977..269b31e7d0 100644
|
|
--- a/CMake/vtkWheelFinalization.cmake
|
|
+++ b/CMake/vtkWheelFinalization.cmake
|
|
@@ -62,5 +62,5 @@ foreach (vtk_feature IN LISTS vtk_features)
|
|
string(APPEND vtk_feature_entries
|
|
" '${vtk_feature}': [],\n")
|
|
endforeach ()
|
|
-file(WRITE "${CMAKE_BINARY_DIR}/vtk_features.py"
|
|
+file(WRITE "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/vtk_features.py"
|
|
"FEATURES = {\n${vtk_feature_entries}}\n")
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 90c90f9d46..03f5836a0f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -417,7 +417,7 @@ if (VTK_WRAP_PYTHON)
|
|
list(REMOVE_DUPLICATES vtk_required_python_modules)
|
|
endif ()
|
|
string(REPLACE ";" "\n" vtk_required_python_modules "${vtk_required_python_modules}")
|
|
- file(WRITE "${CMAKE_BINARY_DIR}/requirements.txt"
|
|
+ file(WRITE "${CMAKE_BINARY_DIR}/${VTK_PYTHON_SITE_PACKAGES_SUFFIX}/requirements.txt"
|
|
"${vtk_required_python_modules}\n")
|
|
get_property(vtk_soabi GLOBAL
|
|
PROPERTY _vtk_python_soabi)
|
|
--
|
|
2.33.1
|
|
|