From 61af5712478d3a02e725f04fe500b147420fc625 Mon Sep 17 00:00:00 2001 From: U2FsdGVkX1 Date: Mon, 26 Feb 2024 15:40:45 +0800 Subject: [PATCH 01/22] Add riscv64 support --- ogre-riscv64.patch | 14 ++++++++++++++ ogre.spec | 11 ++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 ogre-riscv64.patch diff --git a/ogre-riscv64.patch b/ogre-riscv64.patch new file mode 100644 index 0000000..d3e6b3c --- /dev/null +++ b/ogre-riscv64.patch @@ -0,0 +1,14 @@ +diff --git a/OgreMain/include/OgrePlatform.h b/OgreMain/include/OgrePlatform.h +index 4a7b4b7..1434c8b 100644 +--- a/OgreMain/include/OgrePlatform.h ++++ b/OgreMain/include/OgrePlatform.h +@@ -166,7 +166,8 @@ namespace Ogre { + #endif + + /* Find the arch type */ +-#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__) || defined(__arm64__) || defined(__aarch64__) || defined(__mips64) || defined(__mips64_) ++#if defined(__x86_64__) || defined(_M_X64) || defined(__powerpc64__) || defined(__alpha__) || defined(__ia64__) || defined(__s390__) || defined(__s390x__) || defined(__arm64__) || defined(__aarch64__) || defined(__mips64) || defined(__mips64_) \ ++ || (defined(__riscv) && __riscv_xlen == 64) + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 + #else + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32 diff --git a/ogre.spec b/ogre.spec index c9b173a..da1098f 100644 --- a/ogre.spec +++ b/ogre.spec @@ -29,14 +29,15 @@ Patch7: ogre-1.9.0-dynlib-allow-no-so.patch Patch8: ogre-1.9.0-cmake-freetype.patch Patch9: ogre-1.9.0-cmake_build-fix.patch Patch10: ogre-aarch64.patch +Patch11: ogre-riscv64.patch # Resolve link errors due to incorrect template creation # https://bitbucket.org/sinbad/ogre/commits/a24ac4afbbb9dc5ff49a61634af50da11ba8fb97/ # https://bugzilla.redhat.com/show_bug.cgi?id=1223612 -Patch11: ogre-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff +Patch12: ogre-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff # Remove unnecessary inclusion of # https://bugzilla.redhat.com/show_bug.cgi?id=1841324 -Patch12: ogre-1.9.0-sysctl.patch -Patch13: %{name}-gcc11.patch +Patch13: ogre-1.9.0-sysctl.patch +Patch14: %{name}-gcc11.patch BuildRequires: gcc-c++ BuildRequires: zziplib-devel freetype-devel BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel @@ -171,6 +172,7 @@ mkdir build %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # remove execute bits from src-files for -debuginfo package chmod -x `find RenderSystems/GL -type f` \ @@ -274,6 +276,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Mon Feb 26 2024 Songsong Zhang - 1:1.9.0-48 +- Add riscv64 support + * Thu Jan 25 2024 Fedora Release Engineering - 1:1.9.0-48 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f1fe02c84be0f76591745c60bf5a76ded1a7ddec Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 24 Apr 2024 09:14:38 -0400 Subject: [PATCH 02/22] Rebuilt for openexr 3.2.4 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index da1098f..92a535e 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 48%{?dist} +Release: 49%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -276,6 +276,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Wed Apr 24 2024 Benjamin A. Beasley - 1:1.9.0-49 +- Rebuilt for openexr 3.2.4 + * Mon Feb 26 2024 Songsong Zhang - 1:1.9.0-48 - Add riscv64 support From 09e9928cfdc56c198b9009b246e14edbc0870b4c Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:48 +0200 Subject: [PATCH 03/22] Eliminate use of obsolete %patchN syntax (#2283636) --- ogre.spec | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ogre.spec b/ogre.spec index 92a535e..f2a20af 100644 --- a/ogre.spec +++ b/ogre.spec @@ -154,25 +154,25 @@ using SampleBrowser. %prep %setup -q mkdir build -%patch0 -p1 -b .rpath -%patch1 -p1 -b .glew -%patch3 -p1 -b .ppc -%patch5 -p1 -b .build-rcapsdump -%patch6 -p0 -b .thread -%patch7 -p1 -b .dynlib-allow-no-so +%patch -P0 -p1 -b .rpath +%patch -P1 -p1 -b .glew +%patch -P3 -p1 -b .ppc +%patch -P5 -p1 -b .build-rcapsdump +%patch -P6 -p0 -b .thread +%patch -P7 -p1 -b .dynlib-allow-no-so %if (0%{?fedora} > 20) && (0%{?fedora} < 24) # freetype header chaos: # Fedora <= 20 headers in /usr/include/freetype2/freetype # Fedora 21,22,23 headers in /usr/include/freetype2 # Fedora >= 24 headers in /usr/include/freetype2/freetype -%patch8 -p1 -b .cmake-freetype +%patch -P8 -p1 -b .cmake-freetype %endif -%patch9 -p1 -b .cmake_build-fix -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 +%patch -P9 -p1 -b .cmake_build-fix +%patch -P10 -p1 +%patch -P11 -p1 +%patch -P12 -p1 +%patch -P13 -p1 +%patch -P14 -p1 # remove execute bits from src-files for -debuginfo package chmod -x `find RenderSystems/GL -type f` \ From 724999842336ce17f9898690f1f0b1323c135d6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 20:38:34 +0000 Subject: [PATCH 04/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index f2a20af..eb2b240 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 49%{?dist} +Release: 50%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -276,6 +276,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1:1.9.0-50 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Apr 24 2024 Benjamin A. Beasley - 1:1.9.0-49 - Rebuilt for openexr 3.2.4 From 07bd805e865acfd7a165b6f3a0b533f78fd6c018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 15:18:52 +0100 Subject: [PATCH 05/22] license: remove exception from MIT The exception in MIT is standard part of MIT license. --- ogre.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogre.spec b/ogre.spec index eb2b240..c6f304f 100644 --- a/ogre.spec +++ b/ogre.spec @@ -5,12 +5,12 @@ Version: 1.9.0 Release: 50%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine -# MIT with exceptions - main library +# MIT - main library # CC-BY-SA - devel docs # Freely redistributable without restriction - most of samples content # MIT - shaders for DeferredShadingMedia samples # Public Domain - Some of the build files, samples and plugins -License: MIT with exceptions and CC-BY-SA and Freely redistributable without restriction +License: MIT and CC-BY-SA and Freely redistributable without restriction URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From be424a09fe7ce1953856f31a20378e4389d3c703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 15:33:47 +0100 Subject: [PATCH 06/22] license: convert Public Domain to SPDX --- ogre.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ogre.spec b/ogre.spec index c6f304f..d7e4391 100644 --- a/ogre.spec +++ b/ogre.spec @@ -9,8 +9,9 @@ Summary: Object-Oriented Graphics Rendering Engine # CC-BY-SA - devel docs # Freely redistributable without restriction - most of samples content # MIT - shaders for DeferredShadingMedia samples -# Public Domain - Some of the build files, samples and plugins -License: MIT and CC-BY-SA and Freely redistributable without restriction +# Public Domain - CMAKE file (ignored as they are not of build result) +# - see https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/691 for list of files +License: MIT AND LicenseRef-Fedora-Public-Domain and CC-BY-SA and Freely redistributable without restriction URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 28d53ba6e4837946eb963a2381e567c769416cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 15:39:41 +0100 Subject: [PATCH 07/22] license: documentation is CC-BY-SA-3.0 --- ogre.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogre.spec b/ogre.spec index d7e4391..5a60da3 100644 --- a/ogre.spec +++ b/ogre.spec @@ -6,12 +6,12 @@ Release: 50%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT - main library -# CC-BY-SA - devel docs +# CC-BY-SA-3.0 - devel docs # Freely redistributable without restriction - most of samples content # MIT - shaders for DeferredShadingMedia samples # Public Domain - CMAKE file (ignored as they are not of build result) # - see https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/691 for list of files -License: MIT AND LicenseRef-Fedora-Public-Domain and CC-BY-SA and Freely redistributable without restriction +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 and Freely redistributable without restriction URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 5165f393e551f2045e6f43fb1dfdb8d0593a0cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 15:49:12 +0100 Subject: [PATCH 08/22] license: samples are licensed under MIT - removing general "redistributable" --- ogre.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ogre.spec b/ogre.spec index 5a60da3..cd424f7 100644 --- a/ogre.spec +++ b/ogre.spec @@ -7,11 +7,10 @@ Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT - main library # CC-BY-SA-3.0 - devel docs -# Freely redistributable without restriction - most of samples content # MIT - shaders for DeferredShadingMedia samples # Public Domain - CMAKE file (ignored as they are not of build result) # - see https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/691 for list of files -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 and Freely redistributable without restriction +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 6a061f791f2fe0912c3e7b04cb346fcfc4c68b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 15:55:16 +0100 Subject: [PATCH 09/22] license: document usage of Zlib license --- ogre.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index cd424f7..00bed66 100644 --- a/ogre.spec +++ b/ogre.spec @@ -10,7 +10,9 @@ Summary: Object-Oriented Graphics Rendering Engine # MIT - shaders for DeferredShadingMedia samples # Public Domain - CMAKE file (ignored as they are not of build result) # - see https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/691 for list of files -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 +# Zlib - Samples/Media/*/DualQuaternion* +# - Tools/XMLConverter/src/tiny* +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From acdb143f1b2ab6a1f984fc5aac924a93dc684d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 22:03:14 +0100 Subject: [PATCH 10/22] license: document usage of BSL-1.0 license --- ogre.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 00bed66..85455f3 100644 --- a/ogre.spec +++ b/ogre.spec @@ -12,7 +12,8 @@ Summary: Object-Oriented Graphics Rendering Engine # - see https://gitlab.com/fedora/legal/fedora-license-data/-/merge_requests/691 for list of files # Zlib - Samples/Media/*/DualQuaternion* # - Tools/XMLConverter/src/tiny* -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib +# BSL-1.0 - Many of the maths/spatial routines (OgreMain/include/OgreAny.h, OgreMain/include/OgrePlane.h ...) +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 72738c49c237b27b4365dcef6bcb25210006c7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 22:54:27 +0100 Subject: [PATCH 11/22] license: document usage of LicenseRef-Callaway-dante-treglia license --- ogre.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 85455f3..43fb974 100644 --- a/ogre.spec +++ b/ogre.spec @@ -13,7 +13,9 @@ Summary: Object-Oriented Graphics Rendering Engine # Zlib - Samples/Media/*/DualQuaternion* # - Tools/XMLConverter/src/tiny* # BSL-1.0 - Many of the maths/spatial routines (OgreMain/include/OgreAny.h, OgreMain/include/OgrePlane.h ...) -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 +# LicenseRef-Callaway-dante-treglia - OgreMain/include/OgreSingleton.h +# - temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/595 +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 19eef06d940cbef2f349906080056b1580b22389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 22:57:40 +0100 Subject: [PATCH 12/22] license: document usage of BSD-3-Clause license --- ogre.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 43fb974..49645b7 100644 --- a/ogre.spec +++ b/ogre.spec @@ -15,7 +15,9 @@ Summary: Object-Oriented Graphics Rendering Engine # BSL-1.0 - Many of the maths/spatial routines (OgreMain/include/OgreAny.h, OgreMain/include/OgrePlane.h ...) # LicenseRef-Callaway-dante-treglia - OgreMain/include/OgreSingleton.h # - temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/595 -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia +# NCSA - OgreMain/include/OgreSmallVector.h +# BSD-3-Clause - OgreMain/include/OgreUTFString.h +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From f177cf2470dcce6e1b97b34fa96f72c512a2d2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 23:10:03 +0100 Subject: [PATCH 13/22] license: document usage of MIT-Khronos-old license --- ogre.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 49645b7..888de9b 100644 --- a/ogre.spec +++ b/ogre.spec @@ -17,7 +17,8 @@ Summary: Object-Oriented Graphics Rendering Engine # - temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/595 # NCSA - OgreMain/include/OgreSmallVector.h # BSD-3-Clause - OgreMain/include/OgreUTFString.h -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause +# MIT-Khronos-old - RenderSystems/GL/include/GL/glew.h, RenderSystems/GL/include/GL/glxew.h, RenderSystems/GL/include/GL/wglew.h +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 77b0ecbb576aa4c6c4d26048b067b68883bcb7a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 23:12:45 +0100 Subject: [PATCH 14/22] license: document usage of GPL-2.0-or-later WITH Bison-exception-1.24 license --- ogre.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 888de9b..1aaf5d6 100644 --- a/ogre.spec +++ b/ogre.spec @@ -18,7 +18,8 @@ Summary: Object-Oriented Graphics Rendering Engine # NCSA - OgreMain/include/OgreSmallVector.h # BSD-3-Clause - OgreMain/include/OgreUTFString.h # MIT-Khronos-old - RenderSystems/GL/include/GL/glew.h, RenderSystems/GL/include/GL/glxew.h, RenderSystems/GL/include/GL/wglew.h -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old +# GPL-2.0-or-later WITH Bison-exception-1.24 - RenderSystems/GL/src/nvparse/*_parser.cpp +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 564d17a2b9761bf464f7316758fb2d9a565936e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 23:21:12 +0100 Subject: [PATCH 15/22] license: document LGPL usage --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 1aaf5d6..803ff7b 100644 --- a/ogre.spec +++ b/ogre.spec @@ -19,7 +19,10 @@ Summary: Object-Oriented Graphics Rendering Engine # BSD-3-Clause - OgreMain/include/OgreUTFString.h # MIT-Khronos-old - RenderSystems/GL/include/GL/glew.h, RenderSystems/GL/include/GL/glxew.h, RenderSystems/GL/include/GL/wglew.h # GPL-2.0-or-later WITH Bison-exception-1.24 - RenderSystems/GL/src/nvparse/*_parser.cpp -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 +# SGI-B-2.0 - RenderSystems/GLES2/include/GLES2/gl2.h +# LGPL-2.1-only - Tools/Common/setup/License.rtf +# LGPL-2.1-or-later - files in Tools/BlenderExport/ +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 4940abd08194c8d883492726bd6b63efbd358c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 23:29:25 +0100 Subject: [PATCH 16/22] license: document LicenseRef-Callaway-scintilla usage --- ogre.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 803ff7b..44cda9d 100644 --- a/ogre.spec +++ b/ogre.spec @@ -22,7 +22,11 @@ Summary: Object-Oriented Graphics Rendering Engine # SGI-B-2.0 - RenderSystems/GLES2/include/GLES2/gl2.h # LGPL-2.1-only - Tools/Common/setup/License.rtf # LGPL-2.1-or-later - files in Tools/BlenderExport/ -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later +# LicenseRef-Callaway-philippe-de-muyter - Tools/LightwaveConverter +# temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/596 +# LicenseRef-Callaway-scintilla - Tools/MaterialEditor/wxscintilla_1.69.2/src/scintilla/License.txt +# temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/597 +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Callaway-philippe-de-muyter AND LicenseRef-Callaway-scintilla URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From c35dceeda7eda6a5eb8ec450fe7033577cb3430d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 5 Nov 2024 23:30:58 +0100 Subject: [PATCH 17/22] license: document LGPL-2.0-or-later WITH WxWindows-exception-3.1 usage --- ogre.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 44cda9d..a1c32d9 100644 --- a/ogre.spec +++ b/ogre.spec @@ -26,7 +26,8 @@ Summary: Object-Oriented Graphics Rendering Engine # temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/596 # LicenseRef-Callaway-scintilla - Tools/MaterialEditor/wxscintilla_1.69.2/src/scintilla/License.txt # temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/597 -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Callaway-philippe-de-muyter AND LicenseRef-Callaway-scintilla +# LGPL-2.0-or-later WITH WxWindows-exception-3.1 - Tools/MaterialEditor/wxscintilla_1.69.2/src/ScintillaWX.h +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Callaway-philippe-de-muyter AND LicenseRef-Callaway-scintilla AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 6cb2b5b6d98a17f79bf79a8a5da8c230bdf6fff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 15 Nov 2024 06:47:37 +0100 Subject: [PATCH 18/22] specify the license of LightwaveConverter See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/596#note_2212250309 --- ogre.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ogre.spec b/ogre.spec index a1c32d9..c5e747b 100644 --- a/ogre.spec +++ b/ogre.spec @@ -22,12 +22,11 @@ Summary: Object-Oriented Graphics Rendering Engine # SGI-B-2.0 - RenderSystems/GLES2/include/GLES2/gl2.h # LGPL-2.1-only - Tools/Common/setup/License.rtf # LGPL-2.1-or-later - files in Tools/BlenderExport/ -# LicenseRef-Callaway-philippe-de-muyter - Tools/LightwaveConverter -# temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/596 +# GPLv2-or-later - Tools/LightwaveConverter # LicenseRef-Callaway-scintilla - Tools/MaterialEditor/wxscintilla_1.69.2/src/scintilla/License.txt # temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/597 # LGPL-2.0-or-later WITH WxWindows-exception-3.1 - Tools/MaterialEditor/wxscintilla_1.69.2/src/ScintillaWX.h -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Callaway-philippe-de-muyter AND LicenseRef-Callaway-scintilla AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND GPLv2-or-later AND LicenseRef-Callaway-scintilla AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 1f3d0ae3b777687769c84b5138b0159569791653 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 21:26:21 +0000 Subject: [PATCH 19/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index c5e747b..60dda4e 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 50%{?dist} +Release: 51%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT - main library @@ -292,6 +292,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1:1.9.0-51 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 1:1.9.0-50 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f8df04a35c0ac3668bae9ebb3477fcea3c066611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 31 Mar 2025 22:34:44 +0200 Subject: [PATCH 20/22] add proper license id for Scintilla license (HPND) See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/597#note_2427023697 --- ogre.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ogre.spec b/ogre.spec index 60dda4e..6d70ec7 100644 --- a/ogre.spec +++ b/ogre.spec @@ -23,10 +23,9 @@ Summary: Object-Oriented Graphics Rendering Engine # LGPL-2.1-only - Tools/Common/setup/License.rtf # LGPL-2.1-or-later - files in Tools/BlenderExport/ # GPLv2-or-later - Tools/LightwaveConverter -# LicenseRef-Callaway-scintilla - Tools/MaterialEditor/wxscintilla_1.69.2/src/scintilla/License.txt -# temporary id, see https://gitlab.com/fedora/legal/fedora-license-data/-/issues/597 +# HPND - Tools/MaterialEditor/wxscintilla_1.69.2/src/scintilla/License.txt # LGPL-2.0-or-later WITH WxWindows-exception-3.1 - Tools/MaterialEditor/wxscintilla_1.69.2/src/ScintillaWX.h -License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND GPLv2-or-later AND LicenseRef-Callaway-scintilla AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 +License: MIT AND LicenseRef-Fedora-Public-Domain AND CC-BY-SA-3.0 AND Zlib AND BSL-1.0 AND LicenseRef-Callaway-dante-treglia AND NCSA AND BSD-3-Clause AND MIT-Khronos-old AND GPL-2.0-or-later WITH Bison-exception-1.24 AND SGI-B-2.0 AND LGPL-2.1-only AND LGPL-2.1-or-later AND GPLv2-or-later AND HPND AND LGPL-2.0-or-later WITH WxWindows-exception-3.1 URL: http://www.ogre3d.org/ # This is modified http://downloads.sourceforge.net/ogre/ogre-v%%(echo %%{version} | tr . -).tar.bz2 # with non-free files striped (see ogre-make-clean.sh): From 2e9fff77735515ae7fa21e3805165a4e7f405f66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:28:37 +0000 Subject: [PATCH 21/22] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 6d70ec7..7b9c01f 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 51%{?dist} +Release: 52%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT - main library @@ -291,6 +291,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1:1.9.0-52 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 1:1.9.0-51 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8c849c026c0d16a6c2fe7c4f9fc61ca266ca385a Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 15 Jan 2026 15:10:48 +0000 Subject: [PATCH 22/22] Patched for GCC 16 --- ogre-gcc16.patch | 11 +++++++++++ ogre.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 ogre-gcc16.patch diff --git a/ogre-gcc16.patch b/ogre-gcc16.patch new file mode 100644 index 0000000..de523bc --- /dev/null +++ b/ogre-gcc16.patch @@ -0,0 +1,11 @@ +--- ogre-1.9.0/OgreMain/include/OgreMemorySTLAllocator.h~ 2013-12-01 17:28:12.000000000 +0000 ++++ ogre-1.9.0/OgreMain/include/OgreMemorySTLAllocator.h 2026-01-15 15:02:26.658307837 +0000 +@@ -123,7 +123,7 @@ + + /// memory allocation (elements, used by STL) + inline pointer allocate( size_type count, +- typename std::allocator::const_pointer ptr = 0 ) ++ const void* ptr = 0 ) + { + (void)ptr; + // convert request to bytes diff --git a/ogre.spec b/ogre.spec index 7b9c01f..bcecf04 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 52%{?dist} +Release: 53%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT - main library @@ -53,6 +53,7 @@ Patch12: ogre-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff # https://bugzilla.redhat.com/show_bug.cgi?id=1841324 Patch13: ogre-1.9.0-sysctl.patch Patch14: %{name}-gcc11.patch +Patch15: %{name}-gcc16.patch BuildRequires: gcc-c++ BuildRequires: zziplib-devel freetype-devel BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel @@ -188,6 +189,7 @@ mkdir build %patch -P12 -p1 %patch -P13 -p1 %patch -P14 -p1 +%patch -P15 -p1 # remove execute bits from src-files for -debuginfo package chmod -x `find RenderSystems/GL -type f` \ @@ -291,6 +293,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jan 15 2026 Jonathan Wakely - 1.9.0-53 +- Patched for GCC 16 + * Thu Jul 24 2025 Fedora Release Engineering - 1:1.9.0-52 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild