From 4cd4d5ce312d57ab8982227ffccc8dc1b824ec21 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 9 Dec 2025 15:31:52 +0100
Subject: update to 8.18.0-rc2

switch from libspng to libpng (preferred upstream)
disable new uhdr feature (lack of libuhdr)
enable new raw feature (LibRaw), excepted on EL-8
open https://github.com/libvips/libvips/issues/4795 build failure for dcrawload.c
open https://github.com/libvips/libvips/issues/4796 build failure with GraphicsMagick
open https://github.com/libvips/libvips/issues/4797 build failure without libuhdr
---
 libvips-cpp.xml |  2 +-
 libvips.xml     |  2 +-
 vips.spec       | 36 ++++++++++++++++++++++++++++++------
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/libvips-cpp.xml b/libvips-cpp.xml
index 6295e80..9992621 100644
--- a/libvips-cpp.xml
+++ b/libvips-cpp.xml
@@ -9,7 +9,7 @@
 
 <version>
 <!-- Version of the library -->
-8.17.3
+8.18.0rc2
 </version>
 
 <headers>
diff --git a/libvips.xml b/libvips.xml
index fdccf1d..35d4d0a 100644
--- a/libvips.xml
+++ b/libvips.xml
@@ -9,7 +9,7 @@
 
 <version>
 <!-- Version of the library -->
-8.17.3
+8.18.0rc2
 </version>
 
 <headers>
diff --git a/vips.spec b/vips.spec
index 2e00a85..8dcdefc 100644
--- a/vips.spec
+++ b/vips.spec
@@ -7,10 +7,10 @@
 #
 # Please preserve changelog entries
 #
-%global vips_version_base 8.17
-%global vips_version %{vips_version_base}.3
+%global vips_version_base 8.18
+%global vips_version %{vips_version_base}.0
 %global vips_soname_major 42
-#global vips_prever rc2
+%global vips_prever rc2
 %global vips_tagver %{vips_version}%{?vips_prever:-%{vips_prever}}
 
 # 2-3 builds needed to get the full stack (im6 only for EL8, EL9)
@@ -41,6 +41,12 @@
 %bcond_with                imath
 %endif
 
+%if 0%{?fedora} || 0%{?rhel} >= 9
+%bcond_without             libraw
+%else
+%bcond_with                libraw
+%endif
+
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %bcond_without             highway
 %else
@@ -48,12 +54,12 @@
 %endif
 
 %if 0%{?fedora}
-%bcond_without             libspng
 %bcond_without             niftic
 %else
-%bcond_with                libspng
 %bcond_with                niftic
 %endif
+# libpng preferred over libspng
+%bcond_with                libspng
 
 # from fedora/epel repository, or from rpmfusion when enabled (from mock config)
 %if 0%{?fedora} || 0%{?rhel} >= 9 || 0%{?_with_rpmfusion:1}
@@ -123,6 +129,9 @@ BuildRequires:  libimagequant-devel
 %if %{with libcgif}
 BuildRequires:  pkgconfig(cgif)
 %endif
+%if %{with libraw}
+BuildRequires:  pkgconfig(libraw)
+%endif
 %if %{with tests}
 # bc command used in test suite
 BuildRequires:  bc
@@ -355,7 +364,7 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 # TODO remove `-Dmatio=disabled`:
 # https://bugzilla.redhat.com/2034536
 %meson \
-%if 0%{?rhel} >= 9
+%if 0%{?rhel} >= 10
     -Dmatio=disabled \
 %endif
 %if %{without heif}
@@ -401,6 +410,12 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 %else
     -Dhighway=disabled \
 %endif
+%if %{with libraw}
+    -Draw=enabled \
+%else
+    -Draw=disabled \
+%endif
+    -Duhdr=disabled \
     -Dpdfium=disabled \
     %{nil}
 
@@ -482,6 +497,15 @@ export CXXFLAGS="%{optflags} -ftree-vectorize"
 
 
 %changelog
+* Tue Dec  9 2025 Remi Collet <remi@remirepo.net> - 8.18.0~rc2-1
+- update to 8.18.0-rc2
+- switch from libspng to libpng (preferred upstream)
+- disable new uhdr feature (lack of libuhdr)
+- enable new raw feature (LibRaw), excepted on EL-8
+- open https://github.com/libvips/libvips/issues/4795 build failure for dcrawload.c
+- open https://github.com/libvips/libvips/issues/4796 build failure with GraphicsMagick
+- open https://github.com/libvips/libvips/issues/4797 build failure without libuhdr
+
 * Tue Nov  4 2025 Remi Collet <remi@remirepo.net> - 8.17.3-1
 - update to 8.17.3
 
-- 
cgit