Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (e6519dd3ff28465452c1ce7d0b42034c84fb102c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (e6519dd3ff28465452c1ce7d0b42034c84fb102c)
  • Date: Sat, 17 Aug 2024 22:55:55 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

science-libs/vtk/DEPENDS | 2
science-libs/vtk/DETAILS | 4
science-libs/vtk/HISTORY | 8 +
science-libs/vtk/PRE_BUILD | 4
science-libs/vtk/gcc6.patch | 21 --
science-libs/vtk/patches/0001-Drop-usage-of-stat64-on-Linux.patch | 75
++++++++++
science-libs/vtk/patches/0001-Fix-path-of-unistd.h.patch | 24 +++
7 files changed, 112 insertions(+), 26 deletions(-)

New commits:
commit e6519dd3ff28465452c1ce7d0b42034c84fb102c
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

vtk 9.3.1

diff --git a/science-libs/vtk/DEPENDS b/science-libs/vtk/DEPENDS
index cc949c8..24327fc 100755
--- a/science-libs/vtk/DEPENDS
+++ b/science-libs/vtk/DEPENDS
@@ -23,7 +23,7 @@ depends cmake &&
depends OPENGL &&
depends libx11 &&
#optwrap JAVA &&
-optwrap python &&
+optwrap PYTHON &&
optwrap tcl &&

optsyslib zlib &&
diff --git a/science-libs/vtk/DETAILS b/science-libs/vtk/DETAILS
index 56247b6..eec5f1b 100755
--- a/science-libs/vtk/DETAILS
+++ b/science-libs/vtk/DETAILS
@@ -1,7 +1,7 @@
# Watch: https://vtk.org/download/
SPELL=vtk
- VERSION=7.0.0
-
SOURCE_HASH=sha512:4ce51ff6ddf56f1fb45c1b09a09389bc43dffd892f80c833ea861537e02a61079e9cfd3931308f7d72f37d1977806ed2ce010a7b5c2c1a0c5bb1435e09e1f049
+ VERSION=9.3.1
+
SOURCE_HASH=sha512:5dcd6764b2d9fe476bcc7bd195fab8230b7628579d94656ab037dcaecd07c7d40d0fc4afba446942ca15cd881df17f4c84581047e75a6e11d2e2d339d97c7fa3
SOURCE=VTK-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/VTK-$VERSION
SOURCE_URL[0]=http://www.vtk.org/files/release/${VERSION%.*}/$SOURCE
diff --git a/science-libs/vtk/HISTORY b/science-libs/vtk/HISTORY
index 579801a..c9d5967 100644
--- a/science-libs/vtk/HISTORY
+++ b/science-libs/vtk/HISTORY
@@ -1,3 +1,11 @@
+2024-08-17 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 9.3.1
+ * gcc6.patch: removed, no longer needed
+ * DEPENDS: s/python/PYTHON/
+ * PRE_BUILD: added apply_patach_dir
+ * patches/0001-Drop-usage-of-stat64-on-Linux.patch,
+ patches/0001-Fix-path-of-unistd.h.patch: fixed build against musl
+
2018-03-23 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: WEBKIT_QT => qtwebkit

diff --git a/science-libs/vtk/PRE_BUILD b/science-libs/vtk/PRE_BUILD
index d01257b..c230ad1 100755
--- a/science-libs/vtk/PRE_BUILD
+++ b/science-libs/vtk/PRE_BUILD
@@ -1,3 +1,3 @@
-default_pre_build &&
+default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-patch -p1 < "$SPELL_DIRECTORY/gcc6.patch"
+apply_patch_dir patches
diff --git a/science-libs/vtk/gcc6.patch b/science-libs/vtk/gcc6.patch
deleted file mode 100644
index b8544cc..0000000
--- a/science-libs/vtk/gcc6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-+++ b/CMake/GenerateExportHeader.cmake 2016-05-07 10:26:51.085595051 +0200
-@@ -166,7 +166,7 @@
- execute_process(COMMAND ${CMAKE_C_COMPILER} ARGS --version
- OUTPUT_VARIABLE _gcc_version_info
- ERROR_VARIABLE _gcc_version_info)
-- string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+ string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
- _gcc_version "${_gcc_version_info}")
- # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
- # patch level, handle this here:
-
-+++ b/CMake/vtkCompilerExtras.cmake 2016-05-07 10:27:20.496204378 +0200
-@@ -32,7 +32,7 @@
- OUTPUT_VARIABLE _gcc_version_info
- ERROR_VARIABLE _gcc_version_info)
-
-- string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]*"
-+ string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
- _gcc_version "${_gcc_version_info}")
- if(NOT _gcc_version)
- string (REGEX REPLACE ".*\\(GCC\\).*([34]\\.[0-9]).*" "\\1.0"
\ No newline at end of file
diff --git
a/science-libs/vtk/patches/0001-Drop-usage-of-stat64-on-Linux.patch
b/science-libs/vtk/patches/0001-Drop-usage-of-stat64-on-Linux.patch
new file mode 100644
index 0000000..65be5ab
--- /dev/null
+++ b/science-libs/vtk/patches/0001-Drop-usage-of-stat64-on-Linux.patch
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Holger Jaekel <holger.jaekel AT gmx.de>
+Date: Sun, 24 Mar 2024 14:11:24 +0100
+Subject: [PATCH] Drop usage of stat64 on Linux
+
+Not required on modern systems.
+
+Origin: Alpine Linux
+Upstream-Status: Unknown
+[ismael AT sourcemage.org: Metadata reconstructed from aports commit; reduced
the
+ patch to make it more acceptable by upstream]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ IO/EnSight/vtkEnSight6BinaryReader.cxx | 9 +--------
+ IO/EnSight/vtkEnSightGoldBinaryReader.cxx | 9 +--------
+ IO/LSDyna/LSDynaFamily.cxx | 7 +------
+ 3 files changed, 3 insertions(+), 22 deletions(-)
+
+--- a/IO/EnSight/vtkEnSight6BinaryReader.cxx
++++ b/IO/EnSight/vtkEnSight6BinaryReader.cxx
+@@ -38,16 +38,9 @@
+ #if defined(_WIN32)
+ #define VTK_STAT_STRUCT struct _stat64
+ #define VTK_STAT_FUNC _stat64
+-#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ ||
defined __NetBSD__ || \
+- defined __OpenBSD__
+-// The BSDs use stat().
++#else
+ #define VTK_STAT_STRUCT struct stat
+ #define VTK_STAT_FUNC stat
+-#else
+-// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to
help
+-// us on POSIX without resorting to using stat64.
+-#define VTK_STAT_STRUCT struct stat64
+-#define VTK_STAT_FUNC stat64
+ #endif
+
+ vtkStandardNewMacro(vtkEnSight6BinaryReader);
+--- a/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
++++ b/IO/EnSight/vtkEnSightGoldBinaryReader.cxx
+@@ -43,16 +43,9 @@
+ #if defined(_WIN32)
+ #define VTK_STAT_STRUCT struct _stat64
+ #define VTK_STAT_FUNC _stat64
+-#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ ||
defined __NetBSD__ || \
+- defined __OpenBSD__
+-// The BSDs use stat().
++#else
+ #define VTK_STAT_STRUCT struct stat
+ #define VTK_STAT_FUNC stat
+-#else
+-// here, we're relying on _FILE_OFFSET_BITS defined in vtkWin32Header.h to
help
+-// us on POSIX without resorting to using stat64.
+-#define VTK_STAT_STRUCT struct stat64
+-#define VTK_STAT_FUNC stat64
+ #endif
+
+ class vtkEnSightGoldBinaryReader::vtkUtilities
+--- a/IO/LSDyna/LSDynaFamily.cxx
++++ b/IO/LSDyna/LSDynaFamily.cxx
+@@ -35,13 +35,8 @@
+ // Decide which of 3 stat varieties to use: stat, stat64, __stat64
+ // Usually stat uses 32 bit fields, and stat64 (with underscores in
Windows) uses 64 bit fields.
+ // But on the BSDs, stat uses 64 bit fields these days.
+-#if (VTK_SIZEOF_ID_TYPE == 8) && !defined(_DARWIN_FEATURE_64_BIT_INODE) &&
\
+- !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__)
+-#ifndef _WIN32
+-#define USE_STAT_64
+-#else
++#ifdef _WIN32
+ #define USE_WIN_STAT_64
+-#endif
+ #else
+ #define USE_STAT
+ #endif
diff --git a/science-libs/vtk/patches/0001-Fix-path-of-unistd.h.patch
b/science-libs/vtk/patches/0001-Fix-path-of-unistd.h.patch
new file mode 100644
index 0000000..ec5f8cc
--- /dev/null
+++ b/science-libs/vtk/patches/0001-Fix-path-of-unistd.h.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Holger Jaekel <holger.jaekel AT gmx.de>
+Date: Sun, 24 Mar 2024 14:11:24 +0100
+Subject: [PATCH] Fix path of unistd.h
+
+Origin: Alpine Linux
+Upstream-Status: Unknown
+[ismael AT sourcemage.org: Metadata reconstructed from aports commit]
+Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
+---
+ ThirdParty/ioss/vtkioss/Ioss_FileInfo.C | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
++++ b/ThirdParty/ioss/vtkioss/Ioss_FileInfo.C
+@@ -26,7 +26,7 @@
+ #define S_ISDIR(m) (((m)&_S_IFMT) == _S_IFDIR)
+ #endif
+ #else
+-#include <sys/unistd.h>
++#include <unistd.h>
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <sys/param.h>
+ #include <sys/mount.h>


  • [[SM-Commit] ] GIT changes to master grimoire by Ismael Luceno (e6519dd3ff28465452c1ce7d0b42034c84fb102c), Ismael Luceno, 08/17/2024

Archive powered by MHonArc 2.6.24.

Top of Page