From 61af5712478d3a02e725f04fe500b147420fc625 Mon Sep 17 00:00:00 2001 From: U2FsdGVkX1 Date: Feb 26 2024 07:40:45 +0000 Subject: Add riscv64 support --- 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