[packages/vigra] - up to 1.12.2
baggins
baggins at pld-linux.org
Thu Dec 4 00:11:58 CET 2025
commit 72683d61215d52ac632fa96613cf5a78960f29e1
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Thu Dec 4 02:11:49 2025 +0100
- up to 1.12.2
boost-python.patch | 10 ---
gcc14.patch | 11 ----
hdf5-1.12.patch | 25 --------
python-install.patch | 12 ++--
vigra-multi_convolution.patch | 139 ------------------------------------------
vigra-openexr3.patch | 39 ------------
vigra.spec | 76 +++++++++--------------
7 files changed, 36 insertions(+), 276 deletions(-)
---
diff --git a/vigra.spec b/vigra.spec
index 5d07598..73bc90b 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -2,24 +2,17 @@
Summary: Generic Programming for Computer Vision
Summary(pl.UTF-8): Ogólne programowanie obrazu komputerowego
Name: vigra
-Version: 1.11.1
-Release: 17
+Version: 1.12.2
+Release: 1
License: MIT
Group: Libraries
#Source0Download: http://ukoethe.github.io/vigra/#download
-Source0: https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/%{name}-%{version}-src.tar.gz
-# Source0-md5: e72faf9fb82fa71fa63ba064bb63b703
+Source0: https://github.com/ukoethe/vigra/archive/Version-1-12-2/%{name}-%{version}-src.tar.gz
+# Source0-md5: 1031c61fe7b5b326664fe0bcaec4c158
Patch0: python-install.patch
-Patch1: boost-python.patch
-# https://src.fedoraproject.org/rpms/vigra/raw/master/f/81958d302494e137f98a8b1d7869841532f90388.patch
-Patch2: %{name}-multi_convolution.patch
-# https://src.fedoraproject.org/rpms/vigra/raw/rawhide/f/vigra-openexr3.patch
-Patch3: %{name}-openexr3.patch
-Patch4: hdf5-1.12.patch
-Patch5: gcc14.patch
URL: http://ukoethe.github.io/vigra/
BuildRequires: OpenEXR-devel
-BuildRequires: boost-python-devel >= 1.40.0
+BuildRequires: boost-python3-devel >= 1.40.0
BuildRequires: cmake >= 2.6.0
BuildRequires: doxygen
BuildRequires: fftw3-single-devel
@@ -29,9 +22,9 @@ BuildRequires: libpng-devel >= 2:1.4.0
BuildRequires: libstdc++-devel >= 6:4.4
BuildRequires: libtiff-devel
BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.7
-BuildRequires: python-devel >= 1:2.7
-BuildRequires: python-numpy-devel
+BuildRequires: python3
+BuildRequires: python3-devel
+BuildRequires: python3-numpy-devel
BuildRequires: rpmbuild(macros) >= 1.586
BuildRequires: sed >= 4.0
BuildRequires: sphinx-pdg
@@ -75,31 +68,31 @@ Header files needed to compile programs with vigra.
Pliki nagłówkowe potrzebne do budowania programów używających
biblioteki vigra.
-%package -n python-vigra
+%package -n python3-vigra
Summary: VIGRA Python bindings
Summary(pl.UTF-8): Wiązania Pythona do biblioteki VIGRA
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
-Requires: python-numpy
-Suggests: python-PyQt4
+Requires: python3-numpy
+#Suggests: python3-PyQt4
-%description -n python-vigra
+%description -n python3-vigra
VIGRA Python bindings.
-%description -n python-vigra -l pl.UTF-8
+%description -n python3-vigra -l pl.UTF-8
Wiązania Pythona do biblioteki VIGRA.
-%package -n python-vigra-devel
+%package -n python3-vigra-devel
Summary: Development file for VIGRA Python bindings
Summary(pl.UTF-8): Plik programistyczny wiązań Pythona do biblioteki VIGRA
Group: Development/Libraries
Requires: cmake
-Requires: python-vigra = %{version}-%{release}
+Requires: python3-vigra = %{version}-%{release}
-%description -n python-vigra-devel
+%description -n python3-vigra-devel
Development (cmake config) file for VIGRA Python bindings.
-%description -n python-vigra-devel -l pl.UTF-8
+%description -n python3-vigra-devel -l pl.UTF-8
Plik programistyczny (konfiguracja cmake'a) dla wiązań Pythona do
biblioteki VIGRA.
@@ -115,22 +108,17 @@ Development documentation for vigra library.
Dokumentacja programisty do biblioteki vigra.
%prep
-%setup -q
+%setup -q -n %{name}-Version-1-12-2
%patch -P 0 -p1
-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' config/vigra-config.in
+%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' config/vigra-config.in
%build
install -d build
cd build
%cmake .. \
-DBoost_INCLUDE_DIR=%{_includedir}/boost \
- -DPYTHON_VERSION=%{py_ver} \
+ -DPYTHON_VERSION=%{py3_ver} \
-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-DWITH_BOOST_GRAPH=ON \
-DWITH_OPENEXR=ON
@@ -143,10 +131,6 @@ rm -rf $RPM_BUILD_ROOT
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}/vigra
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}/vigra
-%py_postclean
-
%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc/vigra*
%clean
@@ -158,27 +142,27 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc LICENSE.txt README.md
-%attr(755,root,root) %{_libdir}/libvigraimpex.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libvigraimpex.so.11
+%{_libdir}/libvigraimpex.so.*.*
+%ghost %{_libdir}/libvigraimpex.so.11
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/vigra-config
-%attr(755,root,root) %{_libdir}/libvigraimpex.so
+%{_libdir}/libvigraimpex.so
%{_includedir}/vigra
%dir %{_libdir}/vigra
%{_libdir}/vigra/VigraConfig*.cmake
%{_libdir}/vigra/vigra-targets*.cmake
-%files -n python-vigra
+%files -n python3-vigra
%defattr(644,root,root,755)
-%dir %{py_sitedir}/vigra
-%attr(755,root,root) %{py_sitedir}/vigra/*.so
-%{py_sitedir}/vigra/*.py[co]
-%dir %{py_sitedir}/vigra/pyqt
-%{py_sitedir}/vigra/pyqt/*.py[co]
+%dir %{py3_sitedir}/vigra
+%attr(755,root,root) %{py3_sitedir}/vigra/*.so
+%{py3_sitedir}/vigra/*.py
+%dir %{py3_sitedir}/vigra/pyqt
+%{py3_sitedir}/vigra/pyqt/*.py
-%files -n python-vigra-devel
+%files -n python3-vigra-devel
%defattr(644,root,root,755)
%dir %{_libdir}/vigranumpy
%{_libdir}/vigranumpy/VigranumpyConfig.cmake
diff --git a/boost-python.patch b/boost-python.patch
deleted file mode 100644
index bacb2bb..0000000
--- a/boost-python.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- vigra-1.11.1/config/FindVIGRANUMPY_DEPENDENCIES.cmake~ 2019-04-20 09:15:42.000000000 +0200
-+++ vigra-1.11.1/config/FindVIGRANUMPY_DEPENDENCIES.cmake 2019-04-20 09:24:48.026845853 +0200
-@@ -110,6 +110,7 @@
- # (may or may not be thread-safe)
- SET(BOOST_PYTHON_NAMES ${BOOST_PYTHON_NAMES}
- # Linux with multiple Python versions
-+ boost_python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
- boost_python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
- # Gentoo
- boost_python-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
diff --git a/gcc14.patch b/gcc14.patch
deleted file mode 100644
index 237b2a6..0000000
--- a/gcc14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx~ 2017-05-19 17:01:08.000000000 +0200
-+++ vigra-1.11.1/vigranumpy/src/core/vigranumpycore.cxx 2024-12-18 10:51:25.553019663 +0100
-@@ -61,7 +61,7 @@
- return checksum(data, size);
- #else
- Py_ssize_t size = 0;
-- char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
-+ const char * data = PyUnicode_AsUTF8AndSize(s.ptr(), &size);
- return checksum(data, size);
- #endif
- }
diff --git a/hdf5-1.12.patch b/hdf5-1.12.patch
deleted file mode 100644
index 85a3288..0000000
--- a/hdf5-1.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4c70103d215bb70d4820cd4569321361d0baade7 Mon Sep 17 00:00:00 2001
-From: Mark Harfouche <mark.harfouche at gmail.com>
-Date: Tue, 28 Sep 2021 09:45:08 -0400
-Subject: [PATCH] Add compatibility for HDF5 1.12
-
----
- src/impex/hdf5impex.cxx | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/impex/hdf5impex.cxx b/src/impex/hdf5impex.cxx
-index 2c68342ea..b202b2fb5 100644
---- a/src/impex/hdf5impex.cxx
-+++ b/src/impex/hdf5impex.cxx
-@@ -190,7 +190,11 @@ H5O_type_t HDF5_get_type(hid_t loc_id, const char* name)
- {
- // get information about object
- H5O_info_t infobuf;
-+#if H5Oget_info_by_name_vers >= 3
-+ H5Oget_info_by_name(loc_id, name, &infobuf, H5O_INFO_BASIC, H5P_DEFAULT);
-+#else
- H5Oget_info_by_name(loc_id, name, &infobuf, H5P_DEFAULT);
-+#endif
- return infobuf.type;
- }
-
diff --git a/python-install.patch b/python-install.patch
index 26f15d2..020de1d 100644
--- a/python-install.patch
+++ b/python-install.patch
@@ -1,11 +1,11 @@
---- vigra-1.11.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake.orig 2016-09-15 20:53:44.195804019 +0200
-+++ vigra-1.11.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake 2016-09-15 21:04:01.755796967 +0200
-@@ -138,7 +138,7 @@
+--- vigra-Version-1-12-2/config/FindVIGRANUMPY_DEPENDENCIES.cmake~ 2025-03-19 01:29:31.000000000 +0100
++++ vigra-Version-1-12-2/config/FindVIGRANUMPY_DEPENDENCIES.cmake 2025-12-04 02:00:17.296654324 +0100
+@@ -83,7 +83,7 @@
######################################################################
IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
-- "from distutils.sysconfig import *; print(get_python_lib(1))"
-+ "from distutils.sysconfig import *; print(get_python_lib(plat_specific=True, prefix='/usr'))"
+ execute_process(COMMAND ${Python_EXECUTABLE} -c
+- "import sysconfig; print(sysconfig.get_paths()['purelib'])"
++ "import sysconfig; print(sysconfig.get_paths()['platlib'])"
OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
ENDIF()
diff --git a/vigra-multi_convolution.patch b/vigra-multi_convolution.patch
deleted file mode 100644
index 88ed61e..0000000
--- a/vigra-multi_convolution.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 81958d302494e137f98a8b1d7869841532f90388 Mon Sep 17 00:00:00 2001
-From: JaimeIvanCervantes <jimmycc80 at hotmail.com>
-Date: Fri, 16 Jun 2017 13:21:45 -0700
-Subject: [PATCH] multi_convolution: Fix for incorrect template parameter type
- when using unsigned int N for TinyVector SIZE. (Fixes #414)
-
----
- include/vigra/multi_convolution.hxx | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/include/vigra/multi_convolution.hxx b/include/vigra/multi_convolution.hxx
-index 1b5efa740..ec89bcf58 100644
---- a/include/vigra/multi_convolution.hxx
-+++ b/include/vigra/multi_convolution.hxx
-@@ -1426,7 +1426,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-
-@@ -1435,7 +1435,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt);
-
- // likewise, but execute algorithm in parallel
-@@ -1443,7 +1443,7 @@ gaussianSmoothMultiArray(MultiArrayView<N, T1, S1> const & source,
- class T2, class S2>
- void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- BlockwiseConvolutionOptions<N> opt);
- }
- \endcode
-@@ -1590,7 +1590,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt )
- {
- if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -1614,7 +1614,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- gaussianGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
-@@ -1653,7 +1653,7 @@ gaussianGradientMagnitudeImpl(MultiArrayView<N+1, T1, S1> const & src,
- dest.init(0.0);
-
- typedef typename NumericTraits<T1>::RealPromote TmpType;
-- MultiArray<N, TinyVector<TmpType, N> > grad(dest.shape());
-+ MultiArray<N, TinyVector<TmpType, int(N)> > grad(dest.shape());
-
- using namespace multi_math;
-
-@@ -1771,7 +1771,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
- class T2, class S2>
- void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-
- // execute algorithm in parallel
-@@ -1779,7 +1779,7 @@ gaussianGradientMagnitude(MultiArrayView<N+1, Multiband<T1>, S1> const & src,
- class T2, class S2>
- void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- BlockwiseConvolutionOptions<N> opt);
- }
- \endcode
-@@ -1895,7 +1895,7 @@ template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
- symmetricGradientMultiArray(MultiArrayView<N, T1, S1> const & source,
-- MultiArrayView<N, TinyVector<T2, N>, S2> dest,
-+ MultiArrayView<N, TinyVector<T2, int(N)>, S2> dest,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
- {
- if(opt.to_point != typename MultiArrayShape<N>::type())
-@@ -2214,14 +2214,14 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- ConvolutionOptions<N> const & opt);
-
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>());
-@@ -2231,7 +2231,7 @@ laplacianOfGaussianMultiArray(MultiArrayView<N, T1, S1> const & source,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- void
-- gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- BlockwiseConvolutionOptions<N> const & opt);
- }
-@@ -2324,7 +2324,7 @@ gaussianDivergenceMultiArray(Iterator vectorField, Iterator vectorFieldEnd,
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- ConvolutionOptions<N> const & opt)
- {
-@@ -2338,7 +2338,7 @@ gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & ve
- template <unsigned int N, class T1, class S1,
- class T2, class S2>
- inline void
--gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, N>, S1> const & vectorField,
-+gaussianDivergenceMultiArray(MultiArrayView<N, TinyVector<T1, int(N)>, S1> const & vectorField,
- MultiArrayView<N, T2, S2> divergence,
- double sigma,
- ConvolutionOptions<N> opt = ConvolutionOptions<N>())
diff --git a/vigra-openexr3.patch b/vigra-openexr3.patch
deleted file mode 100644
index a4c9b76..0000000
--- a/vigra-openexr3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: vigra-1.11.1/CMakeLists.txt
-===================================================================
---- vigra-1.11.1.orig/CMakeLists.txt
-+++ vigra-1.11.1/CMakeLists.txt
-@@ -107,7 +107,22 @@ VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3
-
-
- IF(WITH_OPENEXR)
-+ FIND_PACKAGE(Imath CONFIG)
-+ IF(TARGET Imath::Imath)
-+ FIND_PACKAGE(OpenEXR CONFIG)
-+ SET(OPENEXR_LIBRARIES
-+ OpenEXR::OpenEXR
-+ OpenEXR::Iex
-+ OpenEXR::IlmThread
-+ Imath::Imath
-+ )
-+ get_target_property(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXRConfig INTERFACE_INCLUDE_DIRECTORIES)
-+ get_target_property(IMATH_INCLUDE_DIR Imath::ImathConfig INTERFACE_INCLUDE_DIRECTORIES)
-+ include_directories(${OPENEXR_INCLUDE_DIR} ${IMATH_INCLUDE_DIR})
-+ set(OPENEXR_FOUND TRUE)
-+ ELSE()
- VIGRA_FIND_PACKAGE(OpenEXR)
-+ ENDIF()
- ENDIF()
-
- IF(WITH_HDF5)
-Index: vigra-1.11.1/src/impex/CMakeLists.txt
-===================================================================
---- vigra-1.11.1.orig/src/impex/CMakeLists.txt
-+++ vigra-1.11.1/src/impex/CMakeLists.txt
-@@ -85,6 +85,7 @@ IF(TIFF_FOUND)
- ENDIF(TIFF_FOUND)
-
- IF(OPENEXR_FOUND)
-+ cmake_policy(SET CMP0028 NEW)
- TARGET_LINK_LIBRARIES(vigraimpex ${OPENEXR_LIBRARIES})
- ENDIF(OPENEXR_FOUND)
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vigra.git/commitdiff/72683d61215d52ac632fa96613cf5a78960f29e1
More information about the pld-cvs-commit
mailing list