Compare commits

...
Sign in to create a new pull request.

22 commits

Author SHA1 Message Date
Jonathan Wakely
8c849c026c Patched for GCC 16 2026-01-15 15:17:07 +00:00
Fedora Release Engineering
2e9fff7773 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 23:28:37 +00:00
Miroslav Suchý
f8df04a35c add proper license id for Scintilla license (HPND)
See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/597#note_2427023697
2025-03-31 22:34:44 +02:00
Fedora Release Engineering
1f3d0ae3b7 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 21:26:21 +00:00
Miroslav Suchý
6cb2b5b6d9 specify the license of LightwaveConverter
See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/596#note_2212250309
2024-11-15 06:47:37 +01:00
Miroslav Suchý
c35dceeda7 license: document LGPL-2.0-or-later WITH WxWindows-exception-3.1 usage 2024-11-05 23:30:58 +01:00
Miroslav Suchý
4940abd081 license: document LicenseRef-Callaway-scintilla usage 2024-11-05 23:29:25 +01:00
Miroslav Suchý
564d17a2b9 license: document LGPL usage 2024-11-05 23:21:12 +01:00
Miroslav Suchý
77b0ecbb57 license: document usage of GPL-2.0-or-later WITH Bison-exception-1.24 license 2024-11-05 23:12:45 +01:00
Miroslav Suchý
f177cf2470 license: document usage of MIT-Khronos-old license 2024-11-05 23:10:03 +01:00
Miroslav Suchý
19eef06d94 license: document usage of BSD-3-Clause license 2024-11-05 22:57:40 +01:00
Miroslav Suchý
72738c49c2 license: document usage of LicenseRef-Callaway-dante-treglia license 2024-11-05 22:54:27 +01:00
Miroslav Suchý
acdb143f1b license: document usage of BSL-1.0 license 2024-11-05 22:03:14 +01:00
Miroslav Suchý
6a061f791f license: document usage of Zlib license 2024-11-05 15:55:16 +01:00
Miroslav Suchý
5165f393e5 license: samples are licensed under MIT - removing general "redistributable" 2024-11-05 15:49:12 +01:00
Miroslav Suchý
28d53ba6e4 license: documentation is CC-BY-SA-3.0 2024-11-05 15:39:41 +01:00
Miroslav Suchý
be424a09fe license: convert Public Domain to SPDX 2024-11-05 15:33:47 +01:00
Miroslav Suchý
07bd805e86 license: remove exception from MIT
The exception in MIT is standard part of MIT license.
2024-11-05 15:18:52 +01:00
Fedora Release Engineering
7249998423 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 20:38:34 +00:00
Software Management Team
09e9928cfd Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:48 +02:00
Benjamin A. Beasley
f1fe02c84b Rebuilt for openexr 3.2.4 2024-04-24 09:14:38 -04:00
U2FsdGVkX1
61af571247 Add riscv64 support 2024-02-26 15:40:45 +08:00
3 changed files with 83 additions and 21 deletions

11
ogre-gcc16.patch Normal file
View file

@ -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<void>::const_pointer ptr = 0 )
+ const void* ptr = 0 )
{
(void)ptr;
// convert request to bytes

14
ogre-riscv64.patch Normal file
View file

@ -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

View file

@ -2,15 +2,30 @@
Name: ogre
Version: 1.9.0
Release: 48%{?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):
@ -29,14 +44,16 @@ 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 <sys/sysctl.h>
# 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
Patch15: %{name}-gcc16.patch
BuildRequires: gcc-c++
BuildRequires: zziplib-devel freetype-devel
BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel
@ -153,24 +170,26 @@ 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
%patch -P9 -p1 -b .cmake_build-fix
%patch -P10 -p1
%patch -P11 -p1
%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` \
@ -274,6 +293,24 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules
%changelog
* Thu Jan 15 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 1.9.0-53
- Patched for GCC 16
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.0-52
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.0-51
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.0-50
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Apr 24 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 1:1.9.0-49
- Rebuilt for openexr 3.2.4
* Mon Feb 26 2024 Songsong Zhang <U2FsdGVkX1@gmail.com> - 1:1.9.0-48
- Add riscv64 support
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.9.0-48
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild