[packages/vigra] - updated to 1.12.4
qboosh
qboosh at pld-linux.org
Fri Jul 10 19:49:53 CEST 2026
commit c5f445d5533a472e9554ee05aa4722c8d4910109
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Jul 10 19:49:54 2026 +0200
- updated to 1.12.4
vigra-python.patch | 34 +++++++++++++++++++++++++++++++++
vigra.spec | 55 +++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 78 insertions(+), 11 deletions(-)
---
diff --git a/vigra.spec b/vigra.spec
index c04de0f..7725dce 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -1,20 +1,26 @@
# TODO: lemon support, WITH_LEMON
+#
+# Conditional build:
+%bcond_with pyqt4 # PyQt(4) interface
+
Summary: Generic Programming for Computer Vision
Summary(pl.UTF-8): Ogólne programowanie obrazu komputerowego
Name: vigra
-Version: 1.12.2
-Release: 2
+Version: 1.12.4
+Release: 1
License: MIT
Group: Libraries
#Source0Download: http://ukoethe.github.io/vigra/#download
-Source0: https://github.com/ukoethe/vigra/archive/Version-1-12-2/%{name}-%{version}-src.tar.gz
-# Source0-md5: 1031c61fe7b5b326664fe0bcaec4c158
+Source0: https://github.com/ukoethe/vigra/archive/Version-1-12-4/%{name}-Version-1-12-4.tar.gz
+# Source0-md5: 1e6f0ba8a1299c6831d5032ecc03a12a
Patch0: python-install.patch
-URL: http://ukoethe.github.io/vigra/
+Patch1: %{name}-python.patch
+URL: https://ukoethe.github.io/vigra/
BuildRequires: OpenEXR-devel
BuildRequires: boost-python3-devel >= 1.40.0
-BuildRequires: cmake >= 2.6.0
-BuildRequires: doxygen
+BuildRequires: cmake >= 3.12
+BuildRequires: doxygen >= 1:1.8.10-2
+BuildRequires: fftw3-devel
BuildRequires: fftw3-single-devel
BuildRequires: hdf5-devel >= 1.8
BuildRequires: libjpeg-devel
@@ -27,7 +33,7 @@ BuildRequires: python3-devel
BuildRequires: python3-numpy-devel
BuildRequires: rpmbuild(macros) >= 1.586
BuildRequires: sed >= 4.0
-BuildRequires: sphinx-pdg
+BuildRequires: sphinx-pdg-3
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -74,7 +80,6 @@ Summary(pl.UTF-8): Wiązania Pythona do biblioteki VIGRA
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
Requires: python3-numpy
-#Suggests: python3-PyQt4
%description -n python3-vigra
VIGRA Python bindings.
@@ -82,6 +87,21 @@ VIGRA Python bindings.
%description -n python3-vigra -l pl.UTF-8
Wiązania Pythona do biblioteki VIGRA.
+%package -n python3-vigra-pyqt
+Summary: VIGRA Python bindings - PyQt interface
+Summary(pl.UTF-8): Wiązania Pythona do biblioteki VIGRA - interfejs PyQt
+Group: Libraries/Python
+Requires: python3-vigra = %{version}-%{release}
+Requires: python3-PyQt4
+# TODO:
+#Suggests: python3-VigraQt
+
+%description -n python3-vigra-pyqt
+VIGRA Python bindings - PyQt interface.
+
+%description -n python3-vigra-pyqt -l pl.UTF-8
+Wiązania Pythona do biblioteki VIGRA - interfejs PyQt.
+
%package -n python3-vigra-devel
Summary: Development file for VIGRA Python bindings
Summary(pl.UTF-8): Plik programistyczny wiązań Pythona do biblioteki VIGRA
@@ -108,8 +128,9 @@ Development documentation for vigra library.
Dokumentacja programisty do biblioteki vigra.
%prep
-%setup -q -n %{name}-Version-1-12-2
-%patch -P 0 -p1
+%setup -q -n %{name}-Version-1-12-4
+%patch -P0 -p1
+%patch -P1 -p1
%{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},' config/vigra-config.in
@@ -119,12 +140,15 @@ cd build
%cmake .. \
-DBoost_INCLUDE_DIR=%{_includedir}/boost \
-DPYTHON_VERSION=%{py3_ver} \
+ -DPYTHON_SPHINX:PATH=/usr/bin/sphinx-build-3 \
-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-DWITH_BOOST_GRAPH=ON \
-DWITH_OPENEXR=ON
%{__make}
+%{__make} doc
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -133,6 +157,10 @@ rm -rf $RPM_BUILD_ROOT
%{__rm} -r $RPM_BUILD_ROOT%{_prefix}/doc/vigra*
+%if %{without pyqt4}
+%{__rm} -r $RPM_BUILD_ROOT%{py3_sitedir}/vigra/pyqt
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -159,8 +187,13 @@ rm -rf $RPM_BUILD_ROOT
%dir %{py3_sitedir}/vigra
%attr(755,root,root) %{py3_sitedir}/vigra/*.so
%{py3_sitedir}/vigra/*.py
+
+%if %{with pyqt4}
+%files -n python3-vigra-pyqt
+%defattr(644,root,root,755)
%dir %{py3_sitedir}/vigra/pyqt
%{py3_sitedir}/vigra/pyqt/*.py
+%endif
%files -n python3-vigra-devel
%defattr(644,root,root,755)
diff --git a/vigra-python.patch b/vigra-python.patch
new file mode 100644
index 0000000..39b384e
--- /dev/null
+++ b/vigra-python.patch
@@ -0,0 +1,34 @@
+--- vigra-Version-1-12-4/vigranumpy/docsrc/conf.py.in.orig 2026-04-26 01:24:11.000000000 +0200
++++ vigra-Version-1-12-4/vigranumpy/docsrc/conf.py.in 2026-07-10 17:54:47.385329377 +0200
+@@ -17,19 +17,20 @@ import sys, os, re
+ # silent lots of 'arg is not a Python function' warnings
+ import inspect
+
+-_original_getargspec = inspect.getargspec
++if hasattr(inspect, "getargspec"):
++ _original_getargspec = inspect.getargspec
+
+-def _getargspec_workaround(*args, **kw):
+- try:
+- return _original_getargspec(*args, **kw)
+- except TypeError as e:
+- if str(e).startswith('arg is not a Python function'):
+- return inspect.ArgSpec([], None, None, None)
+- else:
+- raise
++ def _getargspec_workaround(*args, **kw):
++ try:
++ return _original_getargspec(*args, **kw)
++ except TypeError as e:
++ if str(e).startswith('arg is not a Python function'):
++ return inspect.ArgSpec([], None, None, None)
++ else:
++ raise
+
+-inspect.getargspec = _getargspec_workaround
+-_getargspec_workaround.__module__ = 'inspect'
++ inspect.getargspec = _getargspec_workaround
++ _getargspec_workaround.__module__ = 'inspect'
+
+ # set the PATH of the current build, so that we don't create
+ # documentation for a possibly outdated installation
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vigra.git/commitdiff/c5f445d5533a472e9554ee05aa4722c8d4910109
More information about the pld-cvs-commit
mailing list