The package rpms/vtk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/vtk.git/commit/?id=699b032dab9b8f....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit d745277c3fcc8b01d0a26eb3d4afb80cb89b17a6
Author: Orion Poplawski <orion(a)nwra.com>
Date: Mon Aug 10 07:40:21 2020 -0600
Fix ExternalData in vtk-data (bz#1783622)
diff --git a/vtk.spec b/vtk.spec
index e6260f0..5b81d49 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -26,7 +26,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 21%{?dist}
+Release: 22%{?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
@@ -716,7 +716,7 @@ cp -pr --parents Wrapping/*/README* _docs/
#Install data
mkdir -p %{buildroot}%{_datadir}/vtkdata
-cp -al build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/
+cp -alL build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/
%check
cp %SOURCE2 .
@@ -863,6 +863,9 @@ cat xorg.log
%changelog
+* Sun Aug 9 2020 Orion Poplawski <orion(a)nwra.com> - 8.2.0-22
+- Fix ExternalData in vtk-data (bz#1783622)
+
* Tue Aug 4 2020 Orion Poplawski <orion(a)nwra.com> - 8.2.0-21
- Use new cmake macros
commit 6931f8d6ee8bc7f21ca330011cab1408a3922636
Author: Orion Poplawski <orion(a)nwra.com>
Date: Tue Aug 4 09:41:37 2020 -0600
Use new cmake macros
diff --git a/vtk.spec b/vtk.spec
index 84d33cd..e6260f0 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -1,4 +1,4 @@
-%global __cmake_in_source_build 1
+%undefine __cmake_in_source_build
# Disable OSMesa builds for now - see Bug 744434
%bcond_without OSMesa
@@ -26,7 +26,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 20%{?dist}
+Release: 21%{?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
@@ -554,24 +554,21 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
# Commented old flags in case we'd like to reactive some of them
# -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests
-mkdir build
-pushd build
-%cmake .. \
+%global _vpath_builddir build
+%cmake \
%{vtk_cmake_options} \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_TESTING:BOOL=ON
-%make_build
-%make_build DoxygenDoc vtkMyDoxygenDoc
-popd
+%cmake_build
+%cmake_build --target DoxygenDoc vtkMyDoxygenDoc
%if %{with mpich}
-mkdir build-mpich
-pushd build-mpich
+%global _vpath_builddir build-mpich
%_mpich_load
export CC=mpicc
export CXX=mpic++
-%cmake .. \
+%cmake \
%{vtk_cmake_options} \
-DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \
-DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \
@@ -588,18 +585,16 @@ export CXX=mpic++
-DVTK_USE_PARALLEL:BOOL=ON \
-DVTK_USE_SYSTEM_DIY2:BOOL=OFF \
-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
-%make_build
+%cmake_build
%_mpich_unload
-popd
%endif
%if %{with openmpi}
-mkdir build-openmpi
-pushd build-openmpi
+%global _vpath_builddir build-openmpi
%_openmpi_load
export CC=mpicc
export CXX=mpic++
-%cmake .. \
+%cmake \
%{vtk_cmake_options} \
-DCMAKE_PREFIX_PATH:PATH=$MPI_HOME \
-DCMAKE_INSTALL_PREFIX:PATH=$MPI_HOME \
@@ -616,9 +611,8 @@ export CXX=mpic++
-DVTK_USE_PARALLEL:BOOL=ON \
-DVTK_USE_SYSTEM_DIY2:BOOL=OFF \
-DVTK_USE_SYSTEM_MPI4PY:BOOL=ON
-%make_build
+%cmake_build
%_openmpi_unload
-popd
%endif
# Remove executable bits from sources (some of which are generated)
@@ -627,9 +621,10 @@ find . -name \*.c -or -name \*.cxx -or -name \*.h -or -name \*.hxx
-or \
%install
-pushd build
-%make_install
+%global _vpath_builddir build
+%cmake_install
+pushd build
# Gather list of non-python/tcl libraries
ls %{buildroot}%{_libdir}/*.so.* \
| grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' >
libs.list
@@ -686,27 +681,25 @@ cat libs.list
popd
%if %{with mpich}
-pushd build-mpich
%_mpich_load
-%make_install
+%global _vpath_builddir build-mpich
+%cmake_install
# Gather list of non-python/tcl libraries
ls %{buildroot}%{_libdir}/mpich/lib/*.so.* \
- | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' >
libs.list
-popd
+ | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' >
build-mpich/libs.list
%_mpich_unload
%endif
%if %{with openmpi}
-pushd build-openmpi
%_openmpi_load
-%make_install
+%global _vpath_builddir build-openmpi
+%cmake_install
# Gather list of non-python/tcl libraries
ls %{buildroot}%{_libdir}/openmpi/lib/*.so.* \
- | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' >
libs.list
+ | grep -Ev '(Java|Qt|Python..D|TCL)' | sed -e's,^%{buildroot},,' >
build-openmpi/libs.list
%_openmpi_unload
-popd
%endif
# Remove exec bit from non-scripts and %%doc
@@ -726,7 +719,6 @@ mkdir -p %{buildroot}%{_datadir}/vtkdata
cp -al build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/
%check
-cd build
cp %SOURCE2 .
%if %{with xdummy}
if [ -x /usr/libexec/Xorg ]; then
@@ -737,7 +729,8 @@ fi
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log
-config ./xorg.conf -configdir . :99 &
export DISPLAY=:99
%endif
-ctest %{_smp_mflags} -V || :
+%global _vpath_builddir build
+%ctest --verbose || :
%if %{with xdummy}
kill %1 || :
cat xorg.log
@@ -870,6 +863,9 @@ cat xorg.log
%changelog
+* Tue Aug 4 2020 Orion Poplawski <orion(a)nwra.com> - 8.2.0-21
+- Use new cmake macros
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.0-20
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 76ab4b7c848332eab16691f60a206df743aa098c
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 13:54:52 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vtk.spec b/vtk.spec
index b5ca4d9..84d33cd 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -26,7 +26,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 19%{?dist}
+Release: 20%{?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
@@ -870,6 +870,9 @@ cat xorg.log
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.0-20
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Jul 24 2020 Jeff Law <law(a)redhat.com> - 8.2.0-19
- Use __cmake_in_source_build
commit 0a0d428878a8cce583f9c9ae045079c9c3784dda
Author: Jeff Law <law(a)redhat.com>
Date: Fri Jul 24 15:29:42 2020 -0600
Use __cmake_in_source_build
diff --git a/vtk.spec b/vtk.spec
index 811dbcb..b5ca4d9 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -1,3 +1,5 @@
+%global __cmake_in_source_build 1
+
# Disable OSMesa builds for now - see Bug 744434
%bcond_without OSMesa
%bcond_without java
@@ -24,7 +26,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 18%{?dist}
+Release: 19%{?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
@@ -868,6 +870,9 @@ cat xorg.log
%changelog
+* Fri Jul 24 2020 Jeff Law <law(a)redhat.com> - 8.2.0-19
+- Use __cmake_in_source_build
+
* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 8.2.0-18
- Rebuilt for JDK-11, see
https://fedoraproject.org/wiki/Changes/Java11
commit 2630b5a139487f3d339ad2bad973b2b95cb9a0b6
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Jul 13 21:04:44 2020 +0200
Replace Python version glob with macro (needed for Python 3.10+)
See
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
Co-authored-by: Tomas Hrnciar <thrnciar(a)redhat.com>
diff --git a/vtk.spec b/vtk.spec
index 6e95402..811dbcb 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -773,7 +773,7 @@ cat xorg.log
%files qt
%{_libdir}/lib*Qt*.so.*
-%exclude %{_libdir}/*Python??D.so.*
+%exclude %{_libdir}/*Python%{python3_version_nodots}D.so.*
%{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so
%files -n python%{python3_pkgversion}-vtk-qt
@@ -795,7 +795,7 @@ cat xorg.log
%files -n python%{python3_pkgversion}-vtk-mpich
%{_libdir}/mpich/lib/python%{python3_version}/
%{_libdir}/mpich/lib/*Python3?D.so.*
-%exclude %{_libdir}/mpich/lib/*QtPython??D.so.*
+%exclude %{_libdir}/mpich/lib/*QtPython%{python3_version_nodots}D.so.*
%{_libdir}/mpich/bin/pvtkpython
%{_libdir}/mpich/bin/vtkpython
%{_libdir}/mpich/bin/vtkWrapPython
@@ -811,7 +811,7 @@ cat xorg.log
%files mpich-qt
%{_libdir}/mpich/lib/lib*Qt*.so.*
-%exclude %{_libdir}/mpich/lib/*Python??D.so.*
+%exclude %{_libdir}/mpich/lib/*Python%{python3_version_nodots}D.so.*
%{_libdir}/mpich/lib/qt?/
%files -n python%{python3_pkgversion}-vtk-mpich-qt
@@ -835,7 +835,7 @@ cat xorg.log
%files -n python%{python3_pkgversion}-vtk-openmpi
%{_libdir}/openmpi/lib/python%{python3_version}/
%{_libdir}/openmpi/lib/*Python3?D.so.*
-%exclude %{_libdir}/openmpi/lib/*QtPython??D.so.*
+%exclude %{_libdir}/openmpi/lib/*QtPython%{python3_version_nodots}D.so.*
%{_libdir}/openmpi/bin/pvtkpython
%{_libdir}/openmpi/bin/vtkpython
%{_libdir}/openmpi/bin/vtkWrapPython
commit 036cf8cd7be928e37783b79097a77ed272681c83
Author: Jiri <jvanek(a)redhat.com>
Date: Sat Jul 11 08:18:02 2020 +0200
Rebuilt for JDK-11
diff --git a/vtk.spec b/vtk.spec
index 602850d..6e95402 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -24,7 +24,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 17%{?dist}
+Release: 18%{?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
@@ -868,6 +868,9 @@ cat xorg.log
%changelog
+* Sat Jul 11 2020 Jiri Vanek <jvanek(a)redhat.com> - 8.2.0-18
+- Rebuilt for JDK-11, see
https://fedoraproject.org/wiki/Changes/Java11
+
* Thu Jun 25 2020 Orion Poplawski <orion(a)cora.nwra.com> - 8.2.0-17
- Rebuild for hdf5 1.10.6
commit f893d0e5ef1895e84cb36adb92cbfe962abba907
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Jun 25 14:31:23 2020 -0600
Rebuild for hdf5 1.10.6
diff --git a/vtk.spec b/vtk.spec
index 57ef7a3..602850d 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -24,7 +24,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 16%{?dist}
+Release: 17%{?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
@@ -868,6 +868,9 @@ cat xorg.log
%changelog
+* Thu Jun 25 2020 Orion Poplawski <orion(a)cora.nwra.com> - 8.2.0-17
+- Rebuild for hdf5 1.10.6
+
* Sat Jun 20 2020 Orion Poplawski <orion(a)nwra.com> - 8.2.0-16
- Drop _python_bytecompile_extra, python2 conditionals
commit 699b032dab9b8f58d77b12c714c8bd725ba124bd
Author: Orion Poplawski <orion(a)nwra.com>
Date: Fri Jun 19 21:18:17 2020 -0600
No xorg-x11-drv-dummy on EL8 s390x
diff --git a/vtk.spec b/vtk.spec
index 633c57d..57ef7a3 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -4,6 +4,17 @@
%bcond_without mpich
%bcond_without qt5
%bcond_without openmpi
+# s390x on EL8 does not have xorg-x11-drv-dummy
+%if 0%{?rhel}
+%ifarch s390x
+%bcond_with xdummy
+%else
+%bcond_without xdummy
+%endif
+%else
+%bcond_without xdummy
+%endif
+
# VTK currently is carrying local modifications to gl2ps
%bcond_with gl2ps
%if !%{with gl2ps}
@@ -93,7 +104,9 @@ BuildRequires: python%{?python3_pkgversion}-mpi4py-openmpi
BuildRequires: netcdf-openmpi-devel
%endif
# For %check
+%if %{with xdummy}
BuildRequires: xorg-x11-drv-dummy
+%endif
%{!?with_java:Conflicts: vtk-java}
Requires: hdf5 = %{_hdf5_version}
@@ -713,6 +726,7 @@ cp -al build/ExternalData/* %{buildroot}%{_datadir}/vtkdata/
%check
cd build
cp %SOURCE2 .
+%if %{with xdummy}
if [ -x /usr/libexec/Xorg ]; then
Xorg=/usr/libexec/Xorg
else
@@ -720,9 +734,12 @@ else
fi
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log
-config ./xorg.conf -configdir . :99 &
export DISPLAY=:99
+%endif
ctest %{_smp_mflags} -V || :
+%if %{with xdummy}
kill %1 || :
cat xorg.log
+%endif
%files -f build/libs.list
commit 7e7a9f7afefb827a5d583ad7eeaf8f729abc61ca
Author: Orion Poplawski <orion(a)nwra.com>
Date: Fri Jun 19 20:39:30 2020 -0600
Drop _python_bytecompile_extra, python2 conditionals
diff --git a/vtk.spec b/vtk.spec
index 91860ec..633c57d 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -1,7 +1,3 @@
-# This package depends on automagic byte compilation
-#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
-%global _python_bytecompile_extra 1
-
# Disable OSMesa builds for now - see Bug 744434
%bcond_without OSMesa
%bcond_without java
@@ -17,7 +13,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 15%{?dist}
+Release: 16%{?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
@@ -43,11 +39,7 @@ BuildRequires: libX11-devel, libXt-devel, libXext-devel
BuildRequires: libICE-devel, libGL-devel
%{?with_OSMesa:BuildRequires: mesa-libOSMesa-devel}
BuildRequires: tk-devel, tcl-devel
-%if 0%{?fedora} >= 30
BuildRequires: python%{python3_pkgversion}-devel
-%else
-BuildRequires: python2-devel
-%endif
BuildRequires: expat-devel, freetype-devel, libjpeg-devel, libpng-devel
%if 0%{with gl2ps}
BuildRequires: gl2ps-devel
@@ -59,12 +51,8 @@ BuildRequires: cmake(Qt5)
BuildRequires: cmake(Qt5UiPlugin)
BuildRequires: cmake(Qt5X11Extras)
BuildRequires: qt5-qtwebkit-devel
-%if 0%{?fedora} >= 30
BuildRequires: python%{python3_pkgversion}-qt5
%else
-BuildRequires: python-qt5
-%endif
-%else
BuildRequires: PyQt4-devel
BuildRequires: qt4-devel
BuildRequires: qtwebkit-devel
@@ -79,11 +67,7 @@ BuildRequires: glew-devel
BuildRequires: hdf5-devel
BuildRequires: jsoncpp-devel
BuildRequires: libtheora-devel
-%if 0%{?fedora} >= 28
-BuildRequires: mariadb-connector-c-devel
-%else
-BuildRequires: mysql-devel
-%endif
+BuildRequires: mariadb-connector-c-devel
BuildRequires: netcdf-cxx-devel
BuildRequires: libpq-devel
BuildRequires: PEGTL-devel
@@ -100,20 +84,12 @@ BuildRequires: lz4-devel
BuildRequires: motif-devel
%if %{with mpich}
BuildRequires: mpich-devel
-%if 0%{?fedora} >= 30
BuildRequires: python%{?python3_pkgversion}-mpi4py-mpich
-%else
-BuildRequires: python2-mpi4py-mpich
-%endif
BuildRequires: netcdf-mpich-devel
%endif
%if %{with openmpi}
BuildRequires: openmpi-devel
-%if 0%{?fedora} >= 30
BuildRequires: python%{?python3_pkgversion}-mpi4py-openmpi
-%else
-BuildRequires: python2-mpi4py-openmpi
-%endif
BuildRequires: netcdf-openmpi-devel
%endif
# For %check
@@ -175,13 +151,8 @@ Install the %{name}-openmpi package to get a version compiled with
openmpi.
%package devel
Summary: VTK header files for building C++ code
Requires: vtk%{?_isa} = %{version}-%{release}
-%if 0%{?fedora} >= 30
Requires: python%{python3_pkgversion}-vtk%{?_isa} = %{version}-%{release}
Requires: python%{python3_pkgversion}-vtk-qt%{?_isa} = %{version}-%{release}
-%else
-Requires: python2-vtk%{?_isa} = %{version}-%{release}
-Requires: python2-vtk-qt%{?_isa} = %{version}-%{release}
-%endif
%{?with_OSMesa:Requires: mesa-libOSMesa-devel%{?_isa}}
Requires: cmake
Requires: blas-devel%{?_isa}
@@ -225,17 +196,12 @@ Requires: qtwebkit-devel%{?_isa}
%endif
Requires: jsoncpp-devel%{?_isa}
# bz #1183210 + #1183530
-%if 0%{?fedora} >= 30
Requires: python%{python3_pkgversion}-devel
-%else
-Requires: python2-devel
-%endif
%description devel
This provides the VTK header files required to compile C++ programs that
use VTK to do 3D visualization.
-%if 0%{?fedora} >= 30
%package -n python%{python3_pkgversion}-vtk
Summary: Python 3 bindings for VTK
Requires: vtk%{?_isa} = %{version}-%{release}
@@ -245,15 +211,6 @@ Provides: python%{python3_version}dist(vtk) = %{version}
%description -n python%{python3_pkgversion}-vtk
Python 3 bindings for VTK.
-%else
-%package -n python2-vtk
-Summary: Python 2 bindings for VTK
-Requires: vtk%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-vtk}
-
-%description -n python2-vtk
-Python 2 bindings for VTK.
-%endif
%if %{with java}
%package java
@@ -271,7 +228,6 @@ Requires: vtk%{?_isa} = %{version}-%{release}
%description qt
Qt bindings for VTK.
-%if 0%{?fedora} >= 30
%package -n python%{python3_pkgversion}-vtk-qt
Summary: Qt Python 3 bindings for VTK
Requires: vtk%{?_isa} = %{version}-%{release}
@@ -279,15 +235,6 @@ Requires: vtk%{?_isa} = %{version}-%{release}
%description -n python%{python3_pkgversion}-vtk-qt
Qt Python 3 bindings for VTK.
-%else
-%package -n python2-vtk-qt
-Summary: Qt Python 2 bindings for VTK
-Requires: vtk%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-vtk-qt}
-
-%description -n python2-vtk-qt
-Qt Python 2 bindings for VTK.
-%endif
%if %{with mpich}
%package mpich
@@ -342,11 +289,7 @@ Requires: qtwebkit-devel%{?_isa}
%endif
Requires: jsoncpp-devel%{?_isa}
# bz #1183210 + #1183530
-%if 0%{?fedora} >= 30
Requires: python%{python3_pkgversion}-devel
-%else
-Requires: python2-devel
-%endif
%description mpich-devel
This provides the VTK header files required to compile C++ programs that
@@ -354,21 +297,12 @@ use VTK to do 3D visualization.
NOTE: The version in this package has been compiled with mpich support.
-%if 0%{?fedora} >= 30
%package -n python%{python3_pkgversion}-vtk-mpich
Summary: Python 3 bindings for VTK with mpich
Requires: vtk-mpich%{?_isa} = %{version}-%{release}
%description -n python%{python3_pkgversion}-vtk-mpich
python 3 bindings for VTK with mpich.
-%else
-%package -n python2-vtk-mpich
-Summary: Python 2 bindings for VTK with mpich
-Requires: vtk-mpich%{?_isa} = %{version}-%{release}
-
-%description -n python2-vtk-mpich
-python 2 bindings for VTK with mpich.
-%endif
%if %{with java}
%package mpich-java
@@ -386,21 +320,12 @@ Requires: vtk-mpich%{?_isa} = %{version}-%{release}
%description mpich-qt
Qt bindings for VTK with mpich.
-%if 0%{?fedora} >= 30
%package -n python%{python3_pkgversion}-vtk-mpich-qt
Summary: Qt Python 3 bindings for VTK with mpich
Requires: vtk-mpich%{?_isa} = %{version}-%{release}
%description -n python%{python3_pkgversion}-vtk-mpich-qt
Qt Python 3 bindings for VTK with mpich.
-%else
-%package -n python2-vtk-mpich-qt
-Summary: Qt Python 2 bindings for VTK with mpich
-Requires: vtk-mpich%{?_isa} = %{version}-%{release}
-
-%description -n python2-vtk-mpich-qt
-Qt Python 2 bindings for VTK with mpich.
-%endif
%endif
%if %{with openmpi}
@@ -456,11 +381,7 @@ Requires: qtwebkit-devel%{?_isa}
%endif
Requires: jsoncpp-devel%{?_isa}
# bz #1183210 + #1183530
-%if 0%{?fedora} >= 30
Requires: python%{python3_pkgversion}-devel
-%else
-Requires: python2-devel
-%endif
%description openmpi-devel
This provides the VTK header files required to compile C++ programs that
@@ -468,21 +389,12 @@ use VTK to do 3D visualization.
NOTE: The version in this package has been compiled with openmpi support.
-%if 0%{?fedora} >= 30
%package -n python%{python3_pkgversion}-vtk-openmpi
Summary: Python 3 bindings for VTK with openmpi
Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
%description -n python%{python3_pkgversion}-vtk-openmpi
Python 3 bindings for VTK with openmpi.
-%else
-%package -n python2-vtk-openmpi
-Summary: Python 2 bindings for VTK with openmpi
-Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
-
-%description -n python2-vtk-openmpi
-Python 2 bindings for VTK with openmpi.
-%endif
%if %{with java}
%package openmpi-java
@@ -500,21 +412,12 @@ Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
%description openmpi-qt
Qt bindings for VTK with openmpi.
-%if 0%{?fedora} >= 30
%package -n python%{python3_pkgversion}-vtk-openmpi-qt
Summary: Qt Python 3 bindings for VTK with openmpi
Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
%description -n python%{python3_pkgversion}-vtk-openmpi-qt
Qt Python 3 bindings for VTK with openmpi.
-%else
-%package -n python2-vtk-openmpi-qt
-Summary: Qt Python 2 bindings for VTK with openmpi
-Requires: vtk-openmpi%{?_isa} = %{version}-%{release}
-
-%description -n python2-vtk-openmpi-qt
-Qt Python 2 bindings for VTK with openmpi.
-%endif
%endif
%package data
@@ -593,11 +496,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/vtk \\\
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \\\
-DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/vtk \\\
-%if 0%{?fedora} >= 30 \
-DVTK_PYTHON_VERSION=3 \\\
-%else \
- -DVTK_PYTHON_VERSION=2 \\\
-%endif \
%if %{with qt5} \
-DVTK_INSTALL_QT_DIR:PATH=%{_lib}/qt5/plugins/designer \\\
%else \
@@ -825,13 +724,6 @@ ctest %{_smp_mflags} -V || :
kill %1 || :
cat xorg.log
-%if 0%{?fedora} < 28
-%ldconfig_scriptlets
-%ldconfig_scriptlets java
-%ldconfig_scriptlets python2-vtk
-%ldconfig_scriptlets python2-vtk-qt
-%ldconfig_scriptlets qt
-%endif
%files -f build/libs.list
%license Copyright.txt
@@ -846,17 +738,10 @@ cat xorg.log
%{_libdir}/cmake/vtk/
%{_docdir}/vtk-8.2/
-%if 0%{?fedora} >= 30
%files -n python%{python3_pkgversion}-vtk
%{python3_sitearch}/*
%{_libdir}/*Python3?D.so.*
%exclude %{_libdir}/*QtPython3?D.so.*
-%else
-%files -n python2-vtk
-%{python2_sitearch}/*
-%{_libdir}/*Python27D.so.*
-%exclude %{_libdir}/*QtPython27D.so.*
-%endif
%{_bindir}/vtkpython
%{_bindir}/vtkWrapPython
%{_bindir}/vtkWrapPythonInit
@@ -874,13 +759,8 @@ cat xorg.log
%exclude %{_libdir}/*Python??D.so.*
%{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so
-%if 0%{?fedora} >= 30
%files -n python%{python3_pkgversion}-vtk-qt
%{_libdir}/*QtPython3?D.so.*
-%else
-%files -n python2-vtk-qt
-%{_libdir}/*QtPython27D.so.*
-%endif
%if %{with mpich}
%files mpich -f build-mpich/libs.list
@@ -895,15 +775,9 @@ cat xorg.log
%{_libdir}/mpich/lib/cmake/
%{_libdir}/mpich/share/doc/vtk-8.2/
-%if 0%{?fedora} >= 30
%files -n python%{python3_pkgversion}-vtk-mpich
%{_libdir}/mpich/lib/python%{python3_version}/
%{_libdir}/mpich/lib/*Python3?D.so.*
-%else
-%files -n python2-vtk-mpich
-%{_libdir}/mpich/lib/python%{python2_version}/
-%{_libdir}/mpich/lib/*Python27D.so.*
-%endif
%exclude %{_libdir}/mpich/lib/*QtPython??D.so.*
%{_libdir}/mpich/bin/pvtkpython
%{_libdir}/mpich/bin/vtkpython
@@ -923,13 +797,8 @@ cat xorg.log
%exclude %{_libdir}/mpich/lib/*Python??D.so.*
%{_libdir}/mpich/lib/qt?/
-%if 0%{fedora} >= 30
%files -n python%{python3_pkgversion}-vtk-mpich-qt
%{_libdir}/mpich/lib/*QtPython3?D.so.*
-%else
-%files -n python2-vtk-mpich-qt
-%{_libdir}/mpich/lib/*QtPython27D.so.*
-%endif
%endif
%if %{with openmpi}
@@ -946,15 +815,9 @@ cat xorg.log
%{_libdir}/openmpi/share/doc/vtk-8.2/
-%if 0%{fedora} >= 30
%files -n python%{python3_pkgversion}-vtk-openmpi
%{_libdir}/openmpi/lib/python%{python3_version}/
%{_libdir}/openmpi/lib/*Python3?D.so.*
-%else
-%files -n python2-vtk-openmpi
-%{_libdir}/openmpi/lib/python%{python2_version}/
-%{_libdir}/openmpi/lib/*Python27D.so.*
-%endif
%exclude %{_libdir}/openmpi/lib/*QtPython??D.so.*
%{_libdir}/openmpi/bin/pvtkpython
%{_libdir}/openmpi/bin/vtkpython
@@ -974,13 +837,8 @@ cat xorg.log
%exclude %{_libdir}/openmpi/lib/*Python27D.so.*
%{_libdir}/openmpi/lib/qt?/
-%if 0%{fedora} >= 30
%files -n python%{python3_pkgversion}-vtk-openmpi-qt
%{_libdir}/openmpi/lib/*QtPython3?D.so.*
-%else
-%files -n python2-vtk-openmpi-qt
-%{_libdir}/openmpi/lib/*QtPython27D.so.*
-%endif
%endif
%files data
@@ -993,6 +851,9 @@ cat xorg.log
%changelog
+* Sat Jun 20 2020 Orion Poplawski <orion(a)nwra.com> - 8.2.0-16
+- Drop _python_bytecompile_extra, python2 conditionals
+
* Sat May 30 2020 Björn Esser <besser82(a)fedoraproject.org> - 8.2.0-15
- Rebuild (jsoncpp)
commit f4b5ee3a0937e80cb800ca6b36c098b043bb1886
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Sat May 30 15:02:30 2020 +0200
Rebuild (jsoncpp)
diff --git a/vtk.spec b/vtk.spec
index 27fd3b6..91860ec 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 14%{?dist}
+Release: 15%{?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
@@ -993,6 +993,9 @@ cat xorg.log
%changelog
+* Sat May 30 2020 Björn Esser <besser82(a)fedoraproject.org> - 8.2.0-15
+- Rebuild (jsoncpp)
+
* Wed May 27 2020 Orion Poplawski <orion(a)nwra.com> - 8.2.0-14
- Add patch to fix building with GCC 10 (bz#1800240)
commit cb07a45afbcefa86eab1b8241ffb5ab0484dd972
Author: Orion Poplawski <orion(a)nwra.com>
Date: Wed May 27 07:45:37 2020 -0600
Add missing -devel requires on libXext/X11
diff --git a/vtk.spec b/vtk.spec
index 3e50123..27fd3b6 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -209,6 +209,8 @@ Requires: PEGTL-devel%{?_isa}
Requires: proj-devel%{?_isa}
Requires: pugixml-devel%{?_isa}
Requires: sqlite-devel%{?_isa}
+Requires: libX11-devel%{?_isa}
+Requires: libXext-devel%{?_isa}
Requires: libXt-devel%{?_isa}
Requires: mysql-devel%{?_isa}
Requires: netcdf-cxx-devel%{?_isa}
commit 8877cff15380b31860a1e7fd8c84f7229c585a6a
Author: Orion Poplawski <orion(a)nwra.com>
Date: Tue May 26 20:51:43 2020 -0600
Add patch to fix building with GCC 10 (bz#1800240)
diff --git a/vtk-gcc10.patch b/vtk-gcc10.patch
new file mode 100644
index 0000000..27b15cd
--- /dev/null
+++ b/vtk-gcc10.patch
@@ -0,0 +1,32 @@
+diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10
VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c
+--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c.gcc10 2019-01-30
10:15:13.000000000 -0700
++++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_create_par.c 2020-05-08
21:38:46.401363001 -0600
+@@ -614,5 +614,5 @@ int ex_create_par_int(const char *path,
+ * Prevent warning in some versions of ranlib(1) because the object
+ * file has no symbols.
+ */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_create_par;
+ #endif
+diff -up VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10
VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c
+--- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c.gcc10 2019-01-30
10:15:13.000000000 -0700
++++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/src/ex_open_par.c 2020-05-08
21:38:46.402363007 -0600
+@@ -474,5 +474,5 @@ int ex_open_par_int(const char *path, in
+ * Prevent warning in some versions of ranlib(1) because the object
+ * file has no symbols.
+ */
+-const char exodus_unused_symbol_dummy_1;
++const char exodus_unused_symbol_dummy_ex_open_par;
+ #endif
+diff -up VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10
VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake
+--- VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake.gcc10 2019-01-30 10:15:13.000000000
-0700
++++ VTK-8.2.0/CMake/VTKGenerateExportHeader.cmake 2020-05-26 21:07:24.625840251 -0600
+@@ -174,7 +174,7 @@ macro(_vtk_test_compiler_hidden_visibili
+ execute_process(COMMAND ${CMAKE_C_COMPILER} --version
+ OUTPUT_VARIABLE _gcc_version_info
+ ERROR_VARIABLE _gcc_version_info)
+- string(REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]*"
++ string(REGEX MATCH "[1-9][0-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:
diff --git a/vtk.spec b/vtk.spec
index 7f2bd7b..3e50123 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -30,6 +30,9 @@ Source3: FindPEGTL.cmake
Patch0:
https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch
# Proj 6 support
Patch1: vtk-proj6_compat.patch
+# GCC 10 support based on:
+#
https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6420
+Patch2: vtk-gcc10.patch
URL:
http://vtk.org/
@@ -541,6 +544,7 @@ programming languages.
%setup -q -b 1 -n VTK-%{version}
%patch0 -p1 -b .py38
%patch1 -p1 -b .proj6
+%patch2 -p1 -b .gcc10
# Remove included thirdparty sources just to be sure
# TODO - diy2 - not yet packaged
# TODO - exodusII - not yet packaged
@@ -987,6 +991,9 @@ cat xorg.log
%changelog
+* Wed May 27 2020 Orion Poplawski <orion(a)nwra.com> - 8.2.0-14
+- Add patch to fix building with GCC 10 (bz#1800240)
+
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 8.2.0-14
- Rebuilt for Python 3.9
commit 322fa6f351c72c42cb960783393b8a983a7def5f
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue May 26 03:54:47 2020 +0200
Rebuilt for Python 3.9
diff --git a/vtk.spec b/vtk.spec
index 9fbd506..7f2bd7b 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 13%{?dist}
+Release: 14%{?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
@@ -987,6 +987,9 @@ cat xorg.log
%changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 8.2.0-14
+- Rebuilt for Python 3.9
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.0-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 5b6573e318a7999c2cfb8cd66a29419bfd941c75
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Thu Mar 26 18:27:01 2020 +0100
Revert "Rebuild (proj)"
This reverts commit 6c207e504cf3746f48752b813eca4774ea9738ed.
diff --git a/vtk.spec b/vtk.spec
index 7ded979..9fbd506 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 14%{?dist}
+Release: 13%{?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
@@ -987,9 +987,6 @@ cat xorg.log
%changelog
-* Thu Mar 26 2020 Björn Esser <besser82(a)fedoraproject.org> - 8.2.0-14
-- Rebuild (proj)
-
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.0-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 6c207e504cf3746f48752b813eca4774ea9738ed
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Thu Mar 26 18:18:57 2020 +0100
Rebuild (proj)
diff --git a/vtk.spec b/vtk.spec
index 9fbd506..7ded979 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 13%{?dist}
+Release: 14%{?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
@@ -987,6 +987,9 @@ cat xorg.log
%changelog
+* Thu Mar 26 2020 Björn Esser <besser82(a)fedoraproject.org> - 8.2.0-14
+- Rebuild (proj)
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.0-13
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
commit 722af9e012c3c91232536d24bd837af2ba9f751d
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jan 31 03:25:27 2020 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/vtk.spec b/vtk.spec
index 4c23d79..9fbd506 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 12%{?dist}
+Release: 13%{?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
@@ -987,6 +987,9 @@ cat xorg.log
%changelog
+* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 8.2.0-13
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
* Thu Nov 14 2019 Björn Esser <besser82(a)fedoraproject.org> - 8.2.0-12
- Rebuild (jsoncpp)
commit 29345ab693ccc42df447a35a6f052f0f1ff38b93
Author: Björn Esser <besser82(a)fedoraproject.org>
Date: Thu Nov 14 20:39:25 2019 +0100
Rebuild (jsoncpp)
diff --git a/vtk.spec b/vtk.spec
index b78cfff..4c23d79 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 11%{?dist}
+Release: 12%{?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
@@ -987,6 +987,9 @@ cat xorg.log
%changelog
+* Thu Nov 14 2019 Björn Esser <besser82(a)fedoraproject.org> - 8.2.0-12
+- Rebuild (jsoncpp)
+
* Sat Nov 9 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-11
- Drop BR on sip-devel (python2)
commit 1d043a43e02e9b79c34bacde83c1b2163f8403da
Author: Orion Poplawski <orion(a)nwra.com>
Date: Sat Nov 9 20:51:21 2019 -0700
Drop BR on sip-devel (python2)
diff --git a/vtk.spec b/vtk.spec
index 67a4989..b78cfff 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 10%{?dist}
+Release: 11%{?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
@@ -87,7 +87,6 @@ BuildRequires: PEGTL-devel
BuildRequires: proj-devel
BuildRequires: pugixml-devel
BuildRequires: R-devel
-BuildRequires: sip-devel
BuildRequires: sqlite-devel
BuildRequires: wget
BuildRequires: blas-devel
@@ -988,7 +987,10 @@ cat xorg.log
%changelog
-* Sun Sep 22 2019 Orion Poplawski <orion(a)nwra.com>
+* Sat Nov 9 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-11
+- Drop BR on sip-devel (python2)
+
+* Sun Sep 22 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-10
- Rebuild for double-conversion 3.1.5
* Mon Sep 09 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-9
commit 4888dabcbbc32f4dcbcabd89b7e3c05aa30ab984
Author: Orion Poplawski <orion(a)nwra.com>
Date: Sun Sep 22 17:10:40 2019 -0600
Rebuild for double-conversion 3.1.5
diff --git a/vtk.spec b/vtk.spec
index 7033563..67a4989 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 9%{?dist}
+Release: 10%{?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
@@ -988,6 +988,9 @@ cat xorg.log
%changelog
+* Sun Sep 22 2019 Orion Poplawski <orion(a)nwra.com>
+- Rebuild for double-conversion 3.1.5
+
* Mon Sep 09 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-9
- Rebuild for proj 6.2.0
- Add patch and flags for proj 6 support
commit 6911e8921c0f5804119fa7d2ee8bd0dab232912d
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Sep 12 08:23:55 2019 -0600
Update FindLibPROJ.cmake from master to set LibPROJ_MAJOR_VERSION
diff --git a/vtk-proj6_compat.patch b/vtk-proj6_compat.patch
index 4380cc3..95e4a6d 100644
--- a/vtk-proj6_compat.patch
+++ b/vtk-proj6_compat.patch
@@ -141,3 +141,124 @@
# include <proj_api.h>
# include <geodesic.h>
#else
+--- VTK-8.2.0/CMake/FindLibPROJ.cmake 2019-09-11 22:13:29.493741215 -0600
++++ vtk/CMake/FindLibPROJ.cmake 2019-09-11 19:56:57.465802610 -0600
+@@ -1,55 +1,67 @@
+-# Find LibPROJ library and header file
+-# Sets
+-# LibPROJ_FOUND to 0 or 1 depending on the result
+-# LibPROJ_INCLUDE_DIR to directories required for using libproj4
+-# LibPROJ_LIBRARIES to libproj4 and any dependent libraries
+-# If LibPROJ_REQUIRED is defined, then a fatal error message will be generated if
libproj4 is not found
+-
+-if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibPROJ_LIBRARIES OR NOT LibPROJ_FOUND )
++find_path(LibPROJ_INCLUDE_DIR
++ NAMES proj_api.h proj.h
++ DOC "libproj include directories")
++mark_as_advanced(LibPROJ_INCLUDE_DIR)
+
+- if ( $ENV{LibPROJ_DIR} )
+- file( TO_CMAKE_PATH "$ENV{LibPROJ_DIR}" _LibPROJ_DIR )
++find_library(LibPROJ_LIBRARY_RELEASE
++ NAMES proj
++ DOC "libproj release library")
++mark_as_advanced(LibPROJ_LIBRARY_RELEASE)
++
++find_library(LibPROJ_LIBRARY_DEBUG
++ NAMES projd
++ DOC "libproj debug library")
++mark_as_advanced(LibPROJ_LIBRARY_DEBUG)
++
++include(SelectLibraryConfigurations)
++select_library_configurations(LibPROJ)
++
++if (LibPROJ_INCLUDE_DIR)
++ if (EXISTS "${LibPROJ_INCLUDE_DIR}/proj.h")
++ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj.h" _libproj_version_lines REGEX
"#define[ \t]+PROJ_VERSION_(MAJOR|MINOR|PATCH)")
++ string(REGEX REPLACE ".*PROJ_VERSION_MAJOR *\([0-9]*\).*" "\\1"
_libproj_version_major "${_libproj_version_lines}")
++ string(REGEX REPLACE ".*PROJ_VERSION_MINOR *\([0-9]*\).*" "\\1"
_libproj_version_minor "${_libproj_version_lines}")
++ string(REGEX REPLACE ".*PROJ_VERSION_PATCH *\([0-9]*\).*" "\\1"
_libproj_version_patch "${_libproj_version_lines}")
++ else ()
++ file(STRINGS "${LibPROJ_INCLUDE_DIR}/proj_api.h" _libproj_version_lines
REGEX "#define[ \t]+PJ_VERSION")
++ string(REGEX REPLACE ".*PJ_VERSION *\([0-9]*\).*" "\\1"
_libproj_version "${_libproj_version_lines}")
++ math(EXPR _libproj_version_major "${_libproj_version} / 100")
++ math(EXPR _libproj_version_minor "(${_libproj_version} % 100) / 10")
++ math(EXPR _libproj_version_patch "${_libproj_version} % 10")
+ endif ()
+-
+- set(LibPROJ_LIBRARY_SEARCH_PATHS
+- ${_LibPROJ_DIR}
+- ${_LibPROJ_DIR}/lib64
+- ${_LibPROJ_DIR}/lib
+- )
+-
+- find_library( LibPROJ_LIBRARY_RELEASE
+- NAMES proj
+- HINTS
+- ${LibPROJ_LIBRARY_SEARCH_PATHS}
+- )
+-
+- find_library( LibPROJ_LIBRARY_DEBUG
+- NAMES projd
+- PATHS
+- ${LibPROJ_LIBRARY_SEARCH_PATHS}
+- )
+-
+- find_path( LibPROJ_INCLUDE_DIR
+- NAMES proj_api.h proj.h
+- HINTS
+- ${_LibPROJ_DIR}
+- ${_LibPROJ_DIR}/include
+- )
+-
+- include(SelectLibraryConfigurations)
+- select_library_configurations(LibPROJ)
+-
+- include(FindPackageHandleStandardArgs)
+- find_package_handle_standard_args(LibPROJ
+- REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR)
+-
+- if(LibPROJ_FOUND)
+- set(LibPROJ_INCLUDE_DIRS ${LibPROJ_INCLUDE_DIR})
+-
+- if(NOT LibPROJ_LIBRARIES)
+- set(LibPROJ_LIBRARIES ${LibPROJ_LIBRARY})
+- endif()
+- endif()
++ set(LibPROJ_VERSION
"${_libproj_version_major}.${_libproj_version_minor}.${_libproj_version_patch}")
++ set(LibPROJ_MAJOR_VERSION "${_libproj_version_major}")
++ unset(_libproj_version_major)
++ unset(_libproj_version_minor)
++ unset(_libproj_version_patch)
++ unset(_libproj_version)
++ unset(_libproj_version_lines)
+ endif ()
+
+-mark_as_advanced(LibPROJ_INCLUDE_DIR)
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(LibPROJ
++ REQUIRED_VARS LibPROJ_LIBRARY LibPROJ_INCLUDE_DIR
++ VERSION_VAR LibPROJ_VERSION)
++
++if (LibPROJ_FOUND)
++ set(LibPROJ_INCLUDE_DIRS "${LibPROJ_INCLUDE_DIR}")
++ set(LibPROJ_LIBRARIES "${LibPROJ_LIBRARY}")
++
++ if (NOT TARGET LibPROJ::LibPROJ)
++ add_library(LibPROJ::LibPROJ UNKNOWN IMPORTED)
++ set_target_properties(LibPROJ::LibPROJ PROPERTIES
++ INTERFACE_INCLUDE_DIRECTORIES "${LibPROJ_INCLUDE_DIR}")
++ if (LibPROJ_LIBRARY_RELEASE)
++ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY
++ IMPORTED_CONFIGURATIONS RELEASE)
++ set_target_properties(LibPROJ::LibPROJ PROPERTIES
++ IMPORTED_LOCATION_RELEASE "${LibPROJ_LIBRARY_RELEASE}")
++ endif ()
++ if (LibPROJ_LIBRARY_DEBUG)
++ set_property(TARGET LibPROJ::LibPROJ APPEND PROPERTY
++ IMPORTED_CONFIGURATIONS DEBUG)
++ set_target_properties(LibPROJ::LibPROJ PROPERTIES
++ IMPORTED_LOCATION_DEBUG "${LibPROJ_LIBRARY_DEBUG}")
++ endif ()
++ endif ()
++endif ()
diff --git a/vtk.spec b/vtk.spec
index 6303f11..7033563 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -631,8 +631,7 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
%{?vtk_use_system_gl2ps} \\\
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\
-DVTK_USE_SYSTEM_LIBHARU=OFF \\\
- -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \\\
- -DLibPROJ_MAJOR_VERSION=6
+ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON
# Commented old flags in case we'd like to reactive some of them
# -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests
@@ -867,7 +866,6 @@ cat xorg.log
%files qt
%{_libdir}/lib*Qt*.so.*
-#exclude %{_libdir}/*TCL.so.*
%exclude %{_libdir}/*Python??D.so.*
%{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so
@@ -917,7 +915,6 @@ cat xorg.log
%files mpich-qt
%{_libdir}/mpich/lib/lib*Qt*.so.*
-#exclude %{_libdir}/mpich/lib/*TCL.so.*
%exclude %{_libdir}/mpich/lib/*Python??D.so.*
%{_libdir}/mpich/lib/qt?/
@@ -969,7 +966,6 @@ cat xorg.log
%files openmpi-qt
%{_libdir}/openmpi/lib/lib*Qt*.so.*
-#exclude %{_libdir}/openmpi/lib/*TCL.so.*
%exclude %{_libdir}/openmpi/lib/*Python27D.so.*
%{_libdir}/openmpi/lib/qt?/
commit a1d022bddf9e956e4d0e9c7a7fd90d47c4e40df7
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Sep 10 21:12:09 2019 -0500
Update fix for proj6 and other spec file cleanup.
diff --git a/vtk-format.patch b/vtk-format.patch
deleted file mode 100644
index 2af447e..0000000
--- a/vtk-format.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt.format
VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt
---- VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt.format 2017-03-20
09:26:17.000000000 -0600
-+++ VTK-7.1.1/Utilities/KWIML/vtkkwiml/test/CMakeLists.txt 2017-05-07 14:10:46.231254800
-0600
-@@ -10,7 +10,7 @@ endif()
- # Suppress printf/scanf format warnings; we test if the sizes match.
- foreach(lang C CXX)
- if(KWIML_LANGUAGE_${lang} AND CMAKE_${lang}_COMPILER_ID STREQUAL "GNU")
-- set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format")
-+ set(CMAKE_${lang}_FLAGS "${CMAKE_${lang}_FLAGS} -Wno-format
-Wno-format-security")
- endif()
- endforeach()
-
diff --git a/vtk-proj6.patch b/vtk-proj6.patch
deleted file mode 100644
index 95ac37f..0000000
--- a/vtk-proj6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6
VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in
---- VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6 2019-01-30 10:15:13.000000000
-0700
-+++ VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in 2019-09-08 20:17:31.848988325 -0600
-@@ -18,7 +18,7 @@
- /* Use the libproj library configured for VTK. */
- #cmakedefine VTK_USE_SYSTEM_LIBPROJ
- #ifdef VTK_USE_SYSTEM_LIBPROJ
--# include <projects.h>
-+# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
- # include <proj_api.h>
- # include <geodesic.h>
- #else
diff --git a/vtk-proj6_compat.patch b/vtk-proj6_compat.patch
new file mode 100644
index 0000000..4380cc3
--- /dev/null
+++ b/vtk-proj6_compat.patch
@@ -0,0 +1,143 @@
+--- a/CMake/FindLibPROJ.cmake
++++ b/CMake/FindLibPROJ.cmake
+@@ -30,7 +30,7 @@ if ( NOT LibPROJ_INCLUDE_DIR OR NOT LibP
+ )
+
+ find_path( LibPROJ_INCLUDE_DIR
+- NAMES proj_api.h
++ NAMES proj_api.h proj.h
+ HINTS
+ ${_LibPROJ_DIR}
+ ${_LibPROJ_DIR}/include
+--- a/Geovis/Core/vtkGeoProjection.cxx
++++ b/Geovis/Core/vtkGeoProjection.cxx
+@@ -72,6 +72,9 @@ public:
+ }
+
+ std::map< std::string, std::string > OptionalParameters;
++#if PROJ_VERSION_MAJOR >= 5
++ PJ_PROJ_INFO ProjInfo;
++#endif
+ };
+
+ //-----------------------------------------------------------------------------
+@@ -80,7 +83,7 @@ int vtkGeoProjection::GetNumberOfProject
+ if ( vtkGeoProjectionNumProj < 0 )
+ {
+ vtkGeoProjectionNumProj = 0;
+- for ( const PJ_LIST* pj = pj_get_list_ref(); pj && pj->id; ++ pj )
++ for ( const PJ_LIST* pj = proj_list_operations(); pj && pj->id; ++ pj )
+ ++ vtkGeoProjectionNumProj;
+ }
+ return vtkGeoProjectionNumProj;
+@@ -91,7 +94,7 @@ const char* vtkGeoProjection::GetProject
+ if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections()
)
+ return nullptr;
+
+- return pj_get_list_ref()[projection].id;
++ return proj_list_operations()[projection].id;
+ }
+ //-----------------------------------------------------------------------------
+ const char* vtkGeoProjection::GetProjectionDescription( int projection )
+@@ -99,7 +102,7 @@ const char* vtkGeoProjection::GetProject
+ if ( projection < 0 || projection >= vtkGeoProjection::GetNumberOfProjections()
)
+ return nullptr;
+
+- return pj_get_list_ref()[projection].descr[0];
++ return proj_list_operations()[projection].descr[0];
+ }
+ //-----------------------------------------------------------------------------
+ vtkGeoProjection::vtkGeoProjection()
+@@ -144,7 +147,7 @@ void vtkGeoProjection::PrintSelf( ostrea
+ int vtkGeoProjection::GetIndex()
+ {
+ int i = 0;
+- for ( const PJ_LIST* proj = pj_get_list_ref(); proj && proj->id; ++ proj,
++ i )
++ for ( const PJ_LIST* proj = proj_list_operations(); proj && proj->id; ++
proj, ++ i )
+ {
+ if ( ! strcmp( proj->id, this->Name ) )
+ {
+@@ -161,7 +164,11 @@ const char* vtkGeoProjection::GetDescrip
+ {
+ return nullptr;
+ }
++#if PROJ_VERSION_MAJOR >= 5
++ return this->Internals->ProjInfo.description;
++#else
+ return this->Projection->descr;
++#endif
+ }
+ //-----------------------------------------------------------------------------
+ projPJ vtkGeoProjection::GetProjection()
+@@ -232,6 +239,9 @@ int vtkGeoProjection::UpdateProjection()
+ this->ProjectionMTime = this->GetMTime();
+ if ( this->Projection )
+ {
++#if PROJ_VERSION_MAJOR >= 5
++ this->Internals->ProjInfo = proj_pj_info(this->Projection);
++#endif
+ return 0;
+ }
+ return 1;
+--- a/Geovis/Core/vtkGeoTransform.cxx
++++ b/Geovis/Core/vtkGeoTransform.cxx
+@@ -167,9 +167,17 @@ void vtkGeoTransform::InternalTransformP
+ double* coord = x;
+ for ( vtkIdType i = 0; i < numPts; ++ i )
+ {
++#if PROJ_VERSION_MAJOR >= 5
++ xy.x = coord[0]; xy.y = coord[1];
++#else
+ xy.u = coord[0]; xy.v = coord[1];
++#endif
+ lp = pj_inv( xy, src );
++#if PROJ_VERSION_MAJOR >= 5
++ coord[0] = lp.lam; coord[1] = lp.phi;
++#else
+ coord[0] = lp.u; coord[1] = lp.v;
++#endif
+ coord += stride;
+ }
+ }
+@@ -191,9 +199,17 @@ void vtkGeoTransform::InternalTransformP
+ double* coord = x;
+ for ( vtkIdType i = 0; i < numPts; ++ i )
+ {
++#if PROJ_VERSION_MAJOR >= 5
++ lp.lam = coord[0]; lp.phi = coord[1];
++#else
+ lp.u = coord[0]; lp.v = coord[1];
++#endif
+ xy = pj_fwd( lp, dst );
++#if PROJ_VERSION_MAJOR >= 5
++ coord[0] = xy.x; coord[1] = xy.y;
++#else
+ coord[0] = xy.u; coord[1] = xy.v;
++#endif
+ coord += stride;
+ }
+ }
+--- a/ThirdParty/libproj/vtk_libproj.h.in
++++ b/ThirdParty/libproj/vtk_libproj.h.in
+@@ -15,10 +15,20 @@
+ #ifndef vtk_libproj_h
+ #define vtk_libproj_h
+
++#define VTK_LibPROJ_MAJOR_VERSION @LibPROJ_MAJOR_VERSION@
++
+ /* Use the libproj library configured for VTK. */
+ #cmakedefine VTK_USE_SYSTEM_LIBPROJ
+ #ifdef VTK_USE_SYSTEM_LIBPROJ
+-# include <projects.h>
++# if VTK_LibPROJ_MAJOR_VERSION >= 5
++# include <proj.h>
++# endif
++# if VTK_LibPROJ_MAJOR_VERSION < 6
++# include <projects.h>
++# endif
++# if VTK_LibPROJ_MAJOR_VERSION >= 6
++# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1
++# endif
+ # include <proj_api.h>
+ # include <geodesic.h>
+ #else
diff --git a/vtk-tcllib.patch b/vtk-tcllib.patch
deleted file mode 100644
index 9a37e46..0000000
--- a/vtk-tcllib.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt.tcllib
VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt
---- VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt.tcllib 2015-02-16 15:08:49.121229694 -0700
-+++ VTK-6.2.0.rc1/Wrapping/Tcl/CMakeLists.txt 2015-02-16 15:09:38.793971979 -0700
-@@ -264,7 +264,7 @@ endforeach()
- # Configure the Tcl package index file for the install tree.
- SET(VTK_TCL_SCRIPT_DIR "[file dirname [info script]]")
- IF(UNIX)
-- SET(VTK_TCL_LIBRARY_DIR "[file dirname [file dirname [file dirname [info
script]]]]")
-+ SET(VTK_TCL_LIBRARY_DIR
"${CMAKE_INSTALL_PREFIX}/${VTK_INSTALL_LIBRARY_DIR}")
- ELSE()
- SET(VTK_TCL_LIBRARY_DIR
- "[file join [file dirname [file dirname [file dirname [file dirname [info
script]]]]] bin]")
-diff -up VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in.tcllib
VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in
---- VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in.tcllib 2015-02-16 12:03:08.000000000
-0700
-+++ VTK-6.2.0.rc1/Wrapping/Tcl/pkgIndex.tcl.in 2015-02-16 15:08:49.121229694 -0700
-@@ -7,7 +7,7 @@ package ifneeded vtkinit {@VTK_MAJOR_VER
- if {[catch "load {} $libName"]} {
- set libExt [info sharedlibextension]
- set currentDirectory [pwd]
-- set libFile [file join $libPath
"$libPrefix$libName-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION(a)$libExt"]
-+ set libFile [file join $libPath "$libPrefix$libName$libExt"]
- if {[catch "cd {$libPath}; load {$libFile}" errorMessage]} {
- puts $errorMessage
- }
-diff -up VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib
VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in
---- VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in.tcllib 2015-02-16
12:03:08.000000000 -0700
-+++ VTK-6.2.0.rc1/Wrapping/Tcl/vtkbase/vtkbase.tcl.in 2015-02-16 15:08:49.122229706
-0700
-@@ -44,7 +44,7 @@ namespace eval ::vtk {
- }
-
- foreach dir $dirs {
-- set libname [file join $dir
${prefix}${name}-@VTK_MAJOR_VERSION@.@VTK_MINOR_VERSION(a)${ext}]
-+ set libname [file join $dir ${prefix}${name}${ext}]
- if {[file exists $libname]} {
- if {![catch {load $libname} errormsg]} {
- # WARNING: it HAS to be "" so that pkg_mkIndex work
(since
diff --git a/vtk.spec b/vtk.spec
index 82b025d..6303f11 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -29,7 +29,7 @@ Source3: FindPEGTL.cmake
# Python 3.8 support
Patch0:
https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch
# Proj 6 support
-Patch1: vtk-proj6.patch
+Patch1: vtk-proj6_compat.patch
URL:
http://vtk.org/
@@ -631,7 +631,8 @@ export JAVA_TOOL_OPTIONS=-Xmx2048m
%{?vtk_use_system_gl2ps} \\\
-DVTK_USE_SYSTEM_HDF5:BOOL=ON \\\
-DVTK_USE_SYSTEM_LIBHARU=OFF \\\
- -DVTK_USE_SYSTEM_NETCDF:BOOL=ON
+ -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \\\
+ -DLibPROJ_MAJOR_VERSION=6
# Commented old flags in case we'd like to reactive some of them
# -DVTK_USE_DISPLAY:BOOL=OFF \ # This prevents building of graphics tests
@@ -866,7 +867,7 @@ cat xorg.log
%files qt
%{_libdir}/lib*Qt*.so.*
-%exclude %{_libdir}/*TCL.so.*
+#exclude %{_libdir}/*TCL.so.*
%exclude %{_libdir}/*Python??D.so.*
%{_libdir}/qt?/plugins/designer/libQVTKWidgetPlugin.so
@@ -916,7 +917,7 @@ cat xorg.log
%files mpich-qt
%{_libdir}/mpich/lib/lib*Qt*.so.*
-%exclude %{_libdir}/mpich/lib/*TCL.so.*
+#exclude %{_libdir}/mpich/lib/*TCL.so.*
%exclude %{_libdir}/mpich/lib/*Python??D.so.*
%{_libdir}/mpich/lib/qt?/
@@ -968,7 +969,7 @@ cat xorg.log
%files openmpi-qt
%{_libdir}/openmpi/lib/lib*Qt*.so.*
-%exclude %{_libdir}/openmpi/lib/*TCL.so.*
+#exclude %{_libdir}/openmpi/lib/*TCL.so.*
%exclude %{_libdir}/openmpi/lib/*Python27D.so.*
%{_libdir}/openmpi/lib/qt?/
commit 8fe6b10a699e6ad19135ab16f785d5024ba93c7d
Author: Orion Poplawski <orion(a)nwra.com>
Date: Sun Sep 8 20:53:59 2019 -0600
Rebuild for proj 6.2.0
Add patch and flags for proj 6 support
diff --git a/vtk-proj6.patch b/vtk-proj6.patch
new file mode 100644
index 0000000..95ac37f
--- /dev/null
+++ b/vtk-proj6.patch
@@ -0,0 +1,12 @@
+diff -up VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6
VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in
+--- VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in.proj6 2019-01-30 10:15:13.000000000
-0700
++++ VTK-8.2.0/ThirdParty/libproj/vtk_libproj.h.in 2019-09-08 20:17:31.848988325 -0600
+@@ -18,7 +18,7 @@
+ /* Use the libproj library configured for VTK. */
+ #cmakedefine VTK_USE_SYSTEM_LIBPROJ
+ #ifdef VTK_USE_SYSTEM_LIBPROJ
+-# include <projects.h>
++# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H
+ # include <proj_api.h>
+ # include <geodesic.h>
+ #else
diff --git a/vtk.spec b/vtk.spec
index 70d3e82..82b025d 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 8%{?dist}
+Release: 9%{?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
@@ -28,6 +28,8 @@ Source2: xorg.conf
Source3: FindPEGTL.cmake
# Python 3.8 support
Patch0:
https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch
+# Proj 6 support
+Patch1: vtk-proj6.patch
URL:
http://vtk.org/
@@ -539,6 +541,7 @@ programming languages.
%prep
%setup -q -b 1 -n VTK-%{version}
%patch0 -p1 -b .py38
+%patch1 -p1 -b .proj6
# Remove included thirdparty sources just to be sure
# TODO - diy2 - not yet packaged
# TODO - exodusII - not yet packaged
@@ -569,6 +572,7 @@ find vtk-examples -type f | xargs chmod -R a-x
%build
export CFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
export CXXFLAGS="%{optflags} -D_UNICODE -DHAVE_UINTPTR_T"
+export CPPFLAGS=-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H
%if %{with java}
export JAVA_HOME=/usr/lib/jvm/java
%ifarch %{arm} s390x
@@ -987,6 +991,10 @@ cat xorg.log
%changelog
+* Mon Sep 09 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-9
+- Rebuild for proj 6.2.0
+- Add patch and flags for proj 6 support
+
* Tue Aug 20 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-8
- Add upstream patch to support Python 3.8
commit 2639d96baa0eca205bcc650364910c25fef5ef3a
Author: Orion Poplawski <orion(a)nwra.com>
Date: Tue Aug 20 19:40:13 2019 -0600
Add upstream patch to support Python 3.8
diff --git a/4490.patch b/4490.patch
deleted file mode 100644
index 3f6d845..0000000
--- a/4490.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 706f1b397df09a27ab8981ab9464547028d0c322 Mon Sep 17 00:00:00 2001
-From: David Gobbi <david.gobbi(a)gmail.com>
-Date: Wed, 11 Jul 2018 17:14:50 -0600
-Subject: [PATCH] Fix compilation issue due to Python3.7 API change
-
-The PyUnicode_AsUTF8() method returns a "const char *" in Py37.
----
- Wrapping/PythonCore/vtkPythonArgs.cxx | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/Wrapping/PythonCore/vtkPythonArgs.cxx
b/Wrapping/PythonCore/vtkPythonArgs.cxx
-index 1a82af0802..b733458975 100644
---- a/Wrapping/PythonCore/vtkPythonArgs.cxx
-+++ b/Wrapping/PythonCore/vtkPythonArgs.cxx
-@@ -95,13 +95,21 @@ bool vtkPythonGetStringValue(PyObject *o, T *&a, const char
*exctext)
- {
- if (PyBytes_Check(o))
- {
-+#if PY_VERSION_HEX >= 0x03070000
-+ a = const_cast<char *>(PyBytes_AS_STRING(o));
-+ return true;
-+#else
- a = PyBytes_AS_STRING(o);
- return true;
-+#endif
- }
- #ifdef Py_USING_UNICODE
- else if (PyUnicode_Check(o))
- {
--#if PY_VERSION_HEX >= 0x03030000
-+#if PY_VERSION_HEX >= 0x03070000
-+ a = const_cast<char *>(PyUnicode_AsUTF8(o));
-+ return true;
-+#elif PY_VERSION_HEX >= 0x03030000
- a = PyUnicode_AsUTF8(o);
- return true;
- #else
---
-2.18.1
-
diff --git a/5883.patch b/5883.patch
new file mode 100644
index 0000000..f749d3c
--- /dev/null
+++ b/5883.patch
@@ -0,0 +1,176 @@
+From 257b9d7b18d5f3db3fe099dc18f230e23f7dfbab Mon Sep 17 00:00:00 2001
+From: David Gobbi <david.gobbi(a)gmail.com>
+Date: Tue, 20 Aug 2019 17:02:24 -0600
+Subject: [PATCH] Compatibility for Python 3.8
+
+The PyTypeObject struct was modified in Python 3.8, this change is
+required to avoid compile errors.
+---
+ .../PythonInterpreter/vtkPythonStdStreamCaptureHelper.h | 6 ++++++
+ Wrapping/PythonCore/PyVTKMethodDescriptor.cxx | 2 +-
+ Wrapping/PythonCore/PyVTKNamespace.cxx | 2 +-
+ Wrapping/PythonCore/PyVTKReference.cxx | 8 ++++----
+ Wrapping/PythonCore/PyVTKTemplate.cxx | 2 +-
+ Wrapping/PythonCore/vtkPythonCompatibility.h | 8 +++++++-
+ Wrapping/Tools/vtkWrapPythonClass.c | 2 +-
+ Wrapping/Tools/vtkWrapPythonEnum.c | 2 +-
+ Wrapping/Tools/vtkWrapPythonType.c | 2 +-
+ 9 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+index b1c12c83de..14ccfbe928 100644
+--- a/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
++++ b/Utilities/PythonInterpreter/vtkPythonStdStreamCaptureHelper.h
+@@ -140,6 +140,12 @@ static PyTypeObject vtkPythonStdStreamCaptureHelperType = {
+ #if PY_VERSION_HEX >= 0x03040000
+ 0, // tp_finalize
+ #endif
++#if PY_VERSION_HEX >= 0x03080000
++ 0, // tp_vectorcall
++#if PY_VERSION_HEX < 0x03090000
++ 0, // tp_print
++#endif
++#endif
+ };
+
+ static PyObject* vtkWrite(PyObject* self, PyObject* args)
+diff --git a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+index 2b0d443537..3840038498 100644
+--- a/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
++++ b/Wrapping/PythonCore/PyVTKMethodDescriptor.cxx
+@@ -186,7 +186,7 @@ PyTypeObject PyVTKMethodDescriptor_Type = {
+ sizeof(PyMethodDescrObject), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKMethodDescriptor_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKNamespace.cxx
b/Wrapping/PythonCore/PyVTKNamespace.cxx
+index 71ee2a3516..5cf5bfbe6b 100644
+--- a/Wrapping/PythonCore/PyVTKNamespace.cxx
++++ b/Wrapping/PythonCore/PyVTKNamespace.cxx
+@@ -49,7 +49,7 @@ PyTypeObject PyVTKNamespace_Type = {
+ 0, // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKNamespace_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKReference.cxx
b/Wrapping/PythonCore/PyVTKReference.cxx
+index 943ac71080..b7104091c0 100644
+--- a/Wrapping/PythonCore/PyVTKReference.cxx
++++ b/Wrapping/PythonCore/PyVTKReference.cxx
+@@ -1010,7 +1010,7 @@ PyTypeObject PyVTKReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+@@ -1067,7 +1067,7 @@ PyTypeObject PyVTKNumberReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+@@ -1124,7 +1124,7 @@ PyTypeObject PyVTKStringReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+@@ -1181,7 +1181,7 @@ PyTypeObject PyVTKTupleReference_Type = {
+ sizeof(PyVTKReference), // tp_basicsize
+ 0, // tp_itemsize
+ PyVTKReference_Delete, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/PyVTKTemplate.cxx
b/Wrapping/PythonCore/PyVTKTemplate.cxx
+index be200985b3..340fe7953b 100644
+--- a/Wrapping/PythonCore/PyVTKTemplate.cxx
++++ b/Wrapping/PythonCore/PyVTKTemplate.cxx
+@@ -268,7 +268,7 @@ PyTypeObject PyVTKTemplate_Type = {
+ 0, // tp_basicsize
+ 0, // tp_itemsize
+ nullptr, // tp_dealloc
+- nullptr, // tp_print
++ 0, // tp_vectorcall_offset
+ nullptr, // tp_getattr
+ nullptr, // tp_setattr
+ nullptr, // tp_compare
+diff --git a/Wrapping/PythonCore/vtkPythonCompatibility.h
b/Wrapping/PythonCore/vtkPythonCompatibility.h
+index 4a767844a6..be208faeef 100644
+--- a/Wrapping/PythonCore/vtkPythonCompatibility.h
++++ b/Wrapping/PythonCore/vtkPythonCompatibility.h
+@@ -64,7 +64,13 @@
+ #endif
+
+ // PyTypeObject compatibility
+-#if PY_VERSION_HEX >= 0x03040000
++#if PY_VERSION_HEX >= 0x03090000
++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
++ 0, 0, 0, 0,
++#elif PY_VERSION_HEX >= 0x03080000
++#define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
++ 0, 0, 0, 0, 0,
++#elif PY_VERSION_HEX >= 0x03040000
+ #define VTK_WRAP_PYTHON_SUPPRESS_UNINITIALIZED \
+ 0, 0, 0,
+ #else
+diff --git a/Wrapping/Tools/vtkWrapPythonClass.c b/Wrapping/Tools/vtkWrapPythonClass.c
+index b1e45f8e80..4d558ea081 100644
+--- a/Wrapping/Tools/vtkWrapPythonClass.c
++++ b/Wrapping/Tools/vtkWrapPythonClass.c
+@@ -521,7 +521,7 @@ void vtkWrapPython_GenerateObjectType(
+ " sizeof(PyVTKObject), // tp_basicsize\n"
+ " 0, // tp_itemsize\n"
+ " PyVTKObject_Delete, // tp_dealloc\n"
+- " nullptr, // tp_print\n"
++ " 0, // tp_vectorcall_offset\n"
+ " nullptr, // tp_getattr\n"
+ " nullptr, // tp_setattr\n"
+ " nullptr, // tp_compare\n"
+diff --git a/Wrapping/Tools/vtkWrapPythonEnum.c b/Wrapping/Tools/vtkWrapPythonEnum.c
+index b933702242..1249362854 100644
+--- a/Wrapping/Tools/vtkWrapPythonEnum.c
++++ b/Wrapping/Tools/vtkWrapPythonEnum.c
+@@ -145,7 +145,7 @@ void vtkWrapPython_GenerateEnumType(
+ " sizeof(PyIntObject), // tp_basicsize\n"
+ " 0, // tp_itemsize\n"
+ " nullptr, // tp_dealloc\n"
+- " nullptr, // tp_print\n"
++ " 0, // tp_vectorcall_offset\n"
+ " nullptr, // tp_getattr\n"
+ " nullptr, // tp_setattr\n"
+ " nullptr, // tp_compare\n"
+diff --git a/Wrapping/Tools/vtkWrapPythonType.c b/Wrapping/Tools/vtkWrapPythonType.c
+index 744cb1b9d3..0a1375e541 100644
+--- a/Wrapping/Tools/vtkWrapPythonType.c
++++ b/Wrapping/Tools/vtkWrapPythonType.c
+@@ -709,7 +709,7 @@ void vtkWrapPython_GenerateSpecialType(
+ " sizeof(PyVTKSpecialObject), // tp_basicsize\n"
+ " 0, // tp_itemsize\n"
+ " Py%s_Delete, // tp_dealloc\n"
+- " nullptr, // tp_print\n"
++ " 0, // tp_vectorcall_offset\n"
+ " nullptr, // tp_getattr\n"
+ " nullptr, // tp_setattr\n"
+ " nullptr, // tp_compare\n"
+--
+2.21.0
+
diff --git a/vtk.spec b/vtk.spec
index 9dce1b1..70d3e82 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 7%{?dist}
+Release: 8%{?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
@@ -26,8 +26,8 @@ Source0:
http://www.vtk.org/files/release/8.2/VTK-%{version}.tar.gz
Source1:
http://www.vtk.org/files/release/8.2/VTKData-%{version}.tar.gz
Source2: xorg.conf
Source3: FindPEGTL.cmake
-# Python 3.7 compat
-Patch0:
https://gitlab.kitware.com/vtk/vtk/merge_requests/4490.patch
+# Python 3.8 support
+Patch0:
https://gitlab.kitware.com/vtk/vtk/merge_requests/5883.patch
URL:
http://vtk.org/
@@ -538,6 +538,7 @@ programming languages.
%prep
%setup -q -b 1 -n VTK-%{version}
+%patch0 -p1 -b .py38
# Remove included thirdparty sources just to be sure
# TODO - diy2 - not yet packaged
# TODO - exodusII - not yet packaged
@@ -986,6 +987,9 @@ cat xorg.log
%changelog
+* Tue Aug 20 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-8
+- Add upstream patch to support Python 3.8
+
* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 8.2.0-7
- Rebuilt for Python 3.8
commit d727be173a36be4423fe8dfd1d17bbc8e91e3a81
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Aug 19 11:09:24 2019 +0200
Rebuilt for Python 3.8
diff --git a/vtk.spec b/vtk.spec
index fbd19af..9dce1b1 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -17,7 +17,7 @@
Summary: The Visualization Toolkit - A high level 3D visualization library
Name: vtk
Version: 8.2.0
-Release: 6%{?dist}
+Release: 7%{?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
@@ -986,6 +986,9 @@ cat xorg.log
%changelog
+* Mon Aug 19 2019 Miro Hrončok <mhroncok(a)redhat.com> - 8.2.0-7
+- Rebuilt for Python 3.8
+
* Wed Jul 31 2019 Orion Poplawski <orion(a)nwra.com> - 8.2.0-6
- BR motif-devel instead of /usr/include/Xm (bugz#1731728)