commit b4a6219fcf47e84d754d2d87497f56f799be8b09 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Wed Apr 24 19:23:02 2024 +0200
- legacy components from last vips 8.7.x (vips-cpp7, pyvips7, pyvips8) vips-glib.patch | 22 +++ vips-introspection.patch | 67 ++++++++ vips-librsvg.patch | 11 ++ vips7.spec | 438 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 538 insertions(+) --- diff --git a/vips7.spec b/vips7.spec new file mode 100644 index 0000000..1c1fdd4 --- /dev/null +++ b/vips7.spec @@ -0,0 +1,438 @@ +# TODO: +# - pdfium as an alternative for poppler? +Summary: A fast image processing library with low memory needs +Summary(pl.UTF-8): Szybka biblioteka przetwarzania obrazów o małych wymaganiach pamięciowych +Name: vips7 +Version: 8.7.4 +Release: 1 +License: LGPL v2+ +Group: Libraries +#Source0Download: https://github.com/libvips/libvips/releases/ +Source0: https://github.com/libvips/libvips/archive/v%{version}/vips-%{version}.tar.gz +# Source0-md5: 9395d8176ed7577648daf3c98c476af5 +Patch0: vips-librsvg.patch +Patch1: vips-glib.patch +Patch2: vips-introspection.patch +URL: https://www.libvips.org/ +BuildRequires: ImageMagick-devel >= 1:6.2.4.0 +BuildRequires: OpenEXR-devel >= 1.2.2 +BuildRequires: autoconf >= 2.62 +BuildRequires: automake >= 1.6 +BuildRequires: bzip2-devel +BuildRequires: cairo-devel >= 1.2 +BuildRequires: cfitsio-devel +BuildRequires: expat-devel >= 1.95 +BuildRequires: fftw3-devel >= 3.0.0 +BuildRequires: gettext-tools +BuildRequires: giflib-devel +BuildRequires: glib2-devel >= 1:2.48 +BuildRequires: gobject-introspection-devel >= 1.30.0 +BuildRequires: gtk-doc >= 1.14 +BuildRequires: lcms2-devel >= 2 +BuildRequires: libexif-devel >= 0.6 +BuildRequires: libgsf-devel >= 1.14.31 +BuildRequires: libimagequant-devel +BuildRequires: libjpeg-devel +BuildRequires: libltdl-devel +BuildRequires: libpng-devel >= 2:1.2.9 +BuildRequires: librsvg-devel >= 2.34 +BuildRequires: libstdc++-devel +BuildRequires: libtiff-devel >= 4 +BuildRequires: libtool +BuildRequires: libwebp-devel >= 0.5.0 +BuildRequires: libxml2-devel +BuildRequires: matio-devel +BuildRequires: nifticlib-devel +BuildRequires: openslide-devel >= 3.4.0 +BuildRequires: orc-devel >= 0.4.11 +BuildRequires: pango-devel +BuildRequires: poppler-glib-devel >= 0.16.0 +BuildRequires: pkgconfig +BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(find_lang) >= 1.32 +BuildRequires: rpmbuild(macros) >= 1.714 +BuildRequires: zlib-devel >= 0.4 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%description +libvips is a demand-driven, horizontally threaded image processing +library. Compared to similar libraries, libvips runs quickly and uses +little memory. + +It has around 300 operations covering arithmetic, histograms, +convolution, morphological operations, frequency filtering, colour, +resampling, statistics and others. It supports a large range of +numeric formats, from 8-bit int to 128-bit complex. Images can have +any number of bands. It supports a good range of image formats, +including JPEG, TIFF, OME-TIFF, PNG, WebP, FITS, Matlab, OpenEXR, PDF, +SVG, HDR, PPM, CSV, GIF, Analyze, DeepZoom, and OpenSlide. It can also +load images via ImageMagick or GraphicsMagick, letting it load formats +like DICOM. + +This package contains utilities based on libvips library. + +%description -l pl.UTF-8 +VIPS jest wielowątkową biblioteką przetwarzania obrazów. W porównaniu +do innych, działa szybko i zużywa niewiele pamięci. + +Ma około 300 operacji obejmujących arytmetykę, histogramy, sploty, +operacje morfologiczne, filtry częstotliwościowe, kolory, resampling, +statystyki i inne. Obsługuje wiele formatów liczbowych, od 8-bitowych +do zespolonych 128-bitowych. Obrazy mogą mieć dowolną liczbę zakresów. +Obsługiwane jest szeroki zakres formatów, w tym JPEG, TIFF, OME-TIFF, +PNG, WebP, FITS, Matlab, OpenEXR, PDF, SVG, HDR, PPM, CSV, GIF, +Analyze, DeepZoom i OpenSlide. Biblioteka potrafi także wczytywać +obrazy poprzez ImageMagick lub GraphicsMagick, dzięki czemu obsługuje +formaty takie jak DICOM. + +Ten pakiet zawiera narzędzia oparte na bibliotece libvips. + +%package -n libvips +Summary: VIPS image processing library +Summary(pl.UTF-8): Biblioteka przetwarzania obrazów VIPS +Group: Libraries +Requires: ImageMagick-libs >= 1:6.2.4.0 +Requires: OpenEXR >= 1.2.2 +Requires: cairo >= 1.2 +Requires: glib2 >= 1:2.48 +Requires: libexif >= 0.6 +Requires: libgsf >= 1.14.31 +Requires: libpng >= 2:1.2.9 +Requires: librsvg >= 2.34 +Requires: libtiff >= 4 +Requires: libwebp >= 0.5.0 +Requires: openslide >= 3.4.0 +Requires: orc >= 0.4.11 +Requires: poppler-glib >= 0.16.0 +Requires: zlib >= 0.4 + +%description -n libvips +libvips is a demand-driven, horizontally threaded image processing +library. Compared to similar libraries, libvips runs quickly and uses +little memory. + +It has around 300 operations covering arithmetic, histograms, +convolution, morphological operations, frequency filtering, colour, +resampling, statistics and others. It supports a large range of +numeric formats, from 8-bit int to 128-bit complex. Images can have +any number of bands. It supports a good range of image formats, +including JPEG, TIFF, OME-TIFF, PNG, WebP, FITS, Matlab, OpenEXR, PDF, +SVG, HDR, PPM, CSV, GIF, Analyze, DeepZoom, and OpenSlide. It can also +load images via ImageMagick or GraphicsMagick, letting it load formats +like DICOM. + +%description -n libvips -l pl.UTF-8 +VIPS jest wielowątkową biblioteką przetwarzania obrazów. W porównaniu +do innych, działa szybko i zużywa niewiele pamięci. + +Ma około 300 operacji obejmujących arytmetykę, histogramy, sploty, +operacje morfologiczne, filtry częstotliwościowe, kolory, resampling, +statystyki i inne. Obsługuje wiele formatów liczbowych, od 8-bitowych +do zespolonych 128-bitowych. Obrazy mogą mieć dowolną liczbę zakresów. +Obsługiwane jest szeroki zakres formatów, w tym JPEG, TIFF, OME-TIFF, +PNG, WebP, FITS, Matlab, OpenEXR, PDF, SVG, HDR, PPM, CSV, GIF, +Analyze, DeepZoom i OpenSlide. Biblioteka potrafi także wczytywać +obrazy poprzez ImageMagick lub GraphicsMagick, dzięki czemu obsługuje +formaty takie jak DICOM. + +%package -n libvips-devel +Summary: Header files for VIPS library +Summary(pl.UTF-8): Pliki nagłówkowe biblioteki VIPS +Group: Development/Libraries +Requires: ImageMagick-devel >= 1:6.2.4.0 +Requires: OpenEXR-devel >= 1.2.2 +Requires: cairo-devel >= 1.2 +Requires: cfitsio-devel +Requires: fftw3-devel >= 3.0.0 +Requires: glib2-devel >= 1:2.48 +Requires: lcms2-devel >= 2 +Requires: libexif-devel >= 0.6 +Requires: libgsf-devel >= 1.14.31 +Requires: libimagequant-devel +Requires: libjpeg-devel +Requires: libpng-devel >= 2:1.2.9 +Requires: librsvg-devel >= 2.34 +Requires: libtiff-devel >= 4 +Requires: libwebp-devel >= 0.5.0 +Requires: matio-devel +Requires: openslide-devel >= 3.4.0 +Requires: orc-devel >= 0.4.11 +Requires: pango-devel +Requires: poppler-glib-devel >= 0.16.0 +Requires: zlib-devel >= 0.4 +Obsoletes: vips-devel < 8.7 + +%description -n libvips-devel +Header files for VIPS library. + +%description -n libvips-devel -l pl.UTF-8 +Pliki nagłówkowe biblioteki VIPS. + +%package -n libvips-static +Summary: Static VIPS library +Summary(pl.UTF-8): Statyczna biblioteka VIPS +Group: Development/Libraries +Obsoletes: vips-static < 8.7 + +%description -n libvips-static +Static VIPS library. + +%description -n libvips-static -l pl.UTF-8 +Statyczna biblioteka VIPS. + +%package -n libvips-cpp7 +Summary: Deprecated C++ API for VIPS image processing library +Summary(pl.UTF-8): Przestarzałe API C++ do biblioteki przetwarzania obrazów VIPS +Group: Libraries +Requires: libvips >= %{version}-%{release} + +%description -n libvips-cpp7 +Deprecated C++ API for VIPS image processing library (for VIPS 7 +compatibility). + +%description -n libvips-cpp7 -l pl.UTF-8 +Przestarzałe API C++ do biblioteki przetwarzania obrazów VIPS (dla +zachowania zgodności z VIPS 7). + +%package -n libvips-cpp7-devel +Summary: Deprecated C++ API for VIPS image processing library - header files +Summary(pl.UTF-8): Przestarzałe API C++ do biblioteki przetwarzania obrazów VIPS - pliki nagłówkowe +Group: Development/Libraries +Requires: libvips-cpp7 = %{version}-%{release} +Requires: libvips-devel >= %{version}-%{release} + +%description -n libvips-cpp7-devel +Deprecated C++ API for VIPS image processing library - header files. + +%description -n libvips-cpp7-devel -l pl.UTF-8 +Przestarzałe API C++ do biblioteki przetwarzania obrazów VIPS - pliki +nagłówkowe. + +%package -n libvips-cpp7-static +Summary: Deprecated C++ API for VIPS image processing library - static library +Summary(pl.UTF-8): Przestarzałe API C++ do biblioteki przetwarzania obrazów VIPS - biblioteka statyczna +Group: Development/Libraries +Requires: libvips-cpp7-devel = %{version}-%{release} + +%description -n libvips-cpp7-static +Deprecated C++ API for VIPS image processing library - static library. + +%description -n libvips-cpp7-static -l pl.UTF-8 +Przestarzałe API C++ do biblioteki przetwarzania obrazów VIPS - +biblioteka statyczna. + +%package -n python-vipsCC +Summary: Deprecated Python interface for VIPS image processing library +Summary(pl.UTF-8): Przestarzały interfejs Pythona do biblioteki przetwarzania obrazów VIPS +Group: Libraries/Python +Requires: libvips-cpp7 = %{version}-%{release} + +%description -n python-vipsCC +Deprecated Python interface for VIPS image processing library (for +VIPS 7 compatibility). + +%description -n python-vipsCC -l pl.UTF-8 +Przestarzały interfejs Pythona do biblioteki przetwarzania obrazów +VIPS (dla zachowania zgodności z VIPS 7). + +%package -n python-vips +Summary: Python interface for VIPS image processing library +Summary(pl.UTF-8): Interfejs Pythona do biblioteki przetwarzania obrazów VIPS +Group: Libraries/Python +Requires: gobject-introspection >= 1.30.0 +Requires: libvips >= %{version}-%{release} +Requires: python-pygobject3 >= 3.13.0 + +%description -n python-vips +Python interface for VIPS image processing library. + +%description -n python-vips -l pl.UTF-8 +Interfejs Pythona do biblioteki przetwarzania obrazów VIPS. + +%prep +%setup -q -n libvips-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +%{__gtkdocize} --docdir doc +%{__glib_gettextize} +%{__libtoolize} +%{__aclocal} -I m4 +%{__autoconf} +%{__autoheader} +%{__automake} +%configure \ + --enable-cpp7 \ + --disable-gtk-doc \ + --enable-pyvips7 \ + --enable-pyvips8 + +%{__make} -j1 + +%install +rm -rf $RPM_BUILD_ROOT + +%{__make} install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvips-cpp.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvips.la +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvipsCC.la + +%py_postclean +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/vipsCC/*.{la,a} + +# cpp8 library, in mainline vips +%{__rm} $RPM_BUILD_ROOT%{_includedir}/vips/{VError8.h,VImage8.h,VInterpolate8.h,vips-operators.h,vips8} +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvips-cpp.* +%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/vips-cpp.pc + +# vips.spec still has libvips.so.42 soname, so rely in its runtime/-devel +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libvips.* +%{__rm} $RPM_BUILD_ROOT%{_includedir}/vips/{almostdeprecated,arithmetic,basic,buf,cimg_funcs,colour,conversion,convolution,create,dbuf,debug,deprecated,dispatch,draw,enumtypes,error,foreign,format,freqfilt,gate,generate,header,histogram,image,interpolate,intl,mask,memory,morphology,mosaicing,object,operation,private,rect,region,resample,semaphore,soname,thread,threadpool,transform,type,util,vector,version,video,vips,vips7compat}.h +%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/vips.pc +%{__rm} $RPM_BUILD_ROOT%{_libdir}/girepository-1.0/Vips-8.0.typelib +%{__rm} $RPM_BUILD_ROOT%{_datadir}/gir-1.0/Vips-8.0.gir + +# also don't duplicate tools +%{__rm} $RPM_BUILD_ROOT%{_bindir}/{batch_crop,batch_image_convert,batch_rubber_sheet,light_correct,shrink_width,vips,vips-8.7,vipsedit,vipsheader,vipsprofile,vipsthumbnail} +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{batch_crop,batch_image_convert,batch_rubber_sheet,light_correct,vips,vipsedit,vipsheader,vipsprofile,vipsthumbnail}.1 + +%find_lang vips8.7 + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n libvips -p /sbin/ldconfig +%postun -n libvips -p /sbin/ldconfig + +%post -n libvips-cpp7 -p /sbin/ldconfig +%postun -n libvips-cpp7 -p /sbin/ldconfig + +%if 0 +%files +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/batch_crop +%attr(755,root,root) %{_bindir}/batch_image_convert +%attr(755,root,root) %{_bindir}/batch_rubber_sheet +%attr(755,root,root) %{_bindir}/light_correct +%attr(755,root,root) %{_bindir}/shrink_width +%attr(755,root,root) %{_bindir}/vips +%attr(755,root,root) %{_bindir}/vips-8.7 +%attr(755,root,root) %{_bindir}/vipsedit +%attr(755,root,root) %{_bindir}/vipsheader +%attr(755,root,root) %{_bindir}/vipsprofile +%attr(755,root,root) %{_bindir}/vipsthumbnail +%{_mandir}/man1/batch_crop.1* +%{_mandir}/man1/batch_image_convert.1* +%{_mandir}/man1/batch_rubber_sheet.1* +%{_mandir}/man1/light_correct.1* +%{_mandir}/man1/vips.1* +%{_mandir}/man1/vipsedit.1* +%{_mandir}/man1/vipsheader.1* +%{_mandir}/man1/vipsprofile.1* +%{_mandir}/man1/vipsthumbnail.1* + +%files -n libvips -f vips8.7.lang +%defattr(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README.md THANKS TODO +%attr(755,root,root) %{_libdir}/libvips.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libvips.so.42 +%{_libdir}/girepository-1.0/Vips-8.0.typelib + +%files -n libvips-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libvips.so +%dir %{_includedir}/vips +%{_includedir}/vips/almostdeprecated.h +%{_includedir}/vips/arithmetic.h +%{_includedir}/vips/basic.h +%{_includedir}/vips/buf.h +%{_includedir}/vips/cimg_funcs.h +%{_includedir}/vips/colour.h +%{_includedir}/vips/conversion.h +%{_includedir}/vips/convolution.h +%{_includedir}/vips/create.h +%{_includedir}/vips/dbuf.h +%{_includedir}/vips/debug.h +%{_includedir}/vips/deprecated.h +%{_includedir}/vips/dispatch.h +%{_includedir}/vips/draw.h +%{_includedir}/vips/enumtypes.h +%{_includedir}/vips/error.h +%{_includedir}/vips/foreign.h +%{_includedir}/vips/format.h +%{_includedir}/vips/freqfilt.h +%{_includedir}/vips/gate.h +%{_includedir}/vips/generate.h +%{_includedir}/vips/header.h +%{_includedir}/vips/histogram.h +%{_includedir}/vips/image.h +%{_includedir}/vips/interpolate.h +%{_includedir}/vips/intl.h +%{_includedir}/vips/mask.h +%{_includedir}/vips/memory.h +%{_includedir}/vips/morphology.h +%{_includedir}/vips/mosaicing.h +%{_includedir}/vips/object.h +%{_includedir}/vips/operation.h +%{_includedir}/vips/private.h +%{_includedir}/vips/rect.h +%{_includedir}/vips/region.h +%{_includedir}/vips/resample.h +%{_includedir}/vips/semaphore.h +%{_includedir}/vips/soname.h +%{_includedir}/vips/thread.h +%{_includedir}/vips/threadpool.h +%{_includedir}/vips/transform.h +%{_includedir}/vips/type.h +%{_includedir}/vips/util.h +%{_includedir}/vips/vector.h +%{_includedir}/vips/version.h +%{_includedir}/vips/video.h +%{_includedir}/vips/vips.h +%{_includedir}/vips/vips7compat.h +%{_datadir}/gir-1.0/Vips-8.0.gir +%{_pkgconfigdir}/vips.pc + +%files -n libvips-static +%defattr(644,root,root,755) +%{_libdir}/libvips.a +%endif + +%files -n libvips-cpp7 +%defattr(644,root,root,755) +%doc AUTHORS ChangeLog NEWS README.md THANKS TODO +%attr(755,root,root) %{_libdir}/libvipsCC.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libvipsCC.so.42 + +%files -n libvips-cpp7-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libvipsCC.so +%{_includedir}/vips/VDisplay.h +%{_includedir}/vips/VError.h +%{_includedir}/vips/VImage.h +%{_includedir}/vips/VMask.h +%{_includedir}/vips/vipsc++.h +%{_includedir}/vips/vipscpp.h +%{_includedir}/vips/vips +%{_pkgconfigdir}/vipsCC.pc + +%files -n libvips-cpp7-static +%defattr(644,root,root,755) +%{_libdir}/libvipsCC.a + +%files -n python-vipsCC +%defattr(644,root,root,755) +%dir %{py_sitedir}/vipsCC +%{py_sitedir}/vipsCC/*.py[co] +%attr(755,root,root) %{py_sitedir}/vipsCC/vdisplaymodule.so +%attr(755,root,root) %{py_sitedir}/vipsCC/verrormodule.so +%attr(755,root,root) %{py_sitedir}/vipsCC/vimagemodule.so +%attr(755,root,root) %{py_sitedir}/vipsCC/vmaskmodule.so + +%files -n python-vips +%defattr(644,root,root,755) +%{py_sitedir}/gi/overrides/Vips.py[co] diff --git a/vips-glib.patch b/vips-glib.patch new file mode 100644 index 0000000..d0b9d4e --- /dev/null +++ b/vips-glib.patch @@ -0,0 +1,22 @@ +--- libvips-8.7.4/libvips/include/vips/vips.h.orig 2019-01-18 13:52:04.000000000 +0100 ++++ libvips-8.7.4/libvips/include/vips/vips.h 2022-04-13 18:03:18.422325846 +0200 +@@ -80,15 +80,15 @@ + #ifndef VIPS_VIPS_H + #define VIPS_VIPS_H + +-#ifdef __cplusplus +-extern "C" { +-#endif /*__cplusplus*/ +- + #include <glib.h> + #include <glib/gstdio.h> + #include <gmodule.h> + #include <glib-object.h> + ++#ifdef __cplusplus ++extern "C" { ++#endif /*__cplusplus*/ ++ + /* If we're being parsed by SWIG, remove gcc attributes. + */ + #ifdef SWIG diff --git a/vips-introspection.patch b/vips-introspection.patch new file mode 100644 index 0000000..56687cc --- /dev/null +++ b/vips-introspection.patch @@ -0,0 +1,67 @@ +From e3181e05799fa1e51e1a4f8fc6884e3f9c3de765 Mon Sep 17 00:00:00 2001 +From: John Cupitt <jcup...@gmail.com> +Date: Mon, 28 Sep 2020 12:32:06 +0100 +Subject: [PATCH] get docs building with goi 1.66+ + +It builds now, but some doc sections are missing. Fix this properly in +8.11. + +See https://github.com/libvips/libvips/issues/1836 +--- + ChangeLog | 1 + + libvips/iofuncs/error.c | 2 +- + libvips/iofuncs/rect.c | 2 +- + libvips/resample/interpolate.c | 2 +- + 4 files changed, 4 insertions(+), 3 deletions(-) + +#diff --git a/ChangeLog b/ChangeLog +#index b22258753a..bb6df2f7e5 100644 +#--- a/ChangeLog +#+++ b/ChangeLog +#@@ -10,6 +10,7 @@ +# - better heif signature detection [lovell] +# - fix vips_fractsurf() typo [kleisauke] +# - better heif EOF detection [lovell] +#+- fix gir build with g-o-i 1.66+ [László] +# +# 9/8/20 started 8.10.1 +# - fix markdown -> xml conversion in doc generation +diff --git a/libvips/iofuncs/error.c b/libvips/iofuncs/error.c +index 165623843d..746742cb37 100644 +--- a/libvips/iofuncs/error.c ++++ b/libvips/iofuncs/error.c +@@ -71,7 +71,7 @@ + #endif /*OS_WIN32*/ + + /** +- * SECTION: error ++ * SECTION: errors + * @short_description: error messages and error handling + * @stability: Stable + * @include: vips/vips.h +diff --git a/libvips/iofuncs/rect.c b/libvips/iofuncs/rect.c +index 79ae69f764..9038efb9bb 100644 +--- a/libvips/iofuncs/rect.c ++++ b/libvips/iofuncs/rect.c +@@ -45,7 +45,7 @@ + #include <vips/vips.h> + + /** +- * SECTION: rect ++ * SECTION: rectangle + * @short_description: the VIPS rectangle class + * @stability: Stable + * @see_also: <link linkend="VipsRegion">region</link> +diff --git a/libvips/resample/interpolate.c b/libvips/resample/interpolate.c +index 5ec50b742e..d295ad9fa7 100644 +--- a/libvips/resample/interpolate.c ++++ b/libvips/resample/interpolate.c +@@ -63,7 +63,7 @@ + #include <vips/internal.h> + + /** +- * SECTION: interpolate ++ * SECTION: interpolator + * @short_description: various interpolators: nearest, bilinear, and + * some non-linear + * @stability: Stable diff --git a/vips-librsvg.patch b/vips-librsvg.patch new file mode 100644 index 0000000..8274f75 --- /dev/null +++ b/vips-librsvg.patch @@ -0,0 +1,11 @@ +--- libvips-8.7.4/libvips/foreign/svgload.c.orig 2019-01-18 13:52:04.000000000 +0100 ++++ libvips-8.7.4/libvips/foreign/svgload.c 2022-04-13 18:08:26.557185578 +0200 +@@ -78,7 +78,7 @@ + /* Old librsvg versions don't include librsvg-features.h by default. + * Newer versions deprecate direct inclusion. + */ +-#ifndef LIBRSVG_FEATURES_H ++#if !defined(LIBRSVG_FEATURES_H) && !defined(RSVG_FEATURES_H) + #include <librsvg/librsvg-features.h> + #endif + ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/vips7.git/commitdiff/b4a6219fcf47e84d754d2d87497f56f799be8b09 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit