From 698acbdb2a62dfd6e8fbc983232bb99ca0bdffc9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:16:01 +0000 Subject: [PATCH 01/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zimg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index 68d3377..69cae6c 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -68,6 +68,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Nov 29 2022 Simone Caronni - 3.0.4-1 - Update to 3.0.4. From 1adef9edd98776514f91f1053ada4299547f8130 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:42:24 +0000 Subject: [PATCH 02/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zimg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index 69cae6c..49a0c6d 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -68,6 +68,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 3.0.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4777c3ad68850e9b4f318d2a75867bce7d5f9967 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Mon, 9 Oct 2023 11:21:02 +0200 Subject: [PATCH 03/16] Update to 3.0.5 --- sources | 2 +- zimg.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 207dd14..b9b6386 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zimg-3.0.4.tar.gz) = 94beddb109f0b301f0fecf09ea2761d3707aaa1f0cc1caf682bb3d1d7dcd89164de8388e922758e274914df9c7c7c1a0a0c5192e78f88655ed4c6da0ee51995c +SHA512 (zimg-3.0.5.tar.gz) = 85467ec9fcf81ea1ae3489b539ce751772a1dab6c6159928b3c5aa9f1cb029f0570b4624a254d4620886f3376fbf80f9bb829a88c3fe543f99f38947951dc500 diff --git a/zimg.spec b/zimg.spec index 49a0c6d..3e1e985 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg -Version: 3.0.4 -Release: 3%{?dist} +Version: 3.0.5 +Release: 1%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -68,6 +68,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Oct 09 2023 Simone Caronni - 3.0.5-1 +- Update to 3.0.5. + * Sat Jul 22 2023 Fedora Release Engineering - 3.0.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From ea04ba0a15f2baea91eeef44ce84d9720f895a7d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:07:16 +0000 Subject: [PATCH 04/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zimg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index 3e1e985..06d31e8 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -68,6 +68,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Oct 09 2023 Simone Caronni - 3.0.5-1 - Update to 3.0.5. From 44e4acee05d7ac95b52abc597d05fe4e173d8049 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:52:30 +0000 Subject: [PATCH 05/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zimg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index 06d31e8..11fd64d 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -68,6 +68,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 3.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 3.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7f4b06d7deeb8d8450ce4bb5da7b53734b8b1df7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:46:37 +0000 Subject: [PATCH 06/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zimg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index 11fd64d..0f030e6 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -68,6 +68,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 3.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 68c1e22c0911a537c2af9d5cb67328218a230ef7 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 18 Mar 2025 17:13:23 -0400 Subject: [PATCH 07/16] Fix build with GCC 15 https://github.com/sekrit-twc/zimg/pull/218 --- 218.patch | 28 ++++++++++++++++++++++++++++ zimg.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 218.patch diff --git a/218.patch b/218.patch new file mode 100644 index 0000000..28ca5fc --- /dev/null +++ b/218.patch @@ -0,0 +1,28 @@ +From b4de5f36a6b1e31b891492c466888371afb6ee9b Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +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 ''; this is probably fixable by adding '#include ' +``` +--- + 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 + #else + #include ++ #include + + #include + #include diff --git a/zimg.spec b/zimg.spec index 0f030e6..aa68d83 100644 --- a/zimg.spec +++ b/zimg.spec @@ -7,6 +7,9 @@ URL: https://github.com/sekrit-twc/zimg Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz +# Fix build with GCC 15 +Patch0: https://github.com/sekrit-twc/zimg/pull/218.patch + BuildRequires: make BuildRequires: autoconf BuildRequires: automake From 8555ddb911c2deb7e6c18efaa3a0096ad829a5e1 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Thu, 10 Jul 2025 17:45:34 +0200 Subject: [PATCH 08/16] Clean up SPEC file --- zimg.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/zimg.spec b/zimg.spec index aa68d83..d6ce7a1 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -10,11 +10,11 @@ Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz # Fix build with GCC 15 Patch0: https://github.com/sekrit-twc/zimg/pull/218.patch -BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool +BuildRequires: make %description The "z" library implements the commonly required image processing basics of @@ -37,10 +37,6 @@ developing applications that use %{name}. %autosetup -p1 -n zimg-release-%{version} %build -%ifarch armv7hl -CXXFLAGS=$(echo %{optflags} | sed -e 's/ -mfpu=vfpv3-d16//g') -%endif - autoreconf -vif %configure \ --disable-static \ @@ -71,6 +67,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Jul 10 2025 Simone Caronni - 3.0.5-5 +- Clean up SPEC file. + * Sun Jan 19 2025 Fedora Release Engineering - 3.0.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b43a4f9eddaff18174d3e4f619cfdbb9dc0685a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:18:29 +0000 Subject: [PATCH 09/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zimg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zimg.spec b/zimg.spec index d6ce7a1..b9db1b1 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -67,6 +67,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jul 10 2025 Simone Caronni - 3.0.5-5 - Clean up SPEC file. From b2e697f51b3d04cfee323b65fc2e8c9ccf18e82d Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 19 Aug 2025 12:58:37 +0200 Subject: [PATCH 10/16] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++ zimg.spec | 77 ++----------------------------------------------------- 2 files changed, 76 insertions(+), 75 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..0783e25 --- /dev/null +++ b/changelog @@ -0,0 +1,74 @@ +* Fri Jul 25 2025 Fedora Release Engineering - 3.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jul 10 2025 Simone Caronni - 3.0.5-5 +- Clean up SPEC file. + +* Sun Jan 19 2025 Fedora Release Engineering - 3.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 3.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 09 2023 Simone Caronni - 3.0.5-1 +- Update to 3.0.5. + +* Sat Jul 22 2023 Fedora Release Engineering - 3.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 3.0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 29 2022 Simone Caronni - 3.0.4-1 +- Update to 3.0.4. + +* Sat Jul 23 2022 Fedora Release Engineering - 3.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Feb 23 2022 Nicolas Chauvet - 3.0.3-1 +- Update to 3.0.3 + +* Sat Jan 22 2022 Fedora Release Engineering - 3.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 3.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 3.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 7 2021 Simone Caronni - 3.0.1-2 +- Fix build on armv7hl. + +* Sat Jan 2 2021 Simone Caronni - 3.0.1-1 +- Update to 3.0.1. + +* Wed Jul 29 2020 Fedora Release Engineering - 2.9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 20 2020 Simone Caronni - 2.9.3-2 +- Fix FTBFS in Rawhide. + +* Wed Mar 04 2020 Simone Caronni - 2.9.3-1 +- Update to 2.9.3. + +* Fri Jan 31 2020 Fedora Release Engineering - 2.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Sep 23 2019 Leigh Scott - 2.9.2-1 +- Update to 2.9.2 release + +* Sat Jul 27 2019 Fedora Release Engineering - 2.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Jun 08 2019 Simone Caronni - 2.8-3 +- Review fixes. + +* Sat May 25 2019 Simone Caronni - 2.8-2 +- rpmlint fixes. + +* Thu Mar 28 2019 Simone Caronni - 2.8-1 +- First build. diff --git a/zimg.spec b/zimg.spec index b9db1b1..b63b2c3 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,6 +1,6 @@ Name: zimg Version: 3.0.5 -Release: 6%{?dist} +Release: %autorelease Summary: Scaling, color space conversion, and dithering library License: WTFPL URL: https://github.com/sekrit-twc/zimg @@ -67,77 +67,4 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_libdir}/pkgconfig/%{name}.pc %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 3.0.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jul 10 2025 Simone Caronni - 3.0.5-5 -- Clean up SPEC file. - -* Sun Jan 19 2025 Fedora Release Engineering - 3.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 3.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Oct 09 2023 Simone Caronni - 3.0.5-1 -- Update to 3.0.5. - -* Sat Jul 22 2023 Fedora Release Engineering - 3.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 3.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Nov 29 2022 Simone Caronni - 3.0.4-1 -- Update to 3.0.4. - -* Sat Jul 23 2022 Fedora Release Engineering - 3.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Feb 23 2022 Nicolas Chauvet - 3.0.3-1 -- Update to 3.0.3 - -* Sat Jan 22 2022 Fedora Release Engineering - 3.0.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.0.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 3.0.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 7 2021 Simone Caronni - 3.0.1-2 -- Fix build on armv7hl. - -* Sat Jan 2 2021 Simone Caronni - 3.0.1-1 -- Update to 3.0.1. - -* Wed Jul 29 2020 Fedora Release Engineering - 2.9.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Apr 20 2020 Simone Caronni - 2.9.3-2 -- Fix FTBFS in Rawhide. - -* Wed Mar 04 2020 Simone Caronni - 2.9.3-1 -- Update to 2.9.3. - -* Fri Jan 31 2020 Fedora Release Engineering - 2.9.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Sep 23 2019 Leigh Scott - 2.9.2-1 -- Update to 2.9.2 release - -* Sat Jul 27 2019 Fedora Release Engineering - 2.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Jun 08 2019 Simone Caronni - 2.8-3 -- Review fixes. - -* Sat May 25 2019 Simone Caronni - 2.8-2 -- rpmlint fixes. - -* Thu Mar 28 2019 Simone Caronni - 2.8-1 -- First build. +%autochangelog From c86e9de596aed47158a94e772fe2ca8e74573d5c Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 19 Aug 2025 13:00:06 +0200 Subject: [PATCH 11/16] Update to 3.0.6 --- 218.patch | 28 ---------------------------- sources | 2 +- zimg.spec | 5 +---- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 218.patch diff --git a/218.patch b/218.patch deleted file mode 100644 index 28ca5fc..0000000 --- a/218.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b4de5f36a6b1e31b891492c466888371afb6ee9b Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -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 ''; this is probably fixable by adding '#include ' -``` ---- - 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 - #else - #include -+ #include - - #include - #include diff --git a/sources b/sources index b9b6386..2f3b2d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zimg-3.0.5.tar.gz) = 85467ec9fcf81ea1ae3489b539ce751772a1dab6c6159928b3c5aa9f1cb029f0570b4624a254d4620886f3376fbf80f9bb829a88c3fe543f99f38947951dc500 +SHA512 (zimg-3.0.6.tar.gz) = 98d7d65085530e0e1d3e25218608867f1e8d978fc759777efe2e6034baa31db10f1dda46ef8e00ec6f3c23b91aea839da076bfa4fcb75d98111a08513f45506d diff --git a/zimg.spec b/zimg.spec index b63b2c3..0b7b098 100644 --- a/zimg.spec +++ b/zimg.spec @@ -1,5 +1,5 @@ Name: zimg -Version: 3.0.5 +Version: 3.0.6 Release: %autorelease Summary: Scaling, color space conversion, and dithering library License: WTFPL @@ -7,9 +7,6 @@ URL: https://github.com/sekrit-twc/zimg Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz -# Fix build with GCC 15 -Patch0: https://github.com/sekrit-twc/zimg/pull/218.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ From 2db253f2490db22a09b29b7b89e4f67d8dbdb4aa Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 19 Aug 2025 13:27:09 +0200 Subject: [PATCH 12/16] Re-add patch that was not actually included in the release --- 218.patch | 28 ++++++++++++++++++++++++++++ zimg.spec | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 218.patch diff --git a/218.patch b/218.patch new file mode 100644 index 0000000..28ca5fc --- /dev/null +++ b/218.patch @@ -0,0 +1,28 @@ +From b4de5f36a6b1e31b891492c466888371afb6ee9b Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +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 ''; this is probably fixable by adding '#include ' +``` +--- + 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 + #else + #include ++ #include + + #include + #include diff --git a/zimg.spec b/zimg.spec index 0b7b098..27bcb3f 100644 --- a/zimg.spec +++ b/zimg.spec @@ -7,6 +7,9 @@ URL: https://github.com/sekrit-twc/zimg Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz +# Fix build with GCC 15 +Patch0: https://github.com/sekrit-twc/zimg/pull/218.patch + BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ From 44b982729d991372955a68b7a1e3b4e255f4e835 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:08:24 +0000 Subject: [PATCH 13/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 5b827253a62af354899bdba4e1bd093aad569ba8 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 10 Jun 2026 15:34:29 +0200 Subject: [PATCH 14/16] Fix AVX2 detection (#2485557) --- ...801f98db3e363c974fca794fa06022d40ee4.patch | 23 +++++++++++++++++++ ...c7b006e6bee05b7964162f3a00402168e77f.patch | 2 +- zimg.spec | 7 ++---- 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 0e56801f98db3e363c974fca794fa06022d40ee4.patch rename 218.patch => b013c7b006e6bee05b7964162f3a00402168e77f.patch (93%) diff --git a/0e56801f98db3e363c974fca794fa06022d40ee4.patch b/0e56801f98db3e363c974fca794fa06022d40ee4.patch new file mode 100644 index 0000000..674f3ba --- /dev/null +++ b/0e56801f98db3e363c974fca794fa06022d40ee4.patch @@ -0,0 +1,23 @@ +From 0e56801f98db3e363c974fca794fa06022d40ee4 Mon Sep 17 00:00:00 2001 +From: sekrit-twc +Date: Sat, 26 Jul 2025 11:00:28 -0700 +Subject: [PATCH] colorspace: fix AVX2 check + +Fix #226 +--- + src/zimg/colorspace/x86/operation_impl_x86.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zimg/colorspace/x86/operation_impl_x86.cpp b/src/zimg/colorspace/x86/operation_impl_x86.cpp +index f4ff8f6c..bb43dee2 100644 +--- a/src/zimg/colorspace/x86/operation_impl_x86.cpp ++++ b/src/zimg/colorspace/x86/operation_impl_x86.cpp +@@ -16,7 +16,7 @@ std::unique_ptr create_matrix_operation_x86(const Matrix3x3 &m, CPUCl + if (cpu_is_autodetect(cpu)) { + if (!ret && cpu == CPUClass::AUTO_64B && caps.avx512f) + ret = create_matrix_operation_avx512(m); +- if (!ret && caps.avx) ++ if (!ret && caps.avx2) + ret = create_matrix_operation_avx2(m); + } else { + if (!ret && cpu >= CPUClass::X86_AVX512) diff --git a/218.patch b/b013c7b006e6bee05b7964162f3a00402168e77f.patch similarity index 93% rename from 218.patch rename to b013c7b006e6bee05b7964162f3a00402168e77f.patch index 28ca5fc..be40ed8 100644 --- a/218.patch +++ b/b013c7b006e6bee05b7964162f3a00402168e77f.patch @@ -1,4 +1,4 @@ -From b4de5f36a6b1e31b891492c466888371afb6ee9b Mon Sep 17 00:00:00 2001 +From b013c7b006e6bee05b7964162f3a00402168e77f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 18 Mar 2025 17:11:00 -0400 Subject: [PATCH] Fix build with GCC 15 diff --git a/zimg.spec b/zimg.spec index 27bcb3f..5a35824 100644 --- a/zimg.spec +++ b/zimg.spec @@ -6,9 +6,8 @@ License: WTFPL URL: https://github.com/sekrit-twc/zimg Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz - -# Fix build with GCC 15 -Patch0: https://github.com/sekrit-twc/zimg/pull/218.patch +Patch0: https://github.com/sekrit-twc/zimg/commit/b013c7b006e6bee05b7964162f3a00402168e77f.patch +Patch1: https://github.com/sekrit-twc/zimg/commit/0e56801f98db3e363c974fca794fa06022d40ee4.patch BuildRequires: autoconf BuildRequires: automake @@ -52,8 +51,6 @@ 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 From e5e3a6d01947e8d2dbe24eea891636904568a35a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:40:46 +0000 Subject: [PATCH 15/16] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From 9e83f41da3a94fbd5c71784a31d2c1a5aa83b587 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 1 Aug 2026 23:27:17 -0300 Subject: [PATCH 16/16] 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 --- ...801f98db3e363c974fca794fa06022d40ee4.patch | 27 ++++++------------- zimg.spec | 12 ++++++--- 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/0e56801f98db3e363c974fca794fa06022d40ee4.patch b/0e56801f98db3e363c974fca794fa06022d40ee4.patch index 674f3ba..3489e12 100644 --- a/0e56801f98db3e363c974fca794fa06022d40ee4.patch +++ b/0e56801f98db3e363c974fca794fa06022d40ee4.patch @@ -1,23 +1,12 @@ -From 0e56801f98db3e363c974fca794fa06022d40ee4 Mon Sep 17 00:00:00 2001 -From: sekrit-twc -Date: Sat, 26 Jul 2025 11:00:28 -0700 -Subject: [PATCH] colorspace: fix AVX2 check - -Fix #226 ---- - src/zimg/colorspace/x86/operation_impl_x86.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/zimg/colorspace/x86/operation_impl_x86.cpp b/src/zimg/colorspace/x86/operation_impl_x86.cpp -index f4ff8f6c..bb43dee2 100644 +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 -@@ -16,7 +16,7 @@ std::unique_ptr create_matrix_operation_x86(const Matrix3x3 &m, CPUCl - if (cpu_is_autodetect(cpu)) { +@@ -19,7 +19,7 @@ std::unique_ptr create_matrix if (!ret && cpu == CPUClass::AUTO_64B && caps.avx512f) ret = create_matrix_operation_avx512(m); -- if (!ret && caps.avx) -+ if (!ret && caps.avx2) - ret = create_matrix_operation_avx2(m); - } else { - if (!ret && cpu >= CPUClass::X86_AVX512) + #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); diff --git a/zimg.spec b/zimg.spec index 5a35824..274317b 100644 --- a/zimg.spec +++ b/zimg.spec @@ -6,8 +6,10 @@ License: WTFPL URL: https://github.com/sekrit-twc/zimg Source0: %{url}/archive/release-%{version}/%{name}-%{version}.tar.gz -Patch0: https://github.com/sekrit-twc/zimg/commit/b013c7b006e6bee05b7964162f3a00402168e77f.patch -Patch1: https://github.com/sekrit-twc/zimg/commit/0e56801f98db3e363c974fca794fa06022d40ee4.patch + +# 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 @@ -57,9 +59,13 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{_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