From b0f4065b5c2af3d613bd4f74fb60d8b652503669 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 19 Oct 2023 09:32:10 +0200
Subject: update to 8.14.5

use libhwy instead of liborc on Fedora and EL-9
use libarchive instead of libgsf
open https://github.com/libvips/libvips/pull/3722
  Revert "raise librsvg minver to 2.48
---
 vips.spec | 33 ++++++++++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 5 deletions(-)

(limited to 'vips.spec')

diff --git a/vips.spec b/vips.spec
index 2655259..014195e 100644
--- a/vips.spec
+++ b/vips.spec
@@ -7,10 +7,10 @@
 #
 # Please preserve changelog entries
 #
-%global vips_version_base 8.14
-%global vips_version %{vips_version_base}.5
+%global vips_version_base 8.15
+%global vips_version %{vips_version_base}.0
 %global vips_soname_major 42
-#global vips_prever rc1
+%global vips_prever rc1
 %global vips_tagver %{vips_version}%{?vips_prever:-%{vips_prever}}
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -19,6 +19,12 @@
 %bcond_with                doc
 %endif
 
+%if 0%{?fedora} || 0%{?rhel} >= 9
+%bcond_without             highway
+%else
+%bcond_with                highway
+%endif
+
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %bcond_without             libimagequant
 %bcond_without             libcgif
@@ -87,7 +93,11 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(fftw3)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
-BuildRequires:  pkgconfig(orc-0.4)
+%if %{with highway}
+BuildRequires:  pkgconfig(libhwy) >= 1.0.5
+%else
+BuildRequires:  pkgconfig(orc-0.4) >= 0.4.11
+%endif
 BuildRequires:  pkgconfig(lcms2)
 BuildRequires:  pkgconfig(OpenEXR) >= 1.2.2
 %if 0%{?fedora} >= 35
@@ -105,7 +115,7 @@ BuildRequires:  pkgconfig(libtiff-4)
 # upstream requires 0.6
 BuildRequires:  pkgconfig(libwebp) > 1
 BuildRequires:  pkgconfig(libexif)
-BuildRequires:  pkgconfig(libgsf-1)
+BuildRequires:  pkgconfig(libarchive) >= 3
 BuildRequires:  pkgconfig(librsvg-2.0) >= 2.40.3
 BuildRequires:  pkgconfig(libjpeg)
 %if %{with libspng}
@@ -318,6 +328,10 @@ exit 1
 
 %setup -q -n vips-%{vips_version}
 
+# Workaround for EL-7 and EL-8
+sed -e '/librsvg_dep/s/2.48.0/2.40.3/' -i meson.build
+
+
 %build
 # Upstream recommends enabling auto-vectorization of inner loops:
 # https://github.com/libvips/libvips/pull/212#issuecomment-68177930
@@ -362,6 +376,11 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 %endif
 %if %{with gm}
     -Dmagick-package=GraphicsMagick \
+%endif
+%if %{with highway}
+    -Dhighway=enabled \
+%else
+    -Dhighway=disabled \
 %endif
     -Dpdfium=disabled \
     %{nil}
@@ -450,6 +469,10 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 %changelog
 * Tue Sep 19 2023 Remi Collet <remi@remirepo.net> - 8.14.5-1
 - update to 8.14.5
+- use libhwy instead of liborc on Fedora and EL-9
+- use libarchive instead of libgsf
+- open https://github.com/libvips/libvips/pull/3722
+  Revert "raise librsvg minver to 2.48
 
 * Thu Aug 17 2023 Remi Collet <remi@remirepo.net> - 8.14.4-1
 - update to 8.14.4
-- 
cgit