rpms/vtk
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 9.0.2

Browse Source
This commit is contained in:
Orion Poplawski 2021-06-30 22:30:49 -06:00
parent 9adc5a5676
commit c5f398af4c
4 changed files with 9 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -21,3 +21,5 @@ vtk-5.6.0.tar.gz
/VTKData-9.0.0.tar.gz
/VTK-9.0.1.tar.gz
/VTKData-9.0.1.tar.gz
/VTK-9.0.2.tar.gz
/VTKData-9.0.2.tar.gz

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (VTK-9.0.1.tar.gz) = eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf
SHA512 (VTKData-9.0.1.tar.gz) = d2ebe6abaef0a7003d834ce65ea2b9f967e35b6c392bf6e46cea161f0ea5c1f03d0b7da5cbe3f2bbf8253bcc124c50a907c6edffe6108d0fab6d28b316b48658
SHA512 (VTK-9.0.2.tar.gz) = 65c6bce3023b45f2d145023ae6bf224257a6d89cdf7bbd4acda3d6a25cb6b8c947f0e9a44129bd1882d6d8a8d46fd4caef0463bfb94afc9f4edcca8566bc2393
SHA512 (VTKData-9.0.2.tar.gz) = 3f4f9e5d241b69b514a72bad9e5b956a5d60e1335edb3feb66666b58e2813039c1ed9ed90e521a377bfaef03453eda6bbadc265df42e9f1f4057d2cb5018f138

11
vtk.spec
View File

@ -45,8 +45,8 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 9.0.1
Release: 9%{?dist}
Version: 9.0.2
Release: 1%{?dist}
# This is a variant BSD license, a cross between BSD and ZLIB.
# For all intents, it has the same rights and restrictions as BSD.
# http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant
@ -62,9 +62,6 @@ Patch2: vtk-includes.patch
# Duplicate define conflict with Xutil, see:
# https://gitlab.kitware.com/vtk/vtk/-/issues/18048
Patch3: vtk-AllValues.patch
# Temporary patch for building against freetype-2.10.4, which removed FT_CALLBACK_DEF,
# but was later re-added in https://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=b0667d2d36fb134d48030b2a560eaaa37810d6ba
Patch4: vtk_freetype-2.10.4.patch
# Proj 5 support - backport https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7731
Patch5: vtk-proj5.patch
@ -443,7 +440,6 @@ programming languages.
%patch1 -p1 -b .limits
%patch2 -p1 -b .includes
%patch3 -p1 -b .AllValues
%patch4 -p1 -b .freetype
%patch5 -p1 -b .proj5
# Remove included thirdparty sources just to be sure
# TODO - diy2 - not yet packaged
@ -792,6 +788,9 @@ cat xorg.log
%changelog
* Thu Jul 01 2021 Orion Poplawski <orion@nwra.com> - 9.0.2-1
- Update to 9.0.2
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 9.0.1-9
- Rebuilt for Python 3.10

34
vtk_freetype-2.10.4.patch
View File

@ -1,34 +0,0 @@
diff -up VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.freetype VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
--- VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.freetype 2021-01-23 17:24:14.600721579 -0700
+++ VTK-9.0.1/Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx 2021-01-23 17:25:05.457127603 -0700
@@ -29,6 +29,13 @@ vtkStandardNewMacro(vtkFontConfigFreeTyp
namespace
{
// The FreeType face requester callback:
+#ifndef FT_CALLBACK_DEF
+#ifdef __cplusplus
+#define FT_CALLBACK_DEF( x ) extern "C" x
+#else
+#define FT_CALLBACK_DEF( x ) static x
+#endif
+#endif /* FT_CALLBACK_DEF */
FT_CALLBACK_DEF(FT_Error)
vtkFontConfigFreeTypeToolsFaceRequester(
FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
diff -up VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx.freetype VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx
--- VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx.freetype 2021-01-23 17:24:14.600721579 -0700
+++ VTK-9.0.1/Rendering/FreeType/vtkFreeTypeTools.cxx 2021-01-23 17:25:49.546479602 -0700
@@ -378,6 +378,13 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap
}
//----------------------------------------------------------------------------
+#ifndef FT_CALLBACK_DEF
+#ifdef __cplusplus
+#define FT_CALLBACK_DEF( x ) extern "C" x
+#else
+#define FT_CALLBACK_DEF( x ) static x
+#endif
+#endif /* FT_CALLBACK_DEF */
FT_CALLBACK_DEF(FT_Error)
vtkFreeTypeToolsFaceRequester(
FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)