From ce618119244479194a783031da5ef763571a2d65 Mon Sep 17 00:00:00 2001 From: Martin Gansser Date: Wed, 8 May 2024 12:58:30 +0200 Subject: [PATCH 1/8] Minor fix to FFmpeg 7.0 compatibility patch --- 0001-Add-compatibility-with-FFMPEG-7.0.patch | 6 +++--- wxsvg.spec | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/0001-Add-compatibility-with-FFMPEG-7.0.patch b/0001-Add-compatibility-with-FFMPEG-7.0.patch index d8137e0..863d8ea 100644 --- a/0001-Add-compatibility-with-FFMPEG-7.0.patch +++ b/0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -1,4 +1,4 @@ -From 9cec36824616ba5cf85a79ec810743f5bee3e8b7 Mon Sep 17 00:00:00 2001 +From 7e7f7cd017591da772399125669c402dce9bbea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 7 May 2024 06:40:10 +0200 Subject: [PATCH] Add compatibility with FFMPEG 7.0 @@ -11,7 +11,7 @@ avcodec_close has been deprecated in favor of avcodec_free_context 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/mediadec_ffmpeg.cpp b/src/mediadec_ffmpeg.cpp -index 8e6344b..6712219 100644 +index 8e6344b..439d9c2 100644 --- a/src/mediadec_ffmpeg.cpp +++ b/src/mediadec_ffmpeg.cpp @@ -37,6 +37,9 @@ extern "C" { @@ -28,7 +28,7 @@ index 8e6344b..6712219 100644 } int wxFfmpegMediaDecoder::GetChannelNumber(unsigned int streamIndex) { -+#ifdef HAVE_CH_LAYOUT ++#if HAVE_CH_LAYOUT + return m_formatCtx ? m_formatCtx->streams[streamIndex]->codecpar->ch_layout.nb_channels : -1; +#else return m_formatCtx ? m_formatCtx->streams[streamIndex]->codecpar->channels : -1; diff --git a/wxsvg.spec b/wxsvg.spec index 9e0c9cc..78cf994 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -69,6 +69,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Wed May 08 2024 Robert-André Mauchin - 1.5.24-7 +- Minor fix to FFmpeg 7.0 compatibility patch + * Mon May 06 2024 Robert-André Mauchin - 1.5.24-6 - Add patch for FFMPEG 7 compatibility From 280e70d5f159460ed7da7d16d1e5dfbb09492603 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:37:52 +0000 Subject: [PATCH 2/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wxsvg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxsvg.spec b/wxsvg.spec index d300937..e382878 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -1,6 +1,6 @@ Name: wxsvg Version: 1.5.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library to create, manipulate and render SVG files License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://sourceforge.net/projects/wxsvg @@ -61,6 +61,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.5.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 21 2024 Martin Gansser - 1.5.25-1 - Update to 1.5.25 From 5988d2d8682ebbc9217bbb0628f6f18b5234b3e3 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 22 Sep 2024 22:34:26 +0200 Subject: [PATCH 3/8] - rebuilt for FFmpeg 7 --- wxsvg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxsvg.spec b/wxsvg.spec index e382878..61e76f1 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -1,6 +1,6 @@ Name: wxsvg Version: 1.5.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: C++ library to create, manipulate and render SVG files License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://sourceforge.net/projects/wxsvg @@ -61,6 +61,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Sun Sep 22 2024 Dominik Mierzejewski - 1.5.25-3 +- rebuilt for FFmpeg 7 + * Sat Jul 20 2024 Fedora Release Engineering - 1.5.25-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7c118d285c61a9a5fac1cbfcb2897abef4e16e36 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:20:22 +0000 Subject: [PATCH 4/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wxsvg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxsvg.spec b/wxsvg.spec index 61e76f1..ae8a970 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -1,6 +1,6 @@ Name: wxsvg Version: 1.5.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C++ library to create, manipulate and render SVG files License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://sourceforge.net/projects/wxsvg @@ -61,6 +61,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.5.25-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Sep 22 2024 Dominik Mierzejewski - 1.5.25-3 - rebuilt for FFmpeg 7 From 8daf795b926d242e5ef41acb118549ee35ea32d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:35:10 +0000 Subject: [PATCH 5/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wxsvg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxsvg.spec b/wxsvg.spec index ae8a970..4da4434 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -1,6 +1,6 @@ Name: wxsvg Version: 1.5.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: C++ library to create, manipulate and render SVG files License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://sourceforge.net/projects/wxsvg @@ -61,6 +61,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.5.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1.5.25-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 989c1a763e21618aaa93483a3be05ef04cbbc435 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Tue, 30 Sep 2025 18:10:01 +0200 Subject: [PATCH 6/8] Rebuilt for FFmpeg 8 --- wxsvg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxsvg.spec b/wxsvg.spec index 4da4434..2ab95c1 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -1,6 +1,6 @@ Name: wxsvg Version: 1.5.25 -Release: 5%{?dist} +Release: 6%{?dist} Summary: C++ library to create, manipulate and render SVG files License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://sourceforge.net/projects/wxsvg @@ -61,6 +61,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Tue Sep 30 2025 Dominik Mierzejewski - 1.5.25-6 +- Rebuilt for FFmpeg 8 + * Fri Jul 25 2025 Fedora Release Engineering - 1.5.25-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e24678aa9b942bfaeea6e626c11fa229588e44e7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:24:44 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wxsvg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxsvg.spec b/wxsvg.spec index 2ab95c1..508cc60 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -1,6 +1,6 @@ Name: wxsvg Version: 1.5.25 -Release: 6%{?dist} +Release: 7%{?dist} Summary: C++ library to create, manipulate and render SVG files License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://sourceforge.net/projects/wxsvg @@ -61,6 +61,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.5.25-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Tue Sep 30 2025 Dominik Mierzejewski - 1.5.25-6 - Rebuilt for FFmpeg 8 From 4d281a717cb4e9422fde2f46f2a99b806db6b052 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:58:17 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wxsvg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wxsvg.spec b/wxsvg.spec index 508cc60..04ee08e 100644 --- a/wxsvg.spec +++ b/wxsvg.spec @@ -1,6 +1,6 @@ Name: wxsvg Version: 1.5.25 -Release: 7%{?dist} +Release: 8%{?dist} Summary: C++ library to create, manipulate and render SVG files License: LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: https://sourceforge.net/projects/wxsvg @@ -61,6 +61,9 @@ autoreconf -fiv %{_libdir}/pkgconfig/libwxsvg.pc %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.5.25-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.5.25-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild