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 eb2b240..bcecf04 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,15 +2,30 @@ Name: ogre Version: 1.9.0 -Release: 50%{?dist} +Release: 53%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine -# MIT with exceptions - main library -# CC-BY-SA - devel docs -# Freely redistributable without restriction - most of samples content +# MIT - main library +# CC-BY-SA-3.0 - devel docs # 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 +# 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 +# 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 ...) +# LicenseRef-Callaway-dante-treglia - OgreMain/include/OgreSingleton.h +# - 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 +# 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 +# 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/ +# GPLv2-or-later - Tools/LightwaveConverter +# 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 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): @@ -38,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 @@ -173,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` \ @@ -276,6 +293,15 @@ 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 + +* 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