From 88f2b93f84a1530066deb4f73e8ed0d5933c8a3d Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:49 +0200 Subject: [PATCH 01/55] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- ogre.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ogre.spec b/ogre.spec index ca728fc..7e16894 100644 --- a/ogre.spec +++ b/ogre.spec @@ -30,6 +30,7 @@ Patch10: ogre-aarch64.patch # https://bitbucket.org/sinbad/ogre/commits/a24ac4afbbb9dc5ff49a61634af50da11ba8fb97/ # https://bugzilla.redhat.com/show_bug.cgi?id=1223612 Patch11: ogre-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff +BuildRequires: gcc-c++ BuildRequires: zziplib-devel freetype-devel BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel BuildRequires: ois-devel freeimage-devel openexr-devel From 0770dc806e2f8a37c0453f3b4617b208b9302bc7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 14:57:16 +0000 Subject: [PATCH 02/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 7e16894..d2e61ad 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -275,6 +275,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.9.0-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 1.9.0-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b970ba156338ab59d5b21b83344cd363fcaf5ae6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 24 Jan 2019 23:14:18 +0000 Subject: [PATCH 03/55] Rebuilt for Boost 1.69 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index d2e61ad..df41914 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -275,6 +275,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jan 24 2019 Jonathan Wakely - 1.9.0-25 +- Rebuilt for Boost 1.69 + * Fri Jul 13 2018 Fedora Release Engineering - 1.9.0-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5388ef43a76cc5152edca6c6b7535c7cbc85150e Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:59 +0100 Subject: [PATCH 04/55] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- ogre.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ogre.spec b/ogre.spec index df41914..1653854 100644 --- a/ogre.spec +++ b/ogre.spec @@ -104,7 +104,6 @@ featurewise has a tedency towards terrains. %package utils Summary: OGRE production pipeline utilities -Group: Development/Tools Requires: %{name} = %{version}-%{release} %description utils @@ -115,7 +114,6 @@ them to the latest version. %package devel Summary: Ogre header files and documentation -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-paging%{?_isa} = %{version}-%{release} Requires: %{name}-property%{?_isa} = %{version}-%{release} From 306db621781e0a51610b7accb8a33b74f4da8e23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 17:10:38 +0000 Subject: [PATCH 05/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 1653854..2dde7cc 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -273,6 +273,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.9.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 24 2019 Jonathan Wakely - 1.9.0-25 - Rebuilt for Boost 1.69 From 97c9375fe7881c8ac321185d7972942c2d5c3e18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 23:13:48 +0000 Subject: [PATCH 06/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 2dde7cc..1eb964c 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -273,6 +273,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.9.0-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.9.0-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 335f0dd84eb74057086503f674bb0df65ffd2c9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 20:02:52 +0000 Subject: [PATCH 07/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 1eb964c..ad13cad 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -273,6 +273,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.9.0-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.9.0-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From a37ab0a002bbe82be0da8c28ea63d9fc24a0c968 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 28 May 2020 18:36:45 +0100 Subject: [PATCH 08/55] Rebuilt for Boost 1.73 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index ad13cad..871b874 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -273,6 +273,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu May 28 2020 Jonathan Wakely - 1.9.0-29 +- Rebuilt for Boost 1.73 + * Wed Jan 29 2020 Fedora Release Engineering - 1.9.0-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 58a486fd08b5728e9808694ba72456768d881a02 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 28 May 2020 22:31:06 +0100 Subject: [PATCH 09/55] Patched for glibc 2.32 Remove unnecessary inclusion of (#1841324) --- ogre-1.9.0-sysctl.patch | 11 +++++++++++ ogre.spec | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 ogre-1.9.0-sysctl.patch diff --git a/ogre-1.9.0-sysctl.patch b/ogre-1.9.0-sysctl.patch new file mode 100644 index 0000000..9e66710 --- /dev/null +++ b/ogre-1.9.0-sysctl.patch @@ -0,0 +1,11 @@ +--- ogre-1.9.0/OgreMain/src/OgrePlatformInformation.cpp~ 2020-05-28 22:26:51.798696996 +0100 ++++ ogre-1.9.0/OgreMain/src/OgrePlatformInformation.cpp 2020-05-28 22:27:24.901691518 +0100 +@@ -42,7 +42,7 @@ + + #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID + #include +- #elif OGRE_CPU == OGRE_CPU_ARM ++ #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS + #include + #if __MACH__ + #include diff --git a/ogre.spec b/ogre.spec index 871b874..1f1745d 100644 --- a/ogre.spec +++ b/ogre.spec @@ -30,6 +30,9 @@ Patch10: ogre-aarch64.patch # https://bitbucket.org/sinbad/ogre/commits/a24ac4afbbb9dc5ff49a61634af50da11ba8fb97/ # https://bugzilla.redhat.com/show_bug.cgi?id=1223612 Patch11: ogre-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff +# Remove unnecessary inclusion of +# https://bugzilla.redhat.com/show_bug.cgi?id=1841324 +Patch12: ogre-1.9.0-sysctl.patch BuildRequires: gcc-c++ BuildRequires: zziplib-devel freetype-devel BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel @@ -162,6 +165,7 @@ mkdir build %patch9 -p1 -b .cmake_build-fix %patch10 -p1 %patch11 -p1 +%patch12 -p1 # remove execute bits from src-files for -debuginfo package chmod -x `find RenderSystems/GL -type f` \ @@ -275,6 +279,7 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog * Thu May 28 2020 Jonathan Wakely - 1.9.0-29 - Rebuilt for Boost 1.73 +- Patched for glibc 2.32 (#1841324) * Wed Jan 29 2020 Fedora Release Engineering - 1.9.0-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6b59012aa888e64d32552a684230dfef85b776fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 12:31:40 +0000 Subject: [PATCH 10/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 1f1745d..838823f 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -277,6 +277,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.9.0-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu May 28 2020 Jonathan Wakely - 1.9.0-29 - Rebuilt for Boost 1.73 - Patched for glibc 2.32 (#1841324) From 669288b1373c01cb25076dafe7a618f86a02acd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 06:47:40 +0000 Subject: [PATCH 11/55] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 838823f..b48f614 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,6 @@ Name: ogre Version: 1.9.0 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -277,6 +277,10 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.9.0-31 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.9.0-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3262d27879a167703428ca58aaa60114b45e1ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 1 Jun 2020 00:46:48 +0100 Subject: [PATCH 12/55] Update to 1.12.6 Use upstream source and simply remove the GL headers in %prep. Fix cmake build --- ogre-1.9.0-build-rcapsdump.patch | 26 ++--- ogre-1.9.0-dynlib-allow-no-so.patch | 23 +++-- ogre-make-clean.sh | 23 +++-- ogre.spec | 143 +++++++++++++++------------- 4 files changed, 105 insertions(+), 110 deletions(-) diff --git a/ogre-1.9.0-build-rcapsdump.patch b/ogre-1.9.0-build-rcapsdump.patch index 39efb56..59b4e89 100644 --- a/ogre-1.9.0-build-rcapsdump.patch +++ b/ogre-1.9.0-build-rcapsdump.patch @@ -1,22 +1,8 @@ -diff -uNr ogre-1.9.0/Tools/CMakeLists.txt ogre-1.9.0.rcapsdump/Tools/CMakeLists.txt ---- ogre-1.9.0/Tools/CMakeLists.txt 2013-12-01 21:28:12.000000000 +0400 -+++ ogre-1.9.0.rcapsdump/Tools/CMakeLists.txt 2014-06-07 22:09:58.310761427 +0400 -@@ -14,3 +14,5 @@ - add_subdirectory(XMLConverter) - add_subdirectory(MeshUpgrader) - endif (NOT OGRE_BUILD_PLATFORM_APPLE_IOS AND NOT OGRE_BUILD_PLATFORM_WINRT) +--- ./Tools/CMakeLists.txt.orig 2020-05-29 15:24:33.979876605 +0100 ++++ ./Tools/CMakeLists.txt 2020-05-29 15:27:00.867875392 +0100 +@@ -17,3 +17,5 @@ if (NOT APPLE_IOS AND NOT (WINDOWS_STORE + add_subdirectory(MeshUpgrader) + endif() + endif (NOT APPLE_IOS AND NOT (WINDOWS_STORE OR WINDOWS_PHONE)) + +add_subdirectory(rcapsdump) -diff -uNr ogre-1.9.0/Tools/rcapsdump/CMakeLists.txt ogre-1.9.0.rcapsdump/Tools/rcapsdump/CMakeLists.txt ---- ogre-1.9.0/Tools/rcapsdump/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 -+++ ogre-1.9.0.rcapsdump/Tools/rcapsdump/CMakeLists.txt 2014-06-07 22:10:45.999350666 +0400 -@@ -0,0 +1,9 @@ -+# Configure rcapsdump -+ -+set(SOURCE_FILES -+ src/main.cpp -+) -+ -+add_executable(rcapsdump ${SOURCE_FILES}) -+target_link_libraries(rcapsdump ${OGRE_LIBRARIES}) -+ogre_config_tool(rcapsdump) diff --git a/ogre-1.9.0-dynlib-allow-no-so.patch b/ogre-1.9.0-dynlib-allow-no-so.patch index c02387b..42bb50c 100644 --- a/ogre-1.9.0-dynlib-allow-no-so.patch +++ b/ogre-1.9.0-dynlib-allow-no-so.patch @@ -1,21 +1,20 @@ -diff -uNr ogre-1.9.0/OgreMain/src/OgreDynLib.cpp ogre-1.9.0.dynlib-allow-no-so/OgreMain/src/OgreDynLib.cpp ---- ogre-1.9.0/OgreMain/src/OgreDynLib.cpp 2013-12-01 21:28:12.000000000 +0400 -+++ ogre-1.9.0.dynlib-allow-no-so/OgreMain/src/OgreDynLib.cpp 2014-06-07 22:22:44.500257614 +0400 -@@ -76,7 +76,9 @@ - String name = mName; - #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_NACL +--- ./OgreMain/src/OgreDynLib.cpp.orig 2020-04-26 00:11:59.000000000 +0100 ++++ ./OgreMain/src/OgreDynLib.cpp 2020-05-29 15:30:38.474355025 +0100 +@@ -80,7 +80,9 @@ namespace Ogre { + name += ".js"; + #elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX // dlopen() does not add .so to the filename, like windows does for .dll - if (name.find(".so") == String::npos) + mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); + // Only add .so if open without it failed + if ((!mInst) && (name.find(".so") == String::npos)) { - name += ".so."; - name += StringConverter::toString(OGRE_VERSION_MAJOR) + "."; -@@ -93,7 +95,7 @@ - if (name.substr(name.length() - 4, 4) != ".dll") - name += ".dll"; - #endif + name += StringUtil::format(".so.%d.%d.%d", OGRE_VERSION_MAJOR, OGRE_VERSION_MINOR, OGRE_VERSION_PATCH); + } +@@ -98,7 +100,7 @@ namespace Ogre { + // Log library load + LogManager::getSingleton().logMessage("Loading library " + name); + - mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); + if( !mInst ) mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE diff --git a/ogre-make-clean.sh b/ogre-make-clean.sh index a0d1db9..17871bc 100755 --- a/ogre-make-clean.sh +++ b/ogre-make-clean.sh @@ -3,31 +3,30 @@ set -e set -x -version=1.9.0 +version=1.12.9 -[ ! -e ogre-${version} ] - -rpm -q mercurial -hg clone https://bitbucket.org/sinbad/ogre ogre-${version} -hg archive -R ogre-${version} -r v$(echo ${version} | tr . -) -t tbz2 ogre-${version}.tar.bz2 -rm -rf ogre-${version} +[ ! -e ogre-${version} ] && wget https://github.com/OGRECave/ogre/archive/v${version}/ogre-${version}.tar.gz # Clean up -tar xjf ogre-${version}.tar.bz2 +tar xf ogre-${version}.tar.gz pushd ogre-${version} # - Non-free licensed headers under RenderSystems/GL/include/GL removed - rm RenderSystems/GL/include/GL/{gl,glext,glxext,glxtokens,wglext}.h + rm RenderSystems/GL/include/GL/{gl,glext}.h # - GLEW sources updated - rpm -q glew-devel glew-debuginfo + # not working glew.c:1542:1: error: unknown type name 'PFNGLPROGRAMUNIFORM1DEXTPROC'; + rpm -q glew-devel glew-debugsource + echo if package glew-debugsource is not installed, dnf debuginfo-install glew cp -f /usr/include/GL/{glew,glxew,wglew}.h RenderSystems/GL/include/GL/ cp -f /usr/src/debug/glew-*/src/glew.c RenderSystems/GL/src/glew.cpp dos2unix RenderSystems/GL/src/glew.cpp + + # https://github.com/OGRECave/ogre/issues/882 # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed - rm Samples/Media/packs/chiropteraDM.{pk3,txt} + # rm Samples/Media/packs/chiropteraDM.{pk3,txt} # - Non-free textures under Samples/Media/materials/textures/nvidia removed - rm Samples/Media/materials/textures/nvidia/* + # rm Samples/Media/materials/textures/nvidia/* popd tar cjf ogre-${version}-clean.tar.bz2 ogre-${version} diff --git a/ogre.spec b/ogre.spec index b48f614..214ee83 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,8 @@ +%undefine __cmake_in_source_build + Name: ogre -Version: 1.9.0 -Release: 31%{?dist} +Version: 1.12.6 +Release: 1%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -9,42 +11,49 @@ Summary: Object-Oriented Graphics Rendering Engine # Public Domain - Some of the build files, samples and plugins License: MIT with exceptions 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 +# 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): # Update local glew copy # - Non-free licensed headers under RenderSystems/GL/include/GL removed # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed # - Non-free textures under Samples/Media/materials/textures/nvidia -Source0: %{name}-%{version}-clean.tar.bz2 +Source0: https://github.com/OGRECave/ogre/archive/v%{version}/ogre-%{version}.tar.gz +Source1: https://github.com/ocornut/imgui/archive/v1.76/imgui-1.76.tar.gz Patch0: ogre-1.7.2-rpath.patch -Patch1: ogre-1.9.0-glew.patch -Patch3: ogre-1.7.2-fix-ppc-build.patch -Patch5: ogre-1.9.0-build-rcapsdump.patch +#Patch5: ogre-1.9.0-build-rcapsdump.patch Patch6: ogre-thread.patch -Patch7: ogre-1.9.0-dynlib-allow-no-so.patch -# FIXME: Patch is bogus on Fedora >= 24 -Patch8: ogre-1.9.0-cmake-freetype.patch -Patch9: ogre-1.9.0-cmake_build-fix.patch -Patch10: ogre-aarch64.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 # Remove unnecessary inclusion of # https://bugzilla.redhat.com/show_bug.cgi?id=1841324 Patch12: ogre-1.9.0-sysctl.patch +Patch13: Bitwise.patch BuildRequires: gcc-c++ -BuildRequires: zziplib-devel freetype-devel -BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel -BuildRequires: ois-devel freeimage-devel openexr-devel -BuildRequires: glew-devel +BuildRequires: cmake BuildRequires: boost-devel +BuildRequires: doxygen +BuildRequires: zziplib-devel +BuildRequires: freetype-devel +BuildRequires: libXaw-devel +BuildRequires: libXrandr-devel +BuildRequires: libXxf86vm-devel +BuildRequires: libGLU-devel +BuildRequires: ois-devel +BuildRequires: freeimage-devel +BuildRequires: openexr-devel +BuildRequires: glew-devel # BuildRequires: poco-devel BuildRequires: tinyxml-devel -BuildRequires: cmake BuildRequires: libatomic BuildRequires: cppunit-devel -Provides: bundled(wxScintilla) = 1.69.2 +BuildRequires: SDL2-devel +BuildRequires: harfbuzz-devel +Buildrequires: qt5-qtbase-devel +#BuildRequires: swig > 3.0.0 +#Buildrequires: python3-devel +#Buildrequires: java-devel +Buildrequires: pugixml-devel +Buildrequires: tinyxml-devel + +#Provides: bundled(wxScintilla) = 1.69.2 %description OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, @@ -147,48 +156,33 @@ samples. The samples are installed in %{_libdir}/Samples/*.so and can be run using SampleBrowser. %prep -%setup -q -mkdir build +%setup -q -a1 +# move imgui into submodule place +rmdir Components/Overlay/src/imgui/ +mv imgui-1.*/ Components/Overlay/src/imgui/ +rm RenderSystems/GL/include/GL/{gl,glext}.h %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 -%if (%{?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 -%endif -%patch9 -p1 -b .cmake_build-fix -%patch10 -p1 -%patch11 -p1 %patch12 -p1 +%patch13 -p1 # remove execute bits from src-files for -debuginfo package -chmod -x `find RenderSystems/GL -type f` \ - `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp -# Samples/Common/bin/resources.cfg -# Remove spurious execute bits from some Media files -chmod -x `find Samples/Media/DeferredShadingMedia -type f` -# Add mit.txt symlink for links in License.html -rm -r Docs/licenses/* -ln -s ../COPYING Docs/licenses/mit.txt -# remove included tinyxml headers to ensure use of system headers -rm Tools/XMLConverter/include/tiny* +find . -type f -name "*.h" -o -name "*.cpp" -exec chmod 644 {} \; + %build -pushd build - %cmake .. -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 -DOGRE_LIB_DIRECTORY=%{_lib} -DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=1 -DOGRE_BUILD_PLUGIN_CG=0 - make %{?_smp_mflags} -popd +%{cmake} -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 \ + -DOGRE_BUILD_DOCS:BOOL=OFF \ + -DOGRE_BUILD_DEPENDENCIES=FALSE \ + -DOGRE_BUILD_PLUGIN_CG:BOOL=OFF \ + -DOGRE_INSTALL_SAMPLES:BOOL=ON \ + -DOGRE_INSTALL_SAMPLES_SOURCE:BOOL=ON \ + -DOGRE_CONFIG_MEMTRACK_RELEASE:BOOL=OFF \ + -DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=1 -Wno-dev +%{cmake_build} %install -pushd build - %make_install -popd +%{cmake_install} # Create config for ldconfig mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d @@ -197,15 +191,15 @@ echo "%{_libdir}/OGRE" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch # Install the samples mkdir -p %{buildroot}%{_libdir}/OGRE/Samples mkdir -p %{buildroot}%{_sysconfdir}/OGRE -for cfg in plugins.cfg quakemap.cfg resources.cfg samples.cfg; do +for cfg in plugins.cfg resources.cfg samples.cfg; do mv %{buildroot}%{_datadir}/OGRE/$cfg %{buildroot}%{_sysconfdir}/OGRE/ done # Swap out reference to non-free quake map that was removed -cat << EOF > %{buildroot}%{_sysconfdir}/OGRE/quakemap.cfg -Archive: /usr/share/OGRE/media/packs/ogretestmap.zip -Map: ogretestmap.bsp -EOF +#cat << EOF > %{buildroot}%{_sysconfdir}/OGRE/quakemap.cfg +#Archive: /usr/share/OGRE/media/packs/ogretestmap.zip +#Map: ogretestmap.bsp +#EOF # Fixing bug with wrong case for media mkdir -p %{buildroot}%{_datadir}/OGRE/ @@ -213,7 +207,13 @@ mv %{buildroot}%{_datadir}/OGRE/Media %{buildroot}%{_datadir}/OGRE/media mv %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/ROOM_NY.mesh %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/room_ny.mesh mv %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/ROOM_PY.mesh %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/room_py.mesh -rm -f %{buildroot}%{_datadir}/OGRE/docs/CMakeLists.txt +rm -f %{buildroot}%{_datadir}/doc/OGRE/CMakeLists.txt +# Add mit.txt symlink for links in License.html +#rm -r Docs/licenses/* +#ln -s ../COPYING Docs/licenses/mit.txt +rm -f Docs/licenses/mit.txt +rm -rf %{buildroot}%{_datadir}/doc/OGRE/licenses/ + # cmake macros should be in the cmake directory, not an Ogre directory mkdir -p %{buildroot}%{_datadir}/cmake/Modules @@ -224,12 +224,17 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %postun -p /sbin/ldconfig %files -%doc AUTHORS BUGS COPYING -%doc Docs/ChangeLog.html Docs/License.html Docs/licenses Docs/ReadMe.html Docs/style.css Docs/ogre-logo*.gif +%doc AUTHORS README.md +%license LICENSE Docs/licenses/* %{_libdir}/libOgreMain.so.* +%{_libdir}/libOgreBites.so.* +%{_libdir}/libOgreBitesQt.so.* +%{_libdir}/libOgreMeshLodGenerator.so.* +%{_libdir}/libOgreGLSupport.a %{_libdir}/OGRE - +%{_bindir}/VRMLConverter %{_datadir}/OGRE +%{_datadir}/doc/OGRE %dir %{_sysconfdir}/OGRE %exclude %{_bindir}/SampleBrowser %exclude %{_libdir}/OGRE/Samples @@ -258,7 +263,7 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %files utils %{_bindir}/OgreMeshUpgrader %{_bindir}/OgreXMLConverter -%{_bindir}/rcapsdump +#{_bindir}/rcapsdump %files devel %{_libdir}/lib*Ogre*.so @@ -271,12 +276,18 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %{_libdir}/OGRE/Samples %{_datadir}/OGRE/media %{_sysconfdir}/OGRE/plugins.cfg -%{_sysconfdir}/OGRE/quakemap.cfg +#{_sysconfdir}/OGRE/quakemap.cfg %{_sysconfdir}/OGRE/resources.cfg %{_sysconfdir}/OGRE/samples.cfg %changelog +* Sun Nov 22 2020 Sérgio Basto - 1.12.6-1 +- Update to 1.12.6 +- Fix cmake build +- Use upstream source and simply remove the GL headers in %prep. +- Add Bitwise.patch for build on s390x + * Sat Aug 01 2020 Fedora Release Engineering - 1.9.0-31 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 37f66aeef3df964bfe8269841b5a7f45ef5d47d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 22 Nov 2020 19:48:32 +0000 Subject: [PATCH 13/55] Update sources --- .gitignore | 2 + Bitwise.patch | 10 +++ ogre-1.7.2-fix-ppc-build.patch | 19 ---- ogre-1.9.0-build-rcapsdump.patch | 8 -- ogre-1.9.0-cmake-freetype.patch | 12 --- ogre-1.9.0-cmake_build-fix.patch | 14 --- ogre-1.9.0-dynlib-allow-no-so.patch | 22 ----- ogre-1.9.0-glew.patch | 133 ---------------------------- ogre-aarch64.patch | 13 --- sources | 3 +- 10 files changed, 14 insertions(+), 222 deletions(-) create mode 100644 Bitwise.patch delete mode 100644 ogre-1.7.2-fix-ppc-build.patch delete mode 100644 ogre-1.9.0-build-rcapsdump.patch delete mode 100644 ogre-1.9.0-cmake-freetype.patch delete mode 100644 ogre-1.9.0-cmake_build-fix.patch delete mode 100644 ogre-1.9.0-dynlib-allow-no-so.patch delete mode 100644 ogre-1.9.0-glew.patch delete mode 100644 ogre-aarch64.patch diff --git a/.gitignore b/.gitignore index 4cb00e4..ea42dc6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ ogre-1.6.4-clean.tar.bz2 /ogre-1.7.4-clean.tar.bz2 /ogre-1.8.1-clean.tar.bz2 /ogre-1.9.0-clean.tar.bz2 +/ogre-1.12.6.tar.gz +/imgui-1.76.tar.gz diff --git a/Bitwise.patch b/Bitwise.patch new file mode 100644 index 0000000..aa2e5a1 --- /dev/null +++ b/Bitwise.patch @@ -0,0 +1,10 @@ +--- ./OgreMain/include/OgreImageCodec.h.orig 2020-11-22 17:57:59.657974303 +0000 ++++ ./OgreMain/include/OgreImageCodec.h 2020-11-22 19:03:53.396404273 +0000 +@@ -30,6 +30,7 @@ THE SOFTWARE. + + #include "OgreCodec.h" + #include "OgrePixelFormat.h" ++#include "OgreBitwise.h" + + namespace Ogre { + diff --git a/ogre-1.7.2-fix-ppc-build.patch b/ogre-1.7.2-fix-ppc-build.patch deleted file mode 100644 index 6415f21..0000000 --- a/ogre-1.7.2-fix-ppc-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h ---- ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc 2010-11-03 14:24:47.000000000 -0400 -+++ ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h 2010-12-20 14:44:49.467800002 -0500 -@@ -1838,6 +1838,7 @@ static MLOCK_T malloc_global_mutex = PTH - - /* Cope with old-style linux recursive lock initialization by adding */ - /* skipped internal declaration from pthread.h */ -+/* - #ifdef linux - #if !defined (PTHREAD_MUTEX_RECURSIVE) && defined (PTHREAD_MUTEX_RECURSIVE_NP) - extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr, -@@ -1846,6 +1847,7 @@ extern int pthread_mutexattr_setkind_np - #define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y) - #endif - #endif -+*/ - - static int pthread_init_lock (MLOCK_T *sl) { - pthread_mutexattr_t attr; diff --git a/ogre-1.9.0-build-rcapsdump.patch b/ogre-1.9.0-build-rcapsdump.patch deleted file mode 100644 index 59b4e89..0000000 --- a/ogre-1.9.0-build-rcapsdump.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- ./Tools/CMakeLists.txt.orig 2020-05-29 15:24:33.979876605 +0100 -+++ ./Tools/CMakeLists.txt 2020-05-29 15:27:00.867875392 +0100 -@@ -17,3 +17,5 @@ if (NOT APPLE_IOS AND NOT (WINDOWS_STORE - add_subdirectory(MeshUpgrader) - endif() - endif (NOT APPLE_IOS AND NOT (WINDOWS_STORE OR WINDOWS_PHONE)) -+ -+add_subdirectory(rcapsdump) diff --git a/ogre-1.9.0-cmake-freetype.patch b/ogre-1.9.0-cmake-freetype.patch deleted file mode 100644 index 03ce0d3..0000000 --- a/ogre-1.9.0-cmake-freetype.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr ogre-1.9.0/CMake/Packages/FindFreetype.cmake ogre-1.9.0.cmake-freetype/CMake/Packages/FindFreetype.cmake ---- ogre-1.9.0/CMake/Packages/FindFreetype.cmake 2013-12-01 21:28:12.000000000 +0400 -+++ ogre-1.9.0.cmake-freetype/CMake/Packages/FindFreetype.cmake 2014-06-07 22:29:30.518295328 +0400 -@@ -43,7 +43,7 @@ - findpkg_framework(FREETYPE) - message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") - --find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) -+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype2/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) - find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) - - find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) diff --git a/ogre-1.9.0-cmake_build-fix.patch b/ogre-1.9.0-cmake_build-fix.patch deleted file mode 100644 index a98c5b1..0000000 --- a/ogre-1.9.0-cmake_build-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -uNr ogre-1.9.0/Samples/Browser/CMakeLists.txt ogre-1.9.0.cmake_build-fix/Samples/Browser/CMakeLists.txt ---- ogre-1.9.0/Samples/Browser/CMakeLists.txt 2013-12-01 21:28:12.000000000 +0400 -+++ ogre-1.9.0.cmake_build-fix/Samples/Browser/CMakeLists.txt 2014-06-07 22:59:19.423900980 +0400 -@@ -339,8 +339,8 @@ - - foreach(FWK ${FRAMEWORKS}) - add_custom_command(TARGET SampleBrowser POST_BUILD -- COMMAND ARGS if [ -d ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework ]\; then ln -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework ${OGRE_SAMPLE_CONTENTS_PATH}/Frameworks/${FWK}.framework\; fi -- ) -+ COMMAND ARGS if test -d ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework\; then ln -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework ${OGRE_SAMPLE_CONTENTS_PATH}/Frameworks/${FWK}.framework\; fi -+ ) - endforeach(FWK) - - # Add links for the sample plugins diff --git a/ogre-1.9.0-dynlib-allow-no-so.patch b/ogre-1.9.0-dynlib-allow-no-so.patch deleted file mode 100644 index 42bb50c..0000000 --- a/ogre-1.9.0-dynlib-allow-no-so.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ./OgreMain/src/OgreDynLib.cpp.orig 2020-04-26 00:11:59.000000000 +0100 -+++ ./OgreMain/src/OgreDynLib.cpp 2020-05-29 15:30:38.474355025 +0100 -@@ -80,7 +80,9 @@ namespace Ogre { - name += ".js"; - #elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX - // dlopen() does not add .so to the filename, like windows does for .dll -- if (name.find(".so") == String::npos) -+ mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); -+ // Only add .so if open without it failed -+ if ((!mInst) && (name.find(".so") == String::npos)) - { - name += StringUtil::format(".so.%d.%d.%d", OGRE_VERSION_MAJOR, OGRE_VERSION_MINOR, OGRE_VERSION_PATCH); - } -@@ -98,7 +100,7 @@ namespace Ogre { - // Log library load - LogManager::getSingleton().logMessage("Loading library " + name); - -- mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); -+ if( !mInst ) mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); - #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE - if(!mInst) - { diff --git a/ogre-1.9.0-glew.patch b/ogre-1.9.0-glew.patch deleted file mode 100644 index 06922db..0000000 --- a/ogre-1.9.0-glew.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -uNr ogre-1.9.0/RenderSystems/GL/include/GL/glew.h ogre-1.9.0.glew/RenderSystems/GL/include/GL/glew.h ---- ogre-1.9.0/RenderSystems/GL/include/GL/glew.h 2014-06-07 21:12:14.000000000 +0400 -+++ ogre-1.9.0.glew/RenderSystems/GL/include/GL/glew.h 2014-06-07 21:45:03.422493324 +0400 -@@ -109,6 +109,11 @@ - #define __GLEXT_H_ - #define __gl_ATI_h_ - -+// SJS -+// Build statically -+#define GLEW_STATIC -+// SJS -+ - #if defined(_WIN32) - - /* -diff -uNr ogre-1.9.0/RenderSystems/GL/src/glew.cpp ogre-1.9.0.glew/RenderSystems/GL/src/glew.cpp ---- ogre-1.9.0/RenderSystems/GL/src/glew.cpp 2014-06-07 21:12:16.000000000 +0400 -+++ ogre-1.9.0.glew/RenderSystems/GL/src/glew.cpp 2014-06-07 21:48:09.519775784 +0400 -@@ -29,6 +29,10 @@ - ** THE POSSIBILITY OF SUCH DAMAGE. - */ - -+// SJS -+#include "OgreGLSupport.h" -+// SJS -+ - #include - - #if defined(_WIN32) -@@ -57,13 +61,21 @@ - # endif /* _WIN32 */ - # define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx - #else /* GLEW_MX */ --# define GLEW_CONTEXT_ARG_DEF_INIT void --# define GLEW_CONTEXT_ARG_VAR_INIT --# define GLEW_CONTEXT_ARG_DEF_LIST void --# define WGLEW_CONTEXT_ARG_DEF_INIT void --# define WGLEW_CONTEXT_ARG_DEF_LIST void --# define GLXEW_CONTEXT_ARG_DEF_INIT void --# define GLXEW_CONTEXT_ARG_DEF_LIST void -+// SJS -+# define GLEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport -+# define GLEW_CONTEXT_ARG_VAR_INIT glSupport -+# define GLEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport -+# define WGLEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport -+# define WGLEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport -+# define GLXEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport -+# define GLXEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport -+//# define GLEW_CONTEXT_ARG_DEF_INIT void -+//# define GLEW_CONTEXT_ARG_VAR_INIT -+//# define GLEW_CONTEXT_ARG_DEF_LIST void -+//# define WGLEW_CONTEXT_ARG_DEF_INIT void -+//# define WGLEW_CONTEXT_ARG_DEF_LIST void -+//# define GLXEW_CONTEXT_ARG_DEF_INIT void -+//# define GLXEW_CONTEXT_ARG_DEF_LIST void - #endif /* GLEW_MX */ - - #if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) -@@ -137,7 +149,7 @@ - #endif - } - /* prepend a '_' for the Unix C symbol mangling convention */ -- symbolName = malloc(strlen((const char*)name) + 2); -+ symbolName = (char*)malloc(strlen((const char*)name) + 2); - strcpy(symbolName+1, (const char*)name); - symbolName[0] = '_'; - symbol = NULL; -@@ -9481,9 +9493,11 @@ - - /* ------------------------------------------------------------------------- */ - --#ifndef GLEW_MX --static --#endif -+// SJS -+//#ifndef GLEW_MX -+//static -+//#endif -+// SJS - GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) - { - const GLubyte* s; -@@ -12543,7 +12557,14 @@ - { - GLboolean r = GL_FALSE; - -- r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; -+ // SJS -+ // FB: Patched to allow Ogre to overload glXGetCurrentDisplay -+ if (glXGetCurrentDisplay == NULL) -+ { -+ r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; -+ } -+ //r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; -+ // SJS - - return r; - } -@@ -13476,19 +13497,21 @@ - extern GLenum GLEWAPIENTRY glxewContextInit (void); - #endif /* _WIN32 */ - --GLenum GLEWAPIENTRY glewInit (void) --{ -- GLenum r; -- r = glewContextInit(); -- if ( r != 0 ) return r; --#if defined(_WIN32) -- return wglewContextInit(); --#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ -- return glxewContextInit(); --#else -- return r; --#endif /* _WIN32 */ --} -+// SJS -+//GLenum GLEWAPIENTRY glewInit (void) -+//{ -+// GLenum r; -+// r = glewContextInit(); -+// if ( r != 0 ) return r; -+//#if defined(_WIN32) -+// return wglewContextInit(); -+//#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ -+// return glxewContextInit(); -+//#else -+// return r; -+//#endif /* _WIN32 */ -+//} -+// End SJS - - #endif /* !GLEW_MX */ - #ifdef GLEW_MX diff --git a/ogre-aarch64.patch b/ogre-aarch64.patch deleted file mode 100644 index d5abe67..0000000 --- a/ogre-aarch64.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: ogre-1.9.0/OgreMain/include/OgrePlatform.h -=================================================================== ---- ogre-1.9.0.orig/OgreMain/include/OgrePlatform.h -+++ ogre-1.9.0/OgreMain/include/OgrePlatform.h -@@ -166,7 +166,7 @@ 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_) - # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 - #else - # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32 diff --git a/sources b/sources index e8b7a57..002a55f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -6a3ffaa8389e6a4323fc505263137bfd ogre-1.9.0-clean.tar.bz2 +SHA512 (ogre-1.12.6.tar.gz) = 2d62f86a94b5b066abc53ecfb7d98381fd684c180c630b99b58cf486069d2407c6c9e2c35f2baf315ba9bd887d6f507c8cc6663a50c97c4ee63f454e33e0450d +SHA512 (imgui-1.76.tar.gz) = 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa From ecf3f1567ebe44b431576a02bf7d967f9d14c4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 24 Nov 2020 23:38:15 +0000 Subject: [PATCH 14/55] Update to 1.12.9 --- .gitignore | 2 ++ Bitwise.patch | 10 ---------- ogre-1.9.0-sysctl.patch | 11 ----------- ogre-make-clean.sh | 16 +++++++++------- ogre.spec | 26 ++++++++------------------ sources | 4 ++-- 6 files changed, 21 insertions(+), 48 deletions(-) delete mode 100644 Bitwise.patch delete mode 100644 ogre-1.9.0-sysctl.patch diff --git a/.gitignore b/.gitignore index ea42dc6..f0397da 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ ogre-1.6.4-clean.tar.bz2 /ogre-1.9.0-clean.tar.bz2 /ogre-1.12.6.tar.gz /imgui-1.76.tar.gz +/ogre-1.12.9-clean.tar.xz +/imgui-1.77.tar.gz diff --git a/Bitwise.patch b/Bitwise.patch deleted file mode 100644 index aa2e5a1..0000000 --- a/Bitwise.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./OgreMain/include/OgreImageCodec.h.orig 2020-11-22 17:57:59.657974303 +0000 -+++ ./OgreMain/include/OgreImageCodec.h 2020-11-22 19:03:53.396404273 +0000 -@@ -30,6 +30,7 @@ THE SOFTWARE. - - #include "OgreCodec.h" - #include "OgrePixelFormat.h" -+#include "OgreBitwise.h" - - namespace Ogre { - diff --git a/ogre-1.9.0-sysctl.patch b/ogre-1.9.0-sysctl.patch deleted file mode 100644 index 9e66710..0000000 --- a/ogre-1.9.0-sysctl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ogre-1.9.0/OgreMain/src/OgrePlatformInformation.cpp~ 2020-05-28 22:26:51.798696996 +0100 -+++ ogre-1.9.0/OgreMain/src/OgrePlatformInformation.cpp 2020-05-28 22:27:24.901691518 +0100 -@@ -42,7 +42,7 @@ - - #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID - #include -- #elif OGRE_CPU == OGRE_CPU_ARM -+ #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS - #include - #if __MACH__ - #include diff --git a/ogre-make-clean.sh b/ogre-make-clean.sh index 17871bc..0152bdb 100755 --- a/ogre-make-clean.sh +++ b/ogre-make-clean.sh @@ -5,7 +5,7 @@ set -x version=1.12.9 -[ ! -e ogre-${version} ] && wget https://github.com/OGRECave/ogre/archive/v${version}/ogre-${version}.tar.gz +[ ! -e ogre-${version} ] && wget -c https://github.com/OGRECave/ogre/archive/v${version}/ogre-${version}.tar.gz # Clean up tar xf ogre-${version}.tar.gz @@ -14,19 +14,21 @@ pushd ogre-${version} rm RenderSystems/GL/include/GL/{gl,glext}.h # - GLEW sources updated - # not working glew.c:1542:1: error: unknown type name 'PFNGLPROGRAMUNIFORM1DEXTPROC'; + # not working glew.c:1542:1: error: unknown type name 'PFNGLPROGRAMUNIFORM2IVEXTPROC'; rpm -q glew-devel glew-debugsource - echo if package glew-debugsource is not installed, dnf debuginfo-install glew + echo if package glew-debugsource is not installed, please do 'dnf debuginfo-install glew' cp -f /usr/include/GL/{glew,glxew,wglew}.h RenderSystems/GL/include/GL/ - cp -f /usr/src/debug/glew-*/src/glew.c RenderSystems/GL/src/glew.cpp - dos2unix RenderSystems/GL/src/glew.cpp - + cp -f /usr/src/debug/glew-*/src/glew.c RenderSystems/GL/src/glew.c # https://github.com/OGRECave/ogre/issues/882 # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed # rm Samples/Media/packs/chiropteraDM.{pk3,txt} + # https://github.com/OGRECave/ogre/commit/d7dc7119720a06f5d373bc6553bae1399ab5fb2e + # Samples: BSP - replace chiropteraDM by OpenArena oa_rpg3dm2 # - Non-free textures under Samples/Media/materials/textures/nvidia removed # rm Samples/Media/materials/textures/nvidia/* + # https://github.com/OGRECave/ogre/commit/302e970e6d56c5642f1879700ff891798c98d3b2 + # Samples: Terrain - replace proprietary nvidia textures by cc0textures popd -tar cjf ogre-${version}-clean.tar.bz2 ogre-${version} +tar cJf ogre-${version}-clean.tar.xz ogre-${version} diff --git a/ogre.spec b/ogre.spec index 214ee83..61a4f72 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,7 +1,7 @@ %undefine __cmake_in_source_build Name: ogre -Version: 1.12.6 +Version: 1.12.9 Release: 1%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -17,15 +17,11 @@ URL: http://www.ogre3d.org/ # - Non-free licensed headers under RenderSystems/GL/include/GL removed # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed # - Non-free textures under Samples/Media/materials/textures/nvidia -Source0: https://github.com/OGRECave/ogre/archive/v%{version}/ogre-%{version}.tar.gz -Source1: https://github.com/ocornut/imgui/archive/v1.76/imgui-1.76.tar.gz +Source0: ogre-%{version}-clean.tar.xz +Source1: https://github.com/ocornut/imgui/archive/v1.77/imgui-1.77.tar.gz Patch0: ogre-1.7.2-rpath.patch #Patch5: ogre-1.9.0-build-rcapsdump.patch Patch6: ogre-thread.patch -# Remove unnecessary inclusion of -# https://bugzilla.redhat.com/show_bug.cgi?id=1841324 -Patch12: ogre-1.9.0-sysctl.patch -Patch13: Bitwise.patch BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel @@ -53,8 +49,6 @@ Buildrequires: qt5-qtbase-devel Buildrequires: pugixml-devel Buildrequires: tinyxml-devel -#Provides: bundled(wxScintilla) = 1.69.2 - %description OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible 3D engine written in C++ designed to make it easier and more @@ -157,18 +151,10 @@ using SampleBrowser. %prep %setup -q -a1 -# move imgui into submodule place -rmdir Components/Overlay/src/imgui/ -mv imgui-1.*/ Components/Overlay/src/imgui/ -rm RenderSystems/GL/include/GL/{gl,glext}.h %patch0 -p1 -b .rpath %patch6 -p0 -b .thread -%patch12 -p1 -%patch13 -p1 - -# remove execute bits from src-files for -debuginfo package -find . -type f -name "*.h" -o -name "*.cpp" -exec chmod 644 {} \; +%{_fixperms} . %build %{cmake} -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 \ @@ -178,6 +164,7 @@ find . -type f -name "*.h" -o -name "*.cpp" -exec chmod 644 {} \; -DOGRE_INSTALL_SAMPLES:BOOL=ON \ -DOGRE_INSTALL_SAMPLES_SOURCE:BOOL=ON \ -DOGRE_CONFIG_MEMTRACK_RELEASE:BOOL=OFF \ + -DIMGUI_DIR=imgui-1.77 \ -DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=1 -Wno-dev %{cmake_build} @@ -282,6 +269,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Mon Nov 23 2020 Sérgio Basto - 1.12.9-1 +- Update to 1.12.9 + * Sun Nov 22 2020 Sérgio Basto - 1.12.6-1 - Update to 1.12.6 - Fix cmake build diff --git a/sources b/sources index 002a55f..8e9e24d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ogre-1.12.6.tar.gz) = 2d62f86a94b5b066abc53ecfb7d98381fd684c180c630b99b58cf486069d2407c6c9e2c35f2baf315ba9bd887d6f507c8cc6663a50c97c4ee63f454e33e0450d -SHA512 (imgui-1.76.tar.gz) = 7f7d7220c6c2805902665747f32ed094e0558d42cafb25a25bd16fed88da3bf8822c55ed92a552f0599f5563909d471aa5763e53c8dd5bf39367c61e39d015aa +SHA512 (ogre-1.12.9-clean.tar.xz) = a58176c328b41a3e1b89755ed4447d8cd47f1cbaf1aefb41929cd2b1a5ece5a77775a1be4333bd6f5dc5403f4b5d1e5c1fc0a60fc5f4d8bf38016c919099f972 +SHA512 (imgui-1.77.tar.gz) = d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546 From dfa0146b6d56f17852d7df2c5f756cc8e9c74078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 4 Dec 2020 00:23:23 +0000 Subject: [PATCH 15/55] Revert "Update to 1.12.9" This reverts commit ecf3f1567ebe44b431576a02bf7d967f9d14c4df. Revert "Update sources" This reverts commit 37f66aeef3df964bfe8269841b5a7f45ef5d47d6. Revert "Update to 1.12.6" This reverts commit 3262d27879a167703428ca58aaa60114b45e1ed4. --- .gitignore | 4 - ogre-1.7.2-fix-ppc-build.patch | 19 ++++ ogre-1.9.0-build-rcapsdump.patch | 22 +++++ ogre-1.9.0-cmake-freetype.patch | 12 +++ ogre-1.9.0-cmake_build-fix.patch | 14 +++ ogre-1.9.0-dynlib-allow-no-so.patch | 23 +++++ ogre-1.9.0-glew.patch | 133 ++++++++++++++++++++++++++ ogre-1.9.0-sysctl.patch | 11 +++ ogre-aarch64.patch | 13 +++ ogre-make-clean.sh | 31 +++--- ogre.spec | 143 ++++++++++++++-------------- sources | 3 +- 12 files changed, 334 insertions(+), 94 deletions(-) create mode 100644 ogre-1.7.2-fix-ppc-build.patch create mode 100644 ogre-1.9.0-build-rcapsdump.patch create mode 100644 ogre-1.9.0-cmake-freetype.patch create mode 100644 ogre-1.9.0-cmake_build-fix.patch create mode 100644 ogre-1.9.0-dynlib-allow-no-so.patch create mode 100644 ogre-1.9.0-glew.patch create mode 100644 ogre-1.9.0-sysctl.patch create mode 100644 ogre-aarch64.patch diff --git a/.gitignore b/.gitignore index f0397da..4cb00e4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,3 @@ ogre-1.6.4-clean.tar.bz2 /ogre-1.7.4-clean.tar.bz2 /ogre-1.8.1-clean.tar.bz2 /ogre-1.9.0-clean.tar.bz2 -/ogre-1.12.6.tar.gz -/imgui-1.76.tar.gz -/ogre-1.12.9-clean.tar.xz -/imgui-1.77.tar.gz diff --git a/ogre-1.7.2-fix-ppc-build.patch b/ogre-1.7.2-fix-ppc-build.patch new file mode 100644 index 0000000..6415f21 --- /dev/null +++ b/ogre-1.7.2-fix-ppc-build.patch @@ -0,0 +1,19 @@ +diff -up ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h +--- ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h.ppc 2010-11-03 14:24:47.000000000 -0400 ++++ ogre-1.7.2/OgreMain/src/nedmalloc/malloc.c.h 2010-12-20 14:44:49.467800002 -0500 +@@ -1838,6 +1838,7 @@ static MLOCK_T malloc_global_mutex = PTH + + /* Cope with old-style linux recursive lock initialization by adding */ + /* skipped internal declaration from pthread.h */ ++/* + #ifdef linux + #if !defined (PTHREAD_MUTEX_RECURSIVE) && defined (PTHREAD_MUTEX_RECURSIVE_NP) + extern int pthread_mutexattr_setkind_np __P ((pthread_mutexattr_t *__attr, +@@ -1846,6 +1847,7 @@ extern int pthread_mutexattr_setkind_np + #define pthread_mutexattr_settype(x,y) pthread_mutexattr_setkind_np(x,y) + #endif + #endif ++*/ + + static int pthread_init_lock (MLOCK_T *sl) { + pthread_mutexattr_t attr; diff --git a/ogre-1.9.0-build-rcapsdump.patch b/ogre-1.9.0-build-rcapsdump.patch new file mode 100644 index 0000000..39efb56 --- /dev/null +++ b/ogre-1.9.0-build-rcapsdump.patch @@ -0,0 +1,22 @@ +diff -uNr ogre-1.9.0/Tools/CMakeLists.txt ogre-1.9.0.rcapsdump/Tools/CMakeLists.txt +--- ogre-1.9.0/Tools/CMakeLists.txt 2013-12-01 21:28:12.000000000 +0400 ++++ ogre-1.9.0.rcapsdump/Tools/CMakeLists.txt 2014-06-07 22:09:58.310761427 +0400 +@@ -14,3 +14,5 @@ + add_subdirectory(XMLConverter) + add_subdirectory(MeshUpgrader) + endif (NOT OGRE_BUILD_PLATFORM_APPLE_IOS AND NOT OGRE_BUILD_PLATFORM_WINRT) ++ ++add_subdirectory(rcapsdump) +diff -uNr ogre-1.9.0/Tools/rcapsdump/CMakeLists.txt ogre-1.9.0.rcapsdump/Tools/rcapsdump/CMakeLists.txt +--- ogre-1.9.0/Tools/rcapsdump/CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 ++++ ogre-1.9.0.rcapsdump/Tools/rcapsdump/CMakeLists.txt 2014-06-07 22:10:45.999350666 +0400 +@@ -0,0 +1,9 @@ ++# Configure rcapsdump ++ ++set(SOURCE_FILES ++ src/main.cpp ++) ++ ++add_executable(rcapsdump ${SOURCE_FILES}) ++target_link_libraries(rcapsdump ${OGRE_LIBRARIES}) ++ogre_config_tool(rcapsdump) diff --git a/ogre-1.9.0-cmake-freetype.patch b/ogre-1.9.0-cmake-freetype.patch new file mode 100644 index 0000000..03ce0d3 --- /dev/null +++ b/ogre-1.9.0-cmake-freetype.patch @@ -0,0 +1,12 @@ +diff -uNr ogre-1.9.0/CMake/Packages/FindFreetype.cmake ogre-1.9.0.cmake-freetype/CMake/Packages/FindFreetype.cmake +--- ogre-1.9.0/CMake/Packages/FindFreetype.cmake 2013-12-01 21:28:12.000000000 +0400 ++++ ogre-1.9.0.cmake-freetype/CMake/Packages/FindFreetype.cmake 2014-06-07 22:29:30.518295328 +0400 +@@ -43,7 +43,7 @@ + findpkg_framework(FREETYPE) + message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}") + +-find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) ++find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype2/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2) + find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS}) + + find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel) diff --git a/ogre-1.9.0-cmake_build-fix.patch b/ogre-1.9.0-cmake_build-fix.patch new file mode 100644 index 0000000..a98c5b1 --- /dev/null +++ b/ogre-1.9.0-cmake_build-fix.patch @@ -0,0 +1,14 @@ +diff -uNr ogre-1.9.0/Samples/Browser/CMakeLists.txt ogre-1.9.0.cmake_build-fix/Samples/Browser/CMakeLists.txt +--- ogre-1.9.0/Samples/Browser/CMakeLists.txt 2013-12-01 21:28:12.000000000 +0400 ++++ ogre-1.9.0.cmake_build-fix/Samples/Browser/CMakeLists.txt 2014-06-07 22:59:19.423900980 +0400 +@@ -339,8 +339,8 @@ + + foreach(FWK ${FRAMEWORKS}) + add_custom_command(TARGET SampleBrowser POST_BUILD +- COMMAND ARGS if [ -d ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework ]\; then ln -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework ${OGRE_SAMPLE_CONTENTS_PATH}/Frameworks/${FWK}.framework\; fi +- ) ++ COMMAND ARGS if test -d ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework\; then ln -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/${FWK}.framework ${OGRE_SAMPLE_CONTENTS_PATH}/Frameworks/${FWK}.framework\; fi ++ ) + endforeach(FWK) + + # Add links for the sample plugins diff --git a/ogre-1.9.0-dynlib-allow-no-so.patch b/ogre-1.9.0-dynlib-allow-no-so.patch new file mode 100644 index 0000000..c02387b --- /dev/null +++ b/ogre-1.9.0-dynlib-allow-no-so.patch @@ -0,0 +1,23 @@ +diff -uNr ogre-1.9.0/OgreMain/src/OgreDynLib.cpp ogre-1.9.0.dynlib-allow-no-so/OgreMain/src/OgreDynLib.cpp +--- ogre-1.9.0/OgreMain/src/OgreDynLib.cpp 2013-12-01 21:28:12.000000000 +0400 ++++ ogre-1.9.0.dynlib-allow-no-so/OgreMain/src/OgreDynLib.cpp 2014-06-07 22:22:44.500257614 +0400 +@@ -76,7 +76,9 @@ + String name = mName; + #if OGRE_PLATFORM == OGRE_PLATFORM_LINUX || OGRE_PLATFORM == OGRE_PLATFORM_NACL + // dlopen() does not add .so to the filename, like windows does for .dll +- if (name.find(".so") == String::npos) ++ mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); ++ // Only add .so if open without it failed ++ if ((!mInst) && (name.find(".so") == String::npos)) + { + name += ".so."; + name += StringConverter::toString(OGRE_VERSION_MAJOR) + "."; +@@ -93,7 +95,7 @@ + if (name.substr(name.length() - 4, 4) != ".dll") + name += ".dll"; + #endif +- mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); ++ if( !mInst ) mInst = (DYNLIB_HANDLE)DYNLIB_LOAD( name.c_str() ); + #if OGRE_PLATFORM == OGRE_PLATFORM_APPLE + if(!mInst) + { diff --git a/ogre-1.9.0-glew.patch b/ogre-1.9.0-glew.patch new file mode 100644 index 0000000..06922db --- /dev/null +++ b/ogre-1.9.0-glew.patch @@ -0,0 +1,133 @@ +diff -uNr ogre-1.9.0/RenderSystems/GL/include/GL/glew.h ogre-1.9.0.glew/RenderSystems/GL/include/GL/glew.h +--- ogre-1.9.0/RenderSystems/GL/include/GL/glew.h 2014-06-07 21:12:14.000000000 +0400 ++++ ogre-1.9.0.glew/RenderSystems/GL/include/GL/glew.h 2014-06-07 21:45:03.422493324 +0400 +@@ -109,6 +109,11 @@ + #define __GLEXT_H_ + #define __gl_ATI_h_ + ++// SJS ++// Build statically ++#define GLEW_STATIC ++// SJS ++ + #if defined(_WIN32) + + /* +diff -uNr ogre-1.9.0/RenderSystems/GL/src/glew.cpp ogre-1.9.0.glew/RenderSystems/GL/src/glew.cpp +--- ogre-1.9.0/RenderSystems/GL/src/glew.cpp 2014-06-07 21:12:16.000000000 +0400 ++++ ogre-1.9.0.glew/RenderSystems/GL/src/glew.cpp 2014-06-07 21:48:09.519775784 +0400 +@@ -29,6 +29,10 @@ + ** THE POSSIBILITY OF SUCH DAMAGE. + */ + ++// SJS ++#include "OgreGLSupport.h" ++// SJS ++ + #include + + #if defined(_WIN32) +@@ -57,13 +61,21 @@ + # endif /* _WIN32 */ + # define GLEW_CONTEXT_ARG_DEF_LIST GLEWContext* ctx + #else /* GLEW_MX */ +-# define GLEW_CONTEXT_ARG_DEF_INIT void +-# define GLEW_CONTEXT_ARG_VAR_INIT +-# define GLEW_CONTEXT_ARG_DEF_LIST void +-# define WGLEW_CONTEXT_ARG_DEF_INIT void +-# define WGLEW_CONTEXT_ARG_DEF_LIST void +-# define GLXEW_CONTEXT_ARG_DEF_INIT void +-# define GLXEW_CONTEXT_ARG_DEF_LIST void ++// SJS ++# define GLEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport ++# define GLEW_CONTEXT_ARG_VAR_INIT glSupport ++# define GLEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport ++# define WGLEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport ++# define WGLEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport ++# define GLXEW_CONTEXT_ARG_DEF_INIT Ogre::GLSupport *glSupport ++# define GLXEW_CONTEXT_ARG_DEF_LIST Ogre::GLSupport *glSupport ++//# define GLEW_CONTEXT_ARG_DEF_INIT void ++//# define GLEW_CONTEXT_ARG_VAR_INIT ++//# define GLEW_CONTEXT_ARG_DEF_LIST void ++//# define WGLEW_CONTEXT_ARG_DEF_INIT void ++//# define WGLEW_CONTEXT_ARG_DEF_LIST void ++//# define GLXEW_CONTEXT_ARG_DEF_INIT void ++//# define GLXEW_CONTEXT_ARG_DEF_LIST void + #endif /* GLEW_MX */ + + #if defined(__sgi) || defined (__sun) || defined(GLEW_APPLE_GLX) +@@ -137,7 +149,7 @@ + #endif + } + /* prepend a '_' for the Unix C symbol mangling convention */ +- symbolName = malloc(strlen((const char*)name) + 2); ++ symbolName = (char*)malloc(strlen((const char*)name) + 2); + strcpy(symbolName+1, (const char*)name); + symbolName[0] = '_'; + symbol = NULL; +@@ -9481,9 +9493,11 @@ + + /* ------------------------------------------------------------------------- */ + +-#ifndef GLEW_MX +-static +-#endif ++// SJS ++//#ifndef GLEW_MX ++//static ++//#endif ++// SJS + GLenum GLEWAPIENTRY glewContextInit (GLEW_CONTEXT_ARG_DEF_LIST) + { + const GLubyte* s; +@@ -12543,7 +12557,14 @@ + { + GLboolean r = GL_FALSE; + +- r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; ++ // SJS ++ // FB: Patched to allow Ogre to overload glXGetCurrentDisplay ++ if (glXGetCurrentDisplay == NULL) ++ { ++ r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; ++ } ++ //r = ((glXGetCurrentDisplay = (PFNGLXGETCURRENTDISPLAYPROC)glewGetProcAddress((const GLubyte*)"glXGetCurrentDisplay")) == NULL) || r; ++ // SJS + + return r; + } +@@ -13476,19 +13497,21 @@ + extern GLenum GLEWAPIENTRY glxewContextInit (void); + #endif /* _WIN32 */ + +-GLenum GLEWAPIENTRY glewInit (void) +-{ +- GLenum r; +- r = glewContextInit(); +- if ( r != 0 ) return r; +-#if defined(_WIN32) +- return wglewContextInit(); +-#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ +- return glxewContextInit(); +-#else +- return r; +-#endif /* _WIN32 */ +-} ++// SJS ++//GLenum GLEWAPIENTRY glewInit (void) ++//{ ++// GLenum r; ++// r = glewContextInit(); ++// if ( r != 0 ) return r; ++//#if defined(_WIN32) ++// return wglewContextInit(); ++//#elif !defined(__ANDROID__) && !defined(__native_client__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) /* _UNIX */ ++// return glxewContextInit(); ++//#else ++// return r; ++//#endif /* _WIN32 */ ++//} ++// End SJS + + #endif /* !GLEW_MX */ + #ifdef GLEW_MX diff --git a/ogre-1.9.0-sysctl.patch b/ogre-1.9.0-sysctl.patch new file mode 100644 index 0000000..9e66710 --- /dev/null +++ b/ogre-1.9.0-sysctl.patch @@ -0,0 +1,11 @@ +--- ogre-1.9.0/OgreMain/src/OgrePlatformInformation.cpp~ 2020-05-28 22:26:51.798696996 +0100 ++++ ogre-1.9.0/OgreMain/src/OgrePlatformInformation.cpp 2020-05-28 22:27:24.901691518 +0100 +@@ -42,7 +42,7 @@ + + #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID + #include +- #elif OGRE_CPU == OGRE_CPU_ARM ++ #elif OGRE_CPU == OGRE_CPU_ARM && OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS + #include + #if __MACH__ + #include diff --git a/ogre-aarch64.patch b/ogre-aarch64.patch new file mode 100644 index 0000000..d5abe67 --- /dev/null +++ b/ogre-aarch64.patch @@ -0,0 +1,13 @@ +Index: ogre-1.9.0/OgreMain/include/OgrePlatform.h +=================================================================== +--- ogre-1.9.0.orig/OgreMain/include/OgrePlatform.h ++++ ogre-1.9.0/OgreMain/include/OgrePlatform.h +@@ -166,7 +166,7 @@ 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_) + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_64 + #else + # define OGRE_ARCH_TYPE OGRE_ARCHITECTURE_32 diff --git a/ogre-make-clean.sh b/ogre-make-clean.sh index 0152bdb..a0d1db9 100755 --- a/ogre-make-clean.sh +++ b/ogre-make-clean.sh @@ -3,32 +3,31 @@ set -e set -x -version=1.12.9 +version=1.9.0 -[ ! -e ogre-${version} ] && wget -c https://github.com/OGRECave/ogre/archive/v${version}/ogre-${version}.tar.gz +[ ! -e ogre-${version} ] + +rpm -q mercurial +hg clone https://bitbucket.org/sinbad/ogre ogre-${version} +hg archive -R ogre-${version} -r v$(echo ${version} | tr . -) -t tbz2 ogre-${version}.tar.bz2 +rm -rf ogre-${version} # Clean up -tar xf ogre-${version}.tar.gz +tar xjf ogre-${version}.tar.bz2 pushd ogre-${version} # - Non-free licensed headers under RenderSystems/GL/include/GL removed - rm RenderSystems/GL/include/GL/{gl,glext}.h + rm RenderSystems/GL/include/GL/{gl,glext,glxext,glxtokens,wglext}.h # - GLEW sources updated - # not working glew.c:1542:1: error: unknown type name 'PFNGLPROGRAMUNIFORM2IVEXTPROC'; - rpm -q glew-devel glew-debugsource - echo if package glew-debugsource is not installed, please do 'dnf debuginfo-install glew' + rpm -q glew-devel glew-debuginfo cp -f /usr/include/GL/{glew,glxew,wglew}.h RenderSystems/GL/include/GL/ - cp -f /usr/src/debug/glew-*/src/glew.c RenderSystems/GL/src/glew.c + cp -f /usr/src/debug/glew-*/src/glew.c RenderSystems/GL/src/glew.cpp + dos2unix RenderSystems/GL/src/glew.cpp - # https://github.com/OGRECave/ogre/issues/882 # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed - # rm Samples/Media/packs/chiropteraDM.{pk3,txt} - # https://github.com/OGRECave/ogre/commit/d7dc7119720a06f5d373bc6553bae1399ab5fb2e - # Samples: BSP - replace chiropteraDM by OpenArena oa_rpg3dm2 + rm Samples/Media/packs/chiropteraDM.{pk3,txt} # - Non-free textures under Samples/Media/materials/textures/nvidia removed - # rm Samples/Media/materials/textures/nvidia/* - # https://github.com/OGRECave/ogre/commit/302e970e6d56c5642f1879700ff891798c98d3b2 - # Samples: Terrain - replace proprietary nvidia textures by cc0textures + rm Samples/Media/materials/textures/nvidia/* popd -tar cJf ogre-${version}-clean.tar.xz ogre-${version} +tar cjf ogre-${version}-clean.tar.bz2 ogre-${version} diff --git a/ogre.spec b/ogre.spec index 61a4f72..b48f614 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,8 +1,6 @@ -%undefine __cmake_in_source_build - Name: ogre -Version: 1.12.9 -Release: 1%{?dist} +Version: 1.9.0 +Release: 31%{?dist} Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -11,43 +9,42 @@ Summary: Object-Oriented Graphics Rendering Engine # Public Domain - Some of the build files, samples and plugins License: MIT with exceptions 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 +# 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): # Update local glew copy # - Non-free licensed headers under RenderSystems/GL/include/GL removed # - Non-free chiropteraDM.pk3 under Samples/Media/packs removed # - Non-free textures under Samples/Media/materials/textures/nvidia -Source0: ogre-%{version}-clean.tar.xz -Source1: https://github.com/ocornut/imgui/archive/v1.77/imgui-1.77.tar.gz +Source0: %{name}-%{version}-clean.tar.bz2 Patch0: ogre-1.7.2-rpath.patch -#Patch5: ogre-1.9.0-build-rcapsdump.patch +Patch1: ogre-1.9.0-glew.patch +Patch3: ogre-1.7.2-fix-ppc-build.patch +Patch5: ogre-1.9.0-build-rcapsdump.patch Patch6: ogre-thread.patch +Patch7: ogre-1.9.0-dynlib-allow-no-so.patch +# FIXME: Patch is bogus on Fedora >= 24 +Patch8: ogre-1.9.0-cmake-freetype.patch +Patch9: ogre-1.9.0-cmake_build-fix.patch +Patch10: ogre-aarch64.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 +# Remove unnecessary inclusion of +# https://bugzilla.redhat.com/show_bug.cgi?id=1841324 +Patch12: ogre-1.9.0-sysctl.patch BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: boost-devel -BuildRequires: doxygen -BuildRequires: zziplib-devel -BuildRequires: freetype-devel -BuildRequires: libXaw-devel -BuildRequires: libXrandr-devel -BuildRequires: libXxf86vm-devel -BuildRequires: libGLU-devel -BuildRequires: ois-devel -BuildRequires: freeimage-devel -BuildRequires: openexr-devel +BuildRequires: zziplib-devel freetype-devel +BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel +BuildRequires: ois-devel freeimage-devel openexr-devel BuildRequires: glew-devel +BuildRequires: boost-devel # BuildRequires: poco-devel BuildRequires: tinyxml-devel +BuildRequires: cmake BuildRequires: libatomic BuildRequires: cppunit-devel -BuildRequires: SDL2-devel -BuildRequires: harfbuzz-devel -Buildrequires: qt5-qtbase-devel -#BuildRequires: swig > 3.0.0 -#Buildrequires: python3-devel -#Buildrequires: java-devel -Buildrequires: pugixml-devel -Buildrequires: tinyxml-devel +Provides: bundled(wxScintilla) = 1.69.2 %description OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, @@ -150,26 +147,48 @@ samples. The samples are installed in %{_libdir}/Samples/*.so and can be run using SampleBrowser. %prep -%setup -q -a1 +%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 +%if (%{?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 +%endif +%patch9 -p1 -b .cmake_build-fix +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 -%{_fixperms} . +# remove execute bits from src-files for -debuginfo package +chmod -x `find RenderSystems/GL -type f` \ + `find Samples/DeferredShading -type f` Samples/DynTex/src/DynTex.cpp +# Samples/Common/bin/resources.cfg +# Remove spurious execute bits from some Media files +chmod -x `find Samples/Media/DeferredShadingMedia -type f` +# Add mit.txt symlink for links in License.html +rm -r Docs/licenses/* +ln -s ../COPYING Docs/licenses/mit.txt +# remove included tinyxml headers to ensure use of system headers +rm Tools/XMLConverter/include/tiny* %build -%{cmake} -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 \ - -DOGRE_BUILD_DOCS:BOOL=OFF \ - -DOGRE_BUILD_DEPENDENCIES=FALSE \ - -DOGRE_BUILD_PLUGIN_CG:BOOL=OFF \ - -DOGRE_INSTALL_SAMPLES:BOOL=ON \ - -DOGRE_INSTALL_SAMPLES_SOURCE:BOOL=ON \ - -DOGRE_CONFIG_MEMTRACK_RELEASE:BOOL=OFF \ - -DIMGUI_DIR=imgui-1.77 \ - -DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=1 -Wno-dev -%{cmake_build} +pushd build + %cmake .. -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 -DOGRE_LIB_DIRECTORY=%{_lib} -DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=1 -DOGRE_BUILD_PLUGIN_CG=0 + make %{?_smp_mflags} +popd %install -%{cmake_install} +pushd build + %make_install +popd # Create config for ldconfig mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d @@ -178,15 +197,15 @@ echo "%{_libdir}/OGRE" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch # Install the samples mkdir -p %{buildroot}%{_libdir}/OGRE/Samples mkdir -p %{buildroot}%{_sysconfdir}/OGRE -for cfg in plugins.cfg resources.cfg samples.cfg; do +for cfg in plugins.cfg quakemap.cfg resources.cfg samples.cfg; do mv %{buildroot}%{_datadir}/OGRE/$cfg %{buildroot}%{_sysconfdir}/OGRE/ done # Swap out reference to non-free quake map that was removed -#cat << EOF > %{buildroot}%{_sysconfdir}/OGRE/quakemap.cfg -#Archive: /usr/share/OGRE/media/packs/ogretestmap.zip -#Map: ogretestmap.bsp -#EOF +cat << EOF > %{buildroot}%{_sysconfdir}/OGRE/quakemap.cfg +Archive: /usr/share/OGRE/media/packs/ogretestmap.zip +Map: ogretestmap.bsp +EOF # Fixing bug with wrong case for media mkdir -p %{buildroot}%{_datadir}/OGRE/ @@ -194,13 +213,7 @@ mv %{buildroot}%{_datadir}/OGRE/Media %{buildroot}%{_datadir}/OGRE/media mv %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/ROOM_NY.mesh %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/room_ny.mesh mv %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/ROOM_PY.mesh %{buildroot}%{_datadir}/OGRE/media/PCZAppMedia/room_py.mesh -rm -f %{buildroot}%{_datadir}/doc/OGRE/CMakeLists.txt -# Add mit.txt symlink for links in License.html -#rm -r Docs/licenses/* -#ln -s ../COPYING Docs/licenses/mit.txt -rm -f Docs/licenses/mit.txt -rm -rf %{buildroot}%{_datadir}/doc/OGRE/licenses/ - +rm -f %{buildroot}%{_datadir}/OGRE/docs/CMakeLists.txt # cmake macros should be in the cmake directory, not an Ogre directory mkdir -p %{buildroot}%{_datadir}/cmake/Modules @@ -211,17 +224,12 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %postun -p /sbin/ldconfig %files -%doc AUTHORS README.md -%license LICENSE Docs/licenses/* +%doc AUTHORS BUGS COPYING +%doc Docs/ChangeLog.html Docs/License.html Docs/licenses Docs/ReadMe.html Docs/style.css Docs/ogre-logo*.gif %{_libdir}/libOgreMain.so.* -%{_libdir}/libOgreBites.so.* -%{_libdir}/libOgreBitesQt.so.* -%{_libdir}/libOgreMeshLodGenerator.so.* -%{_libdir}/libOgreGLSupport.a %{_libdir}/OGRE -%{_bindir}/VRMLConverter + %{_datadir}/OGRE -%{_datadir}/doc/OGRE %dir %{_sysconfdir}/OGRE %exclude %{_bindir}/SampleBrowser %exclude %{_libdir}/OGRE/Samples @@ -250,7 +258,7 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %files utils %{_bindir}/OgreMeshUpgrader %{_bindir}/OgreXMLConverter -#{_bindir}/rcapsdump +%{_bindir}/rcapsdump %files devel %{_libdir}/lib*Ogre*.so @@ -263,21 +271,12 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %{_libdir}/OGRE/Samples %{_datadir}/OGRE/media %{_sysconfdir}/OGRE/plugins.cfg -#{_sysconfdir}/OGRE/quakemap.cfg +%{_sysconfdir}/OGRE/quakemap.cfg %{_sysconfdir}/OGRE/resources.cfg %{_sysconfdir}/OGRE/samples.cfg %changelog -* Mon Nov 23 2020 Sérgio Basto - 1.12.9-1 -- Update to 1.12.9 - -* Sun Nov 22 2020 Sérgio Basto - 1.12.6-1 -- Update to 1.12.6 -- Fix cmake build -- Use upstream source and simply remove the GL headers in %prep. -- Add Bitwise.patch for build on s390x - * Sat Aug 01 2020 Fedora Release Engineering - 1.9.0-31 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 8e9e24d..e8b7a57 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ogre-1.12.9-clean.tar.xz) = a58176c328b41a3e1b89755ed4447d8cd47f1cbaf1aefb41929cd2b1a5ece5a77775a1be4333bd6f5dc5403f4b5d1e5c1fc0a60fc5f4d8bf38016c919099f972 -SHA512 (imgui-1.77.tar.gz) = d5ebf4bb5e1ce83b226f2e68b3afe0f0abaeb55245fedf754e5453afd8d1df4dac8b5c47fc284c2588b40d05a55fc191b5e55c7be279c5e5e23f7c5b70150546 +6a3ffaa8389e6a4323fc505263137bfd ogre-1.9.0-clean.tar.bz2 From 8b355a3404ac0c616713dc7d100e79f184aa68a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 4 Dec 2020 00:28:03 +0000 Subject: [PATCH 16/55] Fix cmake build --- ogre.spec | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/ogre.spec b/ogre.spec index b48f614..1d8fe3f 100644 --- a/ogre.spec +++ b/ogre.spec @@ -1,6 +1,9 @@ +%undefine __cmake_in_source_build + Name: ogre Version: 1.9.0 -Release: 31%{?dist} +Release: 32%{?dist} +Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library # CC-BY-SA - devel docs @@ -180,15 +183,11 @@ ln -s ../COPYING Docs/licenses/mit.txt rm Tools/XMLConverter/include/tiny* %build -pushd build - %cmake .. -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 -DOGRE_LIB_DIRECTORY=%{_lib} -DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=1 -DOGRE_BUILD_PLUGIN_CG=0 - make %{?_smp_mflags} -popd +%cmake -DOGRE_FULL_RPATH=0 -DCMAKE_SKIP_RPATH=1 -DOGRE_LIB_DIRECTORY=%{_lib} -DOGRE_BUILD_RTSHADERSYSTEM_EXT_SHADERS=1 -DOGRE_BUILD_PLUGIN_CG=0 +%cmake_build %install -pushd build - %make_install -popd +%cmake_install # Create config for ldconfig mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d @@ -219,10 +218,6 @@ rm -f %{buildroot}%{_datadir}/OGRE/docs/CMakeLists.txt mkdir -p %{buildroot}%{_datadir}/cmake/Modules mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %files %doc AUTHORS BUGS COPYING %doc Docs/ChangeLog.html Docs/License.html Docs/licenses Docs/ReadMe.html Docs/style.css Docs/ogre-logo*.gif @@ -277,6 +272,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Dec 04 2020 Sérgio Basto - 1:1.9.0-32 +- Fix cmake build + * Sat Aug 01 2020 Fedora Release Engineering - 1.9.0-31 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 20aa504f3f00d9d993399cd041c4998e7d0da7f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 5 Dec 2020 00:04:25 +0000 Subject: [PATCH 17/55] Fix epoch --- ogre.spec | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/ogre.spec b/ogre.spec index 1d8fe3f..65eb8ab 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 32%{?dist} +Release: 33%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -12,7 +12,7 @@ Summary: Object-Oriented Graphics Rendering Engine # Public Domain - Some of the build files, samples and plugins License: MIT with exceptions 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 +# 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): # Update local glew copy # - Non-free licensed headers under RenderSystems/GL/include/GL removed @@ -60,7 +60,7 @@ intuitive classes. %package paging Summary: OGRE component for terrain paging -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description paging Provides paging functionality. In essence it allows worlds to be rendered @@ -68,7 +68,7 @@ and loaded at the same time. %package property Summary: OGRE component for property introspection -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description property OGRE's property system allows you to associate values of arbitrary type with @@ -76,7 +76,7 @@ names, and have those values exposed via a self-describing interface. %package rtss Summary: OGRE RT Shader System component -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description rtss The Real Time Shader System, or RTSS for short, is a component of Ogre. This @@ -85,7 +85,7 @@ properties, scene setup and other user definitions. %package terrain Summary: OGRE component for terrain rendering -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description terrain OGRE's terrain component provides rendering of terrain represented by @@ -93,7 +93,7 @@ heightmaps. %package overlay Summary: OGRE overlay component -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description overlay Overlays allow you to render 2D and 3D elements on top of the normal scene @@ -102,7 +102,7 @@ status panels etc. %package volume Summary: OGRE component for volume rendering -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description volume This component used to render volumes. It can handle any volume data but @@ -110,7 +110,7 @@ featurewise has a tedency towards terrains. %package utils Summary: OGRE production pipeline utilities -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description utils Contains OgreXMLConverter, it can take .mesh.xml files and convert them into @@ -120,20 +120,20 @@ them to the latest version. %package devel Summary: Ogre header files and documentation -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-paging%{?_isa} = %{version}-%{release} -Requires: %{name}-property%{?_isa} = %{version}-%{release} -Requires: %{name}-rtss%{?_isa} = %{version}-%{release} -Requires: %{name}-terrain%{?_isa} = %{version}-%{release} -Requires: %{name}-overlay%{?_isa} = %{version}-%{release} -Requires: %{name}-volume%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-paging%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-property%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-rtss%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-terrain%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-overlay%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-volume%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: pkgconfig # Requires: poco-devel Requires: boost-devel Requires: glew-devel Requires: cmake -Obsoletes: %{name}-devel-doc <= %{version}-%{release} +Obsoletes: %{name}-devel-doc <= %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains the header files for Ogre. @@ -141,7 +141,7 @@ Install this package if you want to develop programs that use Ogre. %package samples Summary: Ogre samples executables and media -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} %description samples This package contains the compiled (not the source) sample applications coming @@ -158,7 +158,7 @@ mkdir build %patch5 -p1 -b .build-rcapsdump %patch6 -p0 -b .thread %patch7 -p1 -b .dynlib-allow-no-so -%if (%{?fedora} > 20) && (0%{?fedora} < 24) +%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 @@ -272,6 +272,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Sat Dec 05 2020 Sérgio Basto - 1:1.9.0-33 +- Fix epoch + * Fri Dec 04 2020 Sérgio Basto - 1:1.9.0-32 - Fix cmake build From e3cf8f4af19e606593a42130b1fdcc2c4b8f3af4 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 4 Dec 2020 21:23:41 -0700 Subject: [PATCH 18/55] - Make comparison object invocable as const for gcc-11 --- ogre-gcc11.patch | 13 +++++++++++++ ogre.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 ogre-gcc11.patch diff --git a/ogre-gcc11.patch b/ogre-gcc11.patch new file mode 100644 index 0000000..cbba1b9 --- /dev/null +++ b/ogre-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/Samples/Common/include/Sample.h b/Samples/Common/include/Sample.h +index 6064d8f..e6851a4 100644 +--- a/Samples/Common/include/Sample.h ++++ b/Samples/Common/include/Sample.h +@@ -63,7 +63,7 @@ namespace OgreBites + =============================================================================*/ + struct Comparer + { +- bool operator() (Sample* a, Sample* b) ++ bool operator() (Sample* a, Sample* b) const + { + Ogre::NameValuePairList::iterator aTitle = a->getInfo().find("Title"); + Ogre::NameValuePairList::iterator bTitle = b->getInfo().find("Title"); diff --git a/ogre.spec b/ogre.spec index 65eb8ab..830da7e 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 33%{?dist} +Release: 34%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -36,6 +36,7 @@ Patch11: 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 BuildRequires: gcc-c++ BuildRequires: zziplib-devel freetype-devel BuildRequires: libXaw-devel libXrandr-devel libXxf86vm-devel libGLU-devel @@ -169,6 +170,7 @@ mkdir build %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 # remove execute bits from src-files for -debuginfo package chmod -x `find RenderSystems/GL -type f` \ @@ -272,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Dec 04 2020 Jeff Law - 1:1.9.0-34 +- Make comparison object invocable as const for gcc-11 + * Sat Dec 05 2020 Sérgio Basto - 1:1.9.0-33 - Fix epoch From fc8580ec72762e3ef5a05a02e7a4844ce6a9d177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 5 Dec 2020 17:50:35 +0000 Subject: [PATCH 19/55] Updates changelog with the builds that was rolled back --- ogre.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ogre.spec b/ogre.spec index 830da7e..2a76850 100644 --- a/ogre.spec +++ b/ogre.spec @@ -283,6 +283,15 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules * Fri Dec 04 2020 Sérgio Basto - 1:1.9.0-32 - Fix cmake build +* Mon Nov 23 2020 Sérgio Basto - 1.12.9-1 +- Update to 1.12.9 + +* Sun Nov 22 2020 Sérgio Basto - 1.12.6-1 +- Update to 1.12.6 +- Fix cmake build +- Use upstream source and simply remove the GL headers in %prep. +- Add Bitwise.patch for build on s390x + * Sat Aug 01 2020 Fedora Release Engineering - 1.9.0-31 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3dba983b66868a3171f7a3fe83412eaf5c692c27 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 22 Jan 2021 20:53:30 +0000 Subject: [PATCH 20/55] Rebuilt for Boost 1.75 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 2a76850..3b0e200 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 34%{?dist} +Release: 35%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Jan 22 2021 Jonathan Wakely - 1:1.9.0-35 +- Rebuilt for Boost 1.75 + * Fri Dec 04 2020 Jeff Law - 1:1.9.0-34 - Make comparison object invocable as const for gcc-11 From ef51fd4c4e1b965378051c03aa7d0d0a2ba4eff6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 22:20:09 +0000 Subject: [PATCH 21/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 3b0e200..b44339e 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 35%{?dist} +Release: 36%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1:1.9.0-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jan 22 2021 Jonathan Wakely - 1:1.9.0-35 - Rebuilt for Boost 1.75 From 0566be34f9794ecf356c0cf010a925bc4e1509bc Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:36:01 +0100 Subject: [PATCH 22/55] Rebuilt for removed libstdc++ symbol (#1937698) --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index b44339e..c2a26eb 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 36%{?dist} +Release: 37%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Tue Mar 30 2021 Jonathan Wakely - 1:1.9.0-37 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Tue Jan 26 2021 Fedora Release Engineering - 1:1.9.0-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From b1a03f793895d916263a31465699b0bb34722643 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:02:18 +0000 Subject: [PATCH 23/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index c2a26eb..15af96b 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 37%{?dist} +Release: 38%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1:1.9.0-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Mar 30 2021 Jonathan Wakely - 1:1.9.0-37 - Rebuilt for removed libstdc++ symbol (#1937698) From 4942ad23037d93a9b5324d052464aa5921fdebc6 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 6 Aug 2021 23:26:35 +0100 Subject: [PATCH 24/55] Rebuilt for Boost 1.76 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 15af96b..317492a 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 38%{?dist} +Release: 39%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Aug 06 2021 Jonathan Wakely - 1:1.9.0-39 +- Rebuilt for Boost 1.76 + * Thu Jul 22 2021 Fedora Release Engineering - 1:1.9.0-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d8f780c1e329460020030eb95a22e516dd766e05 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 22:10:22 +0000 Subject: [PATCH 25/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 317492a..4612e25 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 39%{?dist} +Release: 40%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1:1.9.0-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Aug 06 2021 Jonathan Wakely - 1:1.9.0-39 - Rebuilt for Boost 1.76 From bfdd7efc7eefda649dd3e6467da93490bd33b4d0 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:40:43 +0200 Subject: [PATCH 26/55] Rebuilt for Boost 1.78 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 4612e25..97abe4c 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 40%{?dist} +Release: 41%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Wed May 04 2022 Thomas Rodgers - 1:1.9.0-41 +- Rebuilt for Boost 1.78 + * Thu Jan 20 2022 Fedora Release Engineering - 1:1.9.0-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e11b9cd48ce62f39d9ef10a170d80c6f555c7593 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 01:49:54 +0000 Subject: [PATCH 27/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 97abe4c..adddbf6 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 41%{?dist} +Release: 42%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1:1.9.0-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed May 04 2022 Thomas Rodgers - 1:1.9.0-41 - Rebuilt for Boost 1.78 From 92a91da1728746edafe6b4a1f4268f3cb64f555e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 22:36:25 +0000 Subject: [PATCH 28/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index adddbf6..ddc5132 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 42%{?dist} +Release: 43%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1:1.9.0-43 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 1:1.9.0-42 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d9543125f9c01bba29e2058b6d2667fdc47a4d50 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 21:56:03 +0000 Subject: [PATCH 29/55] Rebuilt for Boost 1.81 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index ddc5132..b109b1a 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 43%{?dist} +Release: 44%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Mon Feb 20 2023 Jonathan Wakely - 1:1.9.0-44 +- Rebuilt for Boost 1.81 + * Thu Jan 19 2023 Fedora Release Engineering - 1:1.9.0-43 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ac3180ea9f5c005f4a5a24fe60ba57d7bf3b8cea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 17:49:43 +0000 Subject: [PATCH 30/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index b109b1a..904b251 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 44%{?dist} +Release: 45%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1:1.9.0-45 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Mon Feb 20 2023 Jonathan Wakely - 1:1.9.0-44 - Rebuilt for Boost 1.81 From ebe537f77217bc0cd2b8a8ad01997f835339dc07 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Wed, 17 Jan 2024 22:41:23 +0000 Subject: [PATCH 31/55] Rebuilt for Boost 1.83 --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index 904b251..ca66713 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 45%{?dist} +Release: 46%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Wed Jan 17 2024 Jonathan Wakely - 1:1.9.0-46 +- Rebuilt for Boost 1.83 + * Thu Jul 20 2023 Fedora Release Engineering - 1:1.9.0-45 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From c0bee79b423db25f5d6e4ea7c120677d20b38588 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 10:50:58 +0000 Subject: [PATCH 32/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index ca66713..ccc064e 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 46%{?dist} +Release: 47%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1:1.9.0-47 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 17 2024 Jonathan Wakely - 1:1.9.0-46 - Rebuilt for Boost 1.83 From 89de5c5f539506450469989639ee94eb45e1af5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 10:58:56 +0000 Subject: [PATCH 33/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ogre.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ogre.spec b/ogre.spec index ccc064e..c9b173a 100644 --- a/ogre.spec +++ b/ogre.spec @@ -2,7 +2,7 @@ Name: ogre Version: 1.9.0 -Release: 47%{?dist} +Release: 48%{?dist} Epoch: 1 Summary: Object-Oriented Graphics Rendering Engine # MIT with exceptions - main library @@ -274,6 +274,9 @@ mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1:1.9.0-48 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1:1.9.0-47 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 61af5712478d3a02e725f04fe500b147420fc625 Mon Sep 17 00:00:00 2001 From: U2FsdGVkX1 Date: Mon, 26 Feb 2024 15:40:45 +0800 Subject: [PATCH 34/55] 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 35/55] 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 36/55] 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 37/55] 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 38/55] 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 39/55] 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 40/55] 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 41/55] 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 42/55] 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 43/55] 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 44/55] 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 45/55] 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 46/55] 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 47/55] 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 48/55] 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 49/55] 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 50/55] 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 51/55] 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 52/55] 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 53/55] 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 54/55] 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 55/55] 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