Fixes zimg: FTBFS in Fedora rawhide/f45

Both patches 0 and 1 were rebased from master on top of 3.0.6.
They should be removed during the next zimg update.

Resolves: rhbz#2485557
Resolves: rhbz#2505389

Colorspace conversion segfaults on CPUs that support AVX, but not AVX2

Signed-off-by: Filipe Rosset <rosset.filipe@gmail.com>

0e56801f98db3e363c974fca794fa06022d40ee4.patch

@@ -0,0 +1,12 @@
+diff -up a/src/zimg/colorspace/x86/operation_impl_x86.cpp b/src/zimg/colorspace/x86/operation_impl_x86.cpp
+--- a/src/zimg/colorspace/x86/operation_impl_x86.cpp
++++ b/src/zimg/colorspace/x86/operation_impl_x86.cpp
+@@ -19,7 +19,7 @@ std::unique_ptr<Operation> create_matrix
+ 		if (!ret && cpu == CPUClass::AUTO_64B && caps.avx512f)
+ 			ret = create_matrix_operation_avx512(m);
+ #endif
+-		if (!ret && caps.avx && !cpu_has_slow_avx(caps))
++		if (!ret && caps.avx2 && !cpu_has_slow_avx(caps))
+ 			ret = create_matrix_operation_avx(m);
+ 		if (!ret && caps.sse)
+ 			ret = create_matrix_operation_sse(m);

b013c7b006e6bee05b7964162f3a00402168e77f.patch

@@ -0,0 +1,28 @@
+From b013c7b006e6bee05b7964162f3a00402168e77f Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Tue, 18 Mar 2025 17:11:00 -0400
+Subject: [PATCH] Fix build with GCC 15
+
+```
+src/testcommon/mmap.cpp: In member function 'void MemoryMappedFile::impl::map_file(const char*, int, int, int)':
+src/testcommon/mmap.cpp:273:62: error: 'PTRDIFF_MAX' was not declared in this scope
+  273 |                 if ((file_size = posix::get_file_size(fd)) > PTRDIFF_MAX)
+      |                                                              ^~~~~~~~~~~
+src/testcommon/mmap.cpp:22:1: note: 'PTRDIFF_MAX' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
+```
+---
+ src/testcommon/mmap.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/testcommon/mmap.cpp b/src/testcommon/mmap.cpp
+index b6ba7092..0310fa93 100644
+--- a/src/testcommon/mmap.cpp
++++ b/src/testcommon/mmap.cpp
+@@ -10,6 +10,7 @@
+   #include <Windows.h>
+ #else
+   #include <cerrno>
++  #include <cstdint>
+ 
+   #include <fcntl.h>
+   #include <unistd.h>

changelog

@@ -1,12 +1,45 @@
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jul 10 2025 Simone Caronni <negativo17@gmail.com> - 3.0.5-5
+- Clean up SPEC file.
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Oct 09 2023 Simone Caronni <negativo17@gmail.com> - 3.0.5-1
 - Update to 3.0.5.
 
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Nov 29 2022 Simone Caronni <negativo17@gmail.com> - 3.0.4-1
 - Update to 3.0.4.
 
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Feb 23 2022 Nicolas Chauvet <kwizart@gmail.com> - 3.0.3-1
 - Update to 3.0.3
 
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Thu Jan  7 2021 Simone Caronni <negativo17@gmail.com> - 3.0.1-2
 - Fix build on armv7hl.
 

zimg.spec

@@ -7,6 +7,10 @@ URL:            https://github.com/sekrit-twc/zimg
 
 Source0:        %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz
 
+# Rebased from master on top of 3.0.6, should be removed in the next update
+Patch0:         b013c7b006e6bee05b7964162f3a00402168e77f.patch
+Patch1:         0e56801f98db3e363c974fca794fa06022d40ee4.patch
+
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc-c++
@@ -49,17 +53,19 @@ find %{buildroot} -name '*.la' -delete
 # Pick up docs in the files section
 rm -fr %{buildroot}%{_docdir}/%{name}
 
-%ldconfig_scriptlets
-
 %files
 %license COPYING
 %doc README.md ChangeLog
 %{_libdir}/lib%{name}.so.2.0.0
 %{_libdir}/lib%{name}.so.2
 
+%check
+./testapp cpuinfo
+
 %files devel
 %{_bindir}/testapp
-%{_includedir}/*
+%{_includedir}/zimg.h
+%{_includedir}/zimg++.hpp
 %{_libdir}/lib%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc