[packages/ogre] - up to 13.3.1
baggins
baggins at pld-linux.org
Fri Mar 11 10:56:29 CET 2022
commit ac0c65a8ac8e5242dd5db1d4654431cb8248d898
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Mar 11 10:56:11 2022 +0100
- up to 13.3.1
ogre-python.patch | 4 ++--
ogre.spec | 28 ++++++++++++----------------
x32.patch | 11 -----------
3 files changed, 14 insertions(+), 29 deletions(-)
---
diff --git a/ogre.spec b/ogre.spec
index 36e5509..df69a0c 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -25,12 +25,12 @@
Summary: Object-oriented Graphics Rendering Engine
Summary(pl.UTF-8): OGRE - zorientowany obiektowo silnik renderowania grafiki
Name: ogre
-Version: 1.12.13
+Version: 13.3.1
Release: 1
License: MIT
Group: Applications/Graphics
Source0: https://github.com/OGRECave/ogre/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 907c68d19e16806462f14b9746a27411
+# Source0-md5: 60e71378fb97e4ff37012e9c162dafea
Patch0: %{name}-python.patch
Patch1: x32.patch
URL: https://www.ogre3d.org/
@@ -126,7 +126,6 @@ cd build
%cmake .. \
-DCMAKE_CXX_FLAGS="%{rpmcxxflags}" \
-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:None} \
- -DOGRE_BUILD_COMPONENT_HLMS=TRUE \
%{cmake_on_off dotnet OGRE_BUILD_COMPONENT_CSHARP} \
%{cmake_on_off java OGRE_BUILD_COMPONENT_JAVA} \
%{cmake_on_off python OGRE_BUILD_COMPONENT_PYTHON} \
@@ -165,17 +164,16 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/OgreMeshUpgrader
%attr(755,root,root) %{_bindir}/OgreXMLConverter
%attr(755,root,root) %{_bindir}/VRMLConverter
-%attr(755,root,root) %{_libdir}/libOgreBites.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreBitesQt.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreHLMS.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreMain.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreMeshLodGenerator.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreOverlay.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgrePaging.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreProperty.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreRTShaderSystem.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreTerrain.so.*.*.*
-%attr(755,root,root) %{_libdir}/libOgreVolume.so.*.*.*
+%attr(755,root,root) %{_libdir}/libOgreBites.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreBitesQt.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreMain.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreMeshLodGenerator.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreOverlay.so.*.*
+%attr(755,root,root) %{_libdir}/libOgrePaging.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreProperty.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreRTShaderSystem.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreTerrain.so.*.*
+%attr(755,root,root) %{_libdir}/libOgreVolume.so.*.*
%dir %{_libdir}/OGRE
%attr(755,root,root) %{_libdir}/OGRE/Codec_Assimp.so*
%{?with_openexr:%attr(755,root,root) %{_libdir}/OGRE/Codec_EXR.so*}
@@ -202,7 +200,6 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libOgreBites.so
%attr(755,root,root) %{_libdir}/libOgreBitesQt.so
-%attr(755,root,root) %{_libdir}/libOgreHLMS.so
%attr(755,root,root) %{_libdir}/libOgreMain.so
%attr(755,root,root) %{_libdir}/libOgreMeshLodGenerator.so
%attr(755,root,root) %{_libdir}/libOgreOverlay.so
@@ -214,7 +211,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/OGRE
%{_pkgconfigdir}/OGRE.pc
%{_pkgconfigdir}/OGRE-Bites.pc
-%{_pkgconfigdir}/OGRE-HLMS.pc
%{_pkgconfigdir}/OGRE-MeshLodGenerator.pc
%{_pkgconfigdir}/OGRE-Overlay.pc
%{_pkgconfigdir}/OGRE-Paging.pc
diff --git a/ogre-python.patch b/ogre-python.patch
index e64d7fa..755e4eb 100644
--- a/ogre-python.patch
+++ b/ogre-python.patch
@@ -1,14 +1,14 @@
--- ogre-1.12.13/CMake/Dependencies.cmake.orig 2021-08-04 20:33:45.000000000 +0200
+++ ogre-1.12.13/CMake/Dependencies.cmake 2022-02-07 22:53:08.197330225 +0100
@@ -298,8 +298,7 @@ find_package(OpenEXR)
- macro_log_feature(OPENEXR_FOUND "OpenEXR" "Load High dynamic range images" "http://www.openexr.com/" FALSE "" "")
+ macro_log_feature(OPENEXR_FOUND "OpenEXR" "Load High dynamic range images" "http://www.openexr.com/")
# Python
-set(Python_ADDITIONAL_VERSIONS 3.4) # allows using python3 on Ubuntu 14.04
-find_package(PythonInterp)
+find_package(PythonInterp 3)
find_package(PythonLibs)
- macro_log_feature(PYTHONLIBS_FOUND "Python" "Language bindings to use OGRE from Python" "http://www.python.org/" FALSE "" "")
+ macro_log_feature(PYTHONLIBS_FOUND "Python" "Language bindings to use OGRE from Python" "http://www.python.org/")
--- ogre-1.12.13/Components/Python/CMakeLists.txt.orig 2021-08-04 20:33:45.000000000 +0200
+++ ogre-1.12.13/Components/Python/CMakeLists.txt 2022-02-07 21:18:38.364713012 +0100
diff --git a/x32.patch b/x32.patch
index 8af5cf2..bf2a241 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,14 +1,3 @@
---- ogre-1.12.13/OgreMain/include/OgrePlatform.h.orig 2022-02-07 17:47:25.723366601 +0100
-+++ ogre-1.12.13/OgreMain/include/OgrePlatform.h 2022-02-07 17:48:50.842905469 +0100
-@@ -75,7 +75,7 @@ namespace Ogre {
- #endif
-
- /* Find the arch type */
--#if defined(__x86_64__) || defined(_M_X64) || defined(_M_X64) || defined(_M_AMD64) \
-+#if ((defined(__x86_64__) || defined(_M_X64) || defined(_M_X64) || defined(_M_AMD64)) && !defined(__ILP32__)) \
- || defined(__ppc64__) \
- || defined(__arm64__) || defined(__aarch64__) || defined(_M_ARM64) \
- || defined(__mips64) || defined(__mips64_) \
--- ogre-1.12.13/OgreMain/src/OgrePlatformInformation.cpp.orig 2021-08-04 20:33:45.000000000 +0200
+++ ogre-1.12.13/OgreMain/src/OgrePlatformInformation.cpp 2022-02-07 17:47:25.726699917 +0100
@@ -118,7 +118,7 @@ namespace Ogre {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ogre.git/commitdiff/ac0c65a8ac8e5242dd5db1d4654431cb8248d898
More information about the pld-cvs-commit
mailing list