diff options
Diffstat (limited to 'vips.spec')
| -rw-r--r-- | vips.spec | 78 |
1 files changed, 54 insertions, 24 deletions
@@ -7,8 +7,8 @@ # # Please preserve changelog entries # -%global vips_version_base 8.16 -%global vips_version %{vips_version_base}.1 +%global vips_version_base 8.17 +%global vips_version %{vips_version_base}.0 %global vips_soname_major 42 #global vips_prever rc2 %global vips_tagver %{vips_version}%{?vips_prever:-%{vips_prever}} @@ -21,7 +21,12 @@ %bcond_without im7 %bcond_with gm -%bcond_without doc +%if 0%{?fedora} || 0%{?rhel} >= 9 +%bcond_without gidocgen +%else +%bcond_with gidocgen +%endif +%bcond_without doxygen %bcond_without cplusplus %bcond_without matio %bcond_without libimagequant @@ -59,7 +64,7 @@ %bcond_without tests -%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9 +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 8 %bcond_without jxl %else %bcond_with jxl @@ -83,7 +88,8 @@ Source0: https://github.com/libvips/libvips/releases/download/v%{vips_tag BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: meson >= 0.55 +# see https://github.com/libvips/libvips/issues/4558 +BuildRequires: meson >= 0.58 BuildRequires: pkgconfig BuildRequires: gettext BuildRequires: pkgconfig(glib-2.0) @@ -184,8 +190,7 @@ Obsoletes: vips-full-devel < 8.11 %description devel The %{name}-devel package contains the header files and -libraries necessary for developing programs using VIPS. It also -contains a C++ API and development documentation. +libraries necessary for developing programs using VIPS. %package tools @@ -197,23 +202,27 @@ Obsoletes: vips-full-tools < 8.11 The %{name}-tools package contains command-line tools for working with VIPS. -%if %{with doc} %package doc Summary: Documentation for %{name} -BuildRequires: gtk-doc +BuildArch: noarch +%if %{with gidocgen} +BuildRequires: gi-docgen +%endif +%if %{with doxygen} BuildRequires: doxygen +%endif Conflicts: %{name} < %{version}-%{release}, %{name} > %{version}-%{release} Obsoletes: vips-full-doc < 8.11 %description doc -The %{name}-doc package contains extensive documentation about VIPS in both -HTML and PDF formats. -%endif +The %{name}-doc package contains extensive documentation about VIPS +and its C++ API. + %if %{with jxl} %package jxl Summary: JPEG XL support for %{name} -BuildRequires: pkgconfig(libjxl) >= 0.6 +BuildRequires: pkgconfig(libjxl) >= 0.7 Requires: %{name}%{?_isa} = %{version}-%{release} Supplements: %{name} @@ -224,7 +233,7 @@ The %{name}-jxl package contains the jxl module for VIPS, providing JPEG XL. %if %{with heif} %package heif Summary: Heif support for %{name} -BuildRequires: pkgconfig(libheif) >= 1.4.0 +BuildRequires: pkgconfig(libheif) >= 1.7.0 %if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 # x265 HEVC encoder from RPMFusion Recommends: libheif-freeworld%{?_isa} @@ -239,7 +248,7 @@ support. %package openslide Summary: OpenSlide support for %{name} -BuildRequires: pkgconfig(openslide) >= 3.3.0 +BuildRequires: pkgconfig(openslide) >= 3.4.0 Requires: %{name}%{?_isa} = %{version}-%{release} %description openslide @@ -319,6 +328,18 @@ exit 1 %setup -q -n vips-%{vips_version} +cat << 'EOF' | tee DOC_README +Online Documentation + +API reference and tools documentation + + https://www.libvips.org/API/8.17/ + +C++ documentation + + https://www.libvips.org/API/8.17/cpp/ +EOF + %build # Upstream recommends enabling auto-vectorization of inner loops: @@ -358,9 +379,11 @@ export CXXFLAGS="%{optflags} -ftree-vectorize" %else -Dnifti-prefix-dir=/usr \ %endif -%if %{with doc} - -Ddoxygen=true \ - -Dgtk_doc=true \ +%if %{with doxygen} + -Dcpp-docs=true \ +%endif +%if %{with gidocgen} + -Ddocs=true \ %endif %if %{with cplusplus} -Dcplusplus=true \ @@ -413,15 +436,15 @@ export CXXFLAGS="%{optflags} -ftree-vectorize" %{_mandir}/man1/* -%if %{with doc} %files doc -%{_datadir}/gtk-doc -%if %{with cplusplus} -%{_docdir}/vips-doc/html -%endif %license LICENSE +%doc DOC_README +%if %{with gidocgen} +%{_docdir}/vips +%endif +%if %{with doxygen} +%{_docdir}/vips-cpp %endif - %files openslide %{_libdir}/vips-modules-%{vips_version_base}/vips-openslide.so @@ -456,6 +479,13 @@ export CXXFLAGS="%{optflags} -ftree-vectorize" %changelog +* Fri Jun 6 2025 Remi Collet <remi@remirepo.net> - 8.17.0-1 +- update to 8.17.0 +- raise dependency on libjxl 0.7.0 +- raise dependency on libopenslide 3.4.0 +- raise dependency on libheif 1.7.0 +- switch to gi-docgen for API documentation + * Thu Mar 13 2025 Remi Collet <remi@remirepo.net> - 8.16.1-1 - update to 8.16.1 |