6775ff2422
- Update to version 9.0.1:
* Drop obsolete patches:
+ bundled_exodusii_add_missing_libpthread.patch
+ vtk-parallelgeometry-dependency.patch
+ vtk-qt-5.15-include-QPainterPath.patch
- Explicitly enable module RenderingContextOpenGL2 required for PCL
- Conditionally add pugixml-devel Requires in devel package
- Make devel package installable even when built without Java
- Remove CAPITALIZATION from comments
- Drop obsolete TK build dependency
- Drop unused wget build dependency
- Wrap devel-doc generation in bcond (keep defaulted to off), and
drop the essentially empty package when disabled.
- Fix build on ARM/Qt GLES (boo#1172723):
* set VTK_OPENGL_USE_GLES
* Add 0001-clean-up-some-old-opengl-es-stuff.patch
* Add 0001-Remove-duplicate-check-for-QOpenGLFunctions_3_2_Core.patch
* Rebase 0001-Allow-compilation-on-GLES-platforms.patch
* Add 0001-Replace-last-glDrawBuffer-call-with-glDrawBuffers-1.patch
* Add 0001-Use-2D-textures-for-1D-texture-emulation-on-GLES.patch
* Add 0001-Add-missing-guard-required-for-GLES-to-disable-stere.patch
* Add 0001-Correct-GL_BACK-GL_BACK_LEFT-mapping-on-GLES.patch
* Add 0002-Use-GL_DRAW_BUFFER0-instead-of-GL_DRAW_BUFFER-for-GL.patch
* Add 0001-GL_POINT_SPRITE-is-only-available-for-Compatibility-.patch
* Add 0002-Guard-GL_LINE_SMOOTH-for-GLES.patch
* Add 0001-Guard-glPointSize-with-GL_ES_VERSION_3_0.patch
- Add 0001-Fix-PyVTKAddFile_-function-signature-mismatch.patch
- Add 0001-Replace-invalid-GL_LINE-with-GL_LINES-for-glDrawArra.patch
OBS-URL: https://build.opensuse.org/request/show/821682
OBS-URL: https://build.opensuse.org/package/show/science/vtk?expand=0&rev=164
37 lines
1.6 KiB
Diff
37 lines
1.6 KiB
Diff
From 4253aefd5b5bf5f68177b37b73588ed83d05ac7e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
|
|
Date: Thu, 2 Jul 2020 19:29:04 +0200
|
|
Subject: [PATCH] Fix PyVTKAddFile_* function signature mismatch
|
|
|
|
The implementation generated in vtkWrapPython.c has void return type, as
|
|
noted by GCC when using LTO, e.g.:
|
|
--
|
|
./build/CMakeFiles/vtkRenderingOpenGL2PythonPython/vtkRenderingOpenGL2PythonInitImpl.cxx:85:24: warning: 'PyVTKAddFile_vtkPointFillPass' violates the C++ One Definition Rule [-Wodr]
|
|
85 | extern "C" { PyObject *PyVTKAddFile_vtkPointFillPass(PyObject *dict); }
|
|
| ^
|
|
./build/CMakeFiles/vtkRenderingOpenGL2Python/vtkPointFillPassPython.cxx:442:6: note: return value type mismatch
|
|
442 | void PyVTKAddFile_vtkPointFillPass(
|
|
| ^
|
|
./build/CMakeFiles/vtkRenderingOpenGL2Python/vtkPointFillPassPython.cxx:442:6: note: 'PyVTKAddFile_vtkPointFillPass' was previously declared here
|
|
--
|
|
---
|
|
Wrapping/Tools/vtkWrapPythonInit.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Wrapping/Tools/vtkWrapPythonInit.c b/Wrapping/Tools/vtkWrapPythonInit.c
|
|
index 6b108c1aca..dcccd4cf5d 100644
|
|
--- a/Wrapping/Tools/vtkWrapPythonInit.c
|
|
+++ b/Wrapping/Tools/vtkWrapPythonInit.c
|
|
@@ -61,7 +61,7 @@ static void CreateImplFile(const char* libName, const char* importName, int numD
|
|
|
|
for (i = 0; i < numFiles; i++)
|
|
{
|
|
- fprintf(fout, "extern \"C\" { PyObject *PyVTKAddFile_%s(PyObject *dict); }\n", files[i]);
|
|
+ fprintf(fout, "extern \"C\" { void PyVTKAddFile_%s(PyObject *dict); }\n", files[i]);
|
|
}
|
|
|
|
fprintf(fout, "\nstatic PyMethodDef Py%s_Methods[] = {\n", libName);
|
|
--
|
|
2.27.0
|
|
|