Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vigra for openSUSE:Factory checked in at 2024-02-29 21:51:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vigra (Old) and /work/SRC/openSUSE:Factory/.vigra.new.1770 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "vigra" Thu Feb 29 21:51:27 2024 rev:38 rq:1153331 version:1.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/vigra/vigra.changes 2022-08-17 18:30:55.688291011 +0200 +++ /work/SRC/openSUSE:Factory/.vigra.new.1770/vigra.changes 2024-02-29 21:51:50.469254015 +0100 @@ -1,0 +2,20 @@ +Thu Feb 29 14:49:04 UTC 2024 - Takashi Iwai <tiwai@suse.com> + +- Set disabled mode in service, to be accepted for TW + +------------------------------------------------------------------- +Tue Oct 10 13:15:43 UTC 2023 - Takashi Iwai <tiwai@suse.com> + +- Drop stale patches + +------------------------------------------------------------------- +Sun Oct 8 18:53:10 UTC 2023 - Dan Weatherill <plasteredparrot@gmail.com> + +- Bump version to new version 1.11.2 +- disable patch vigra-openexr3.patch (fixed upstream) +- disable patch 0001-Add-compatibility-for-hdf5-1-12.patch (fixed upstream) +- add conditional build for numpy support (enabled by default on Tumbleweed, + disabled on Leap as it fails for that boost_python version) +- add conditional build for LEMON support (disabled by default) + +------------------------------------------------------------------- Old: ---- 0001-Add-compatibility-for-hdf5-1-12.patch vigra-1.11.1.tar.gz vigra-openexr3.patch New: ---- _service vigra-1.11.2.tar.gz BETA DEBUG BEGIN: Old:- disable patch vigra-openexr3.patch (fixed upstream) - disable patch 0001-Add-compatibility-for-hdf5-1-12.patch (fixed upstream) - add conditional build for numpy support (enabled by default on Tumbleweed, Old:- Bump version to new version 1.11.2 - disable patch vigra-openexr3.patch (fixed upstream) - disable patch 0001-Add-compatibility-for-hdf5-1-12.patch (fixed upstream) BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vigra.spec ++++++ --- /var/tmp/diff_new_pack.SHTwh3/_old 2024-02-29 21:51:51.369286597 +0100 +++ /var/tmp/diff_new_pack.SHTwh3/_new 2024-02-29 21:51:51.373286741 +0100 @@ -1,7 +1,7 @@ # # spec file for package vigra # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,19 +16,23 @@ # +%if 0%{?suse_version} < 1600 +%bcond_with numpy +%else +%bcond_without numpy +%endif + +#LEMON build doesn't work right now (shared library problem) +%bcond_with lemon %define _shlibname libvigraimpex11 Name: vigra -Version: 1.11.1 +Version: 1.11.2 Release: 0 Summary: Computer vision Library License: MIT Group: Development/Libraries/C and C++ URL: http://ukoethe.github.io/vigra/ -Source: https://github.com/ukoethe/vigra/releases/download/Version-1-11-1/vigra-%{version}-src.tar.gz#/%{name}-%{version}.tar.gz -# https://github.com/ukoethe/vigra/issues/496 -Patch0: vigra-openexr3.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-Add-compatibility-for-hdf5-1-12.patch +Source: https://github.com/ukoethe/vigra/archive/refs/tags/Version-1-11-2.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: fdupes BuildRequires: fftw3-devel @@ -45,6 +49,15 @@ %else BuildRequires: boost-devel %endif +%if %{with numpy} +BuildRequires: libboost_python3-devel +BuildRequires: python-rpm-macros +BuildRequires: python3-numpy-devel +%endif + +%if %{with lemon} +BuildRequires: lemon-devel +%endif %description VIGRA stands for "Vision with Generic Algorithms". It is a novel @@ -81,6 +94,9 @@ Requires: openexr-devel Requires: python3-base Requires: zlib-devel +%if %{with numpy} +Requires: python3-numpy +%endif %description devel VIGRA stands for "Vision with Generic Algorithms". It is a novel @@ -90,15 +106,40 @@ VIGRA component to the needs of your application, without giving up execution speed. + +%if %{with numpy} +%package -n python3-vigranumpy +Summary: Numpy support for VIGRA library +Group: Development/Libraries/C and C++ +Requires: %{name} == %{version} +Requires: python3-numpy + +%description -n python3-vigranumpy +VIGRA stands for "Vision with Generic Algorithms". It is a novel +computer vision library that puts its main emphasis on customizable +algorithms and data structures. By using template techniques similar to +those in the C++ Standard Template Library, you can easily adapt any +VIGRA component to the needs of your application, without giving up +execution speed. This package contains python / numpy bindings for VIGRA + + +%endif + %prep -%autosetup -p1 +%autosetup -p1 -n%{name}-Version-1-11-2 sed -i -e "1s|#!.*|#!/usr/bin/python3|" config/vigra-config.in %build %cmake \ -DDOCINSTALL=%{_docdir} \ -DWITH_HDF5=1 \ - -DWITH_OPENEXR=1 + -DWITH_OPENEXR=1 \ +%if %{with lemon} + -DWITH_LEMON=1 +%else + -DWITH_LEMON=0 +%endif + make %{?_smp_mflags} %install @@ -111,7 +152,8 @@ %postun -n %{_shlibname} -p /sbin/ldconfig %files -n %{_shlibname} -%doc README.md LICENSE.txt +%doc README.md +%license LICENSE.txt %{_libdir}/*.so.* %files devel @@ -122,3 +164,14 @@ %{_libdir}/vigra/*.cmake %doc %{_docdir}/%{name} +%if %{with numpy} +%files -n python3-vigranumpy +%dir %{python_sitearch}/vigra +%dir %{python_sitearch}/vigra/pyqt +%dir %{_libdir}/vigranumpy +%{python_sitearch}/vigra/*.py +%{python_sitearch}/vigra/pyqt/*.py +%{python_sitearch}/vigra/*.so +%{_libdir}/vigranumpy/*.cmake +%endif + ++++++ _service ++++++ <services> <service mode="disabled" name="download_files"/> </services> ++++++ vigra-1.11.1.tar.gz -> vigra-1.11.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/vigra/vigra-1.11.1.tar.gz /work/SRC/openSUSE:Factory/.vigra.new.1770/vigra-1.11.2.tar.gz differ: char 5, line 1