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.7.2-rpath.patch b/ogre-1.7.2-rpath.patch new file mode 100644 index 0000000..05ff563 --- /dev/null +++ b/ogre-1.7.2-rpath.patch @@ -0,0 +1,10 @@ +diff -up ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in.rpath ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in +--- ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in.rpath 2010-12-20 14:34:20.659800000 -0500 ++++ ogre-1.7.2/CMake/Templates/OGRE-PCZ.pc.in 2010-12-20 14:34:25.549800001 -0500 +@@ -7,5 +7,5 @@ Name: OGRE-PCZ + Description: Portal-Connected Zone Scene Manager for OGRE + Version: @OGRE_VERSION@ + Requires: OGRE = @OGRE_VERSION@ +-Libs: ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX@Plugin_PCZSceneManager@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@ ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX@Plugin_OctreeZone@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@ -Wl,-rpath,${libdir}/OGRE ++Libs: ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX@Plugin_PCZSceneManager@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@ ${libdir}/OGRE/@OGRE_PLUGIN_PREFIX@Plugin_OctreeZone@OGRE_LIB_SUFFIX@@OGRE_PLUGIN_EXT@ + Cflags: -I${includedir}/OGRE/Plugins/PCZSceneManager -I${includedir}/OGRE/Plugins/OctreeZone @OGRE_CFLAGS@ 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-clean.tar.bz2 b/ogre-1.9.0-clean.tar.bz2 new file mode 100644 index 0000000..1f26097 Binary files /dev/null and b/ogre-1.9.0-clean.tar.bz2 differ 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-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff b/ogre-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff new file mode 100644 index 0000000..c306520 --- /dev/null +++ b/ogre-a24ac4afbbb9dc5ff49a61634af50da11ba8fb97.diff @@ -0,0 +1,121 @@ +# HG changeset patch +# User David Rogers +# Date 1387963977 21600 +# Branch v1-9 +# Node ID a24ac4afbbb9dc5ff49a61634af50da11ba8fb97 +# Parent de9ed8c143d87fc54ee9979db142d3410245fcf0 +[OGRE-357] Resolve link errors due to incorrect template creation that is a allowed by some compilers but isn’t actually correct c++ usage. + +diff --git a/OgreMain/include/OgreProgressiveMeshGenerator.h b/OgreMain/include/OgreProgressiveMeshGenerator.h +--- a/OgreMain/include/OgreProgressiveMeshGenerator.h ++++ b/OgreMain/include/OgreProgressiveMeshGenerator.h +@@ -34,6 +34,7 @@ + #include "OgreSmallVector.h" + #include "OgreMesh.h" + #include "OgreLodConfig.h" ++#include "OgreLogManager.h" + + namespace Ogre + { +@@ -214,9 +215,44 @@ + size_t calcLodVertexCount(const LodLevel& lodConfig); + void tuneContainerSize(); + void addVertexData(VertexData* vertexData, bool useSharedVertexLookup); +- template +- void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, VertexLookupList& lookup, unsigned short submeshID); + void addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID); ++ template ++ void addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, ++ VertexLookupList& lookup, ++ unsigned short submeshID) ++ { ++ ++ // Loop through all triangles and connect them to the vertices. ++ for (; iPos < iEnd; iPos += 3) { ++ // It should never reallocate or every pointer will be invalid. ++ OgreAssert(mTriangleList.capacity() > mTriangleList.size(), ""); ++ mTriangleList.push_back(PMTriangle()); ++ PMTriangle* tri = &mTriangleList.back(); ++ tri->isRemoved = false; ++ tri->submeshID = submeshID; ++ for (int i = 0; i < 3; i++) { ++ // Invalid index: Index is bigger then vertex buffer size. ++ OgreAssert(iPos[i] < lookup.size(), ""); ++ tri->vertexID[i] = iPos[i]; ++ tri->vertex[i] = lookup[iPos[i]]; ++ } ++ if (tri->isMalformed()) { ++#if OGRE_DEBUG_MODE ++ stringstream str; ++ str << "In " << mMeshName << " malformed triangle found with ID: " << getTriangleID(tri) << ". " << ++ std::endl; ++ printTriangle(tri, str); ++ str << "It will be excluded from LOD level calculations."; ++ LogManager::getSingleton().stream() << str.str(); ++#endif ++ tri->isRemoved = true; ++ mIndexBufferInfoList[tri->submeshID].indexCount -= 3; ++ continue; ++ } ++ tri->computeNormal(); ++ addTriangleToEdges(tri); ++ } ++ } + + void computeCosts(); + bool isBorderVertex(const PMVertex* vertex) const; +diff --git a/OgreMain/src/OgreProgressiveMeshGenerator.cpp b/OgreMain/src/OgreProgressiveMeshGenerator.cpp +--- a/OgreMain/src/OgreProgressiveMeshGenerator.cpp ++++ b/OgreMain/src/OgreProgressiveMeshGenerator.cpp +@@ -45,7 +45,6 @@ + #include "OgreSubMesh.h" + #include "OgreMesh.h" + #include "OgreLodStrategy.h" +-#include "OgreLogManager.h" + #include "OgrePixelCountLodStrategy.h" + + namespace Ogre +@@ -219,43 +218,6 @@ + } + vbuf->unlock(); + } +-template +-void ProgressiveMeshGenerator::addIndexDataImpl(IndexType* iPos, const IndexType* iEnd, +- VertexLookupList& lookup, +- unsigned short submeshID) +-{ +- +- // Loop through all triangles and connect them to the vertices. +- for (; iPos < iEnd; iPos += 3) { +- // It should never reallocate or every pointer will be invalid. +- OgreAssert(mTriangleList.capacity() > mTriangleList.size(), ""); +- mTriangleList.push_back(PMTriangle()); +- PMTriangle* tri = &mTriangleList.back(); +- tri->isRemoved = false; +- tri->submeshID = submeshID; +- for (int i = 0; i < 3; i++) { +- // Invalid index: Index is bigger then vertex buffer size. +- OgreAssert(iPos[i] < lookup.size(), ""); +- tri->vertexID[i] = iPos[i]; +- tri->vertex[i] = lookup[iPos[i]]; +- } +- if (tri->isMalformed()) { +-#if OGRE_DEBUG_MODE +- stringstream str; +- str << "In " << mMeshName << " malformed triangle found with ID: " << getTriangleID(tri) << ". " << +- std::endl; +- printTriangle(tri, str); +- str << "It will be excluded from LOD level calculations."; +- LogManager::getSingleton().stream() << str.str(); +-#endif +- tri->isRemoved = true; +- mIndexBufferInfoList[tri->submeshID].indexCount -= 3; +- continue; +- } +- tri->computeNormal(); +- addTriangleToEdges(tri); +- } +-} + + void ProgressiveMeshGenerator::addIndexData(IndexData* indexData, bool useSharedVertexLookup, unsigned short submeshID) + { 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-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-thread.patch b/ogre-thread.patch new file mode 100644 index 0000000..0a523b0 --- /dev/null +++ b/ogre-thread.patch @@ -0,0 +1,18 @@ +--- CMake/ConfigureBuild.cmake.thread 2012-09-02 00:27:14.000000000 -0500 ++++ CMake/ConfigureBuild.cmake 2012-12-09 23:48:31.709984746 -0600 +@@ -178,10 +178,13 @@ + if (OGRE_CONFIG_THREADS GREATER 0) + set(OGRE_CFLAGS "-pthread") + set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lpthread") ++ if (OGRE_THREAD_PROVIDER EQUAL 1) ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost_system") ++ endif () + endif () + if (OGRE_STATIC) + if (OGRE_CONFIG_THREADS) +- set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost-thread-mt") ++ set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost-thread") + endif () + # there is no pkgconfig file for freeimage, so we need to add that lib manually + set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage") + diff --git a/ogre.spec b/ogre.spec new file mode 100644 index 0000000..ed49ca8 --- /dev/null +++ b/ogre.spec @@ -0,0 +1,736 @@ +%undefine __cmake_in_source_build + +Name: ogre +Version: 1.9.0 +Release: 48%{?dist} +Epoch: 1 +Summary: Object-Oriented Graphics Rendering Engine +# MIT with exceptions - main library +# CC-BY-SA - devel docs +# Freely redistributable without restriction - most of samples content +# MIT - shaders for DeferredShadingMedia samples +# Public Domain - Some of the build files, samples and plugins +License: MIT with exceptions 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): +# 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 +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 +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: %{name}-gcc11.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: boost-devel +# BuildRequires: poco-devel +BuildRequires: tinyxml-devel +BuildRequires: cmake +BuildRequires: libatomic +BuildRequires: cppunit-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 +intuitive for developers to produce applications utilizing +hardware-accelerated 3D graphics. The class library abstracts all the +details of using the underlying system libraries like Direct3D and +OpenGL and provides an interface based on world objects and other +intuitive classes. + +%package paging +Summary: OGRE component for terrain paging +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description paging +Provides paging functionality. In essence it allows worlds to be rendered +and loaded at the same time. + +%package property +Summary: OGRE component for property introspection +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description property +OGRE's property system allows you to associate values of arbitrary type with +names, and have those values exposed via a self-describing interface. + +%package rtss +Summary: OGRE RT Shader System component +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description rtss +The Real Time Shader System, or RTSS for short, is a component of Ogre. This +component is used to generate shaders on the fly based on object material +properties, scene setup and other user definitions. + +%package terrain +Summary: OGRE component for terrain rendering +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description terrain +OGRE's terrain component provides rendering of terrain represented by +heightmaps. + +%package overlay +Summary: OGRE overlay component +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description overlay +Overlays allow you to render 2D and 3D elements on top of the normal scene +contents to create effects like heads-up displays (HUDs), menu systems, +status panels etc. + +%package volume +Summary: OGRE component for volume rendering +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description volume +This component used to render volumes. It can handle any volume data but +featurewise has a tedency towards terrains. + +%package utils +Summary: OGRE production pipeline utilities +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description utils +Contains OgreXMLConverter, it can take .mesh.xml files and convert them into +their binary variant. +Also provides OgreMeshUpgrader that can load old Ogre .mesh files and upgrade +them to the latest version. + +%package devel +Summary: Ogre header files and documentation +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 <= %{?epoch:%{epoch}:}%{version}-%{release} + +%description devel +This package contains the header files for Ogre. +Install this package if you want to develop programs that use Ogre. + +%package samples +Summary: Ogre samples executables and media +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description samples +This package contains the compiled (not the source) sample applications coming +with Ogre. It also contains some media (meshes, textures,...) needed by these +samples. The samples are installed in %{_libdir}/Samples/*.so and can be run +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 +%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 +%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* + +%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_build + +%install +%make_install + +# Create config for ldconfig +mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d +echo "%{_libdir}/OGRE" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf + +# 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 + 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 + +# Fixing bug with wrong case for media +mkdir -p %{buildroot}%{_datadir}/OGRE/ +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 + +# cmake macros should be in the cmake directory, not an Ogre directory +mkdir -p %{buildroot}%{_datadir}/cmake/Modules +mv %{buildroot}%{_libdir}/OGRE/cmake/* %{buildroot}%{_datadir}/cmake/Modules + +%files +%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}/OGRE + +%{_datadir}/OGRE +%dir %{_sysconfdir}/OGRE +%exclude %{_bindir}/SampleBrowser +%exclude %{_libdir}/OGRE/Samples +%exclude %{_libdir}/OGRE/cmake +%exclude %{_datadir}/OGRE/media +%config(noreplace) %{_sysconfdir}/ld.so.conf.d/* + +%files paging +%{_libdir}/libOgrePaging.so.* + +%files property +%{_libdir}/libOgreProperty.so.* + +%files rtss +%{_libdir}/libOgreRTShaderSystem.so.* + +%files terrain +%{_libdir}/libOgreTerrain.so.* + +%files overlay +%{_libdir}/libOgreOverlay.so.* + +%files volume +%{_libdir}/libOgreVolume.so.* + +%files utils +%{_bindir}/OgreMeshUpgrader +%{_bindir}/OgreXMLConverter +%{_bindir}/rcapsdump + +%files devel +%{_libdir}/lib*Ogre*.so +%{_datadir}/cmake/Modules/* +%{_includedir}/OGRE +%{_libdir}/pkgconfig/*.pc + +%files samples +%{_bindir}/SampleBrowser +%{_libdir}/OGRE/Samples +%{_datadir}/OGRE/media +%{_sysconfdir}/OGRE/plugins.cfg +%{_sysconfdir}/OGRE/quakemap.cfg +%{_sysconfdir}/OGRE/resources.cfg +%{_sysconfdir}/OGRE/samples.cfg + + +%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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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) + +* 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 + +* 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 + +* 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 + +* 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) + +* 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 + +* 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 + +* 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 + +* Tue Jan 23 2018 Jonathan Wakely - 1.9.0-22 +- Rebuilt for Boost 1.66 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.9.0-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.9.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 19 2017 Jonathan Wakely - 1.9.0-19 +- Rebuilt for s390x binutils bug + +* Mon Jul 03 2017 Jonathan Wakely - 1.9.0-18 +- Rebuilt for Boost 1.64 + +* Sat Feb 11 2017 Fedora Release Engineering - 1.9.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jan 31 2017 Jonathan Wakely - 1.9.0-16 +- Rebuilt for Boost 1.63 + +* Thu Feb 04 2016 Fedora Release Engineering - 1.9.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Feb 01 2016 Ralf Corsépius - 1.9.0-14 +- Do not apply ogre-1.9.0-cmake-freetype.patch on fedora >= 24 (Fix FTBS). + +* Thu Aug 27 2015 Jonathan Wakely - 1.9.0-13 +- Rebuilt for Boost 1.59 + +* Wed Jul 29 2015 Fedora Release Engineering - 1.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159 + +* Wed Jul 22 2015 David Tardon - 1.9.0-11 +- rebuild for Boost 1.58 + +* Tue Jul 07 2015 Bruno Wolff III = 1.9.0-10 +- ogre-devel requires glew-devel for headers + +* Wed Jun 17 2015 Fedora Release Engineering - 1.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 21 2015 Orion Poplawski - 1.9.0-8 +- Add patch to resolve link errors due to incorrect template creation (fix FTBFS bug #1223612) + +* Mon May 04 2015 Jason L Tibbitts III - 1.9.0-8 +- Indicate that this package bundles wxScintilla 1.69.2. + +* Thu Mar 26 2015 Kalev Lember - 1.9.0-7 +- Rebuilt for GCC 5 ABI change + +* Tue Jan 27 2015 Petr Machata - 1.9.0-6 +- Rebuild for boost 1.57.0 + +* Sun Aug 17 2014 Fedora Release Engineering - 1.9.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Tue Jun 17 2014 Marcin Juszkiewicz - 1.9.0-4 +- fixed AArch64 identification macro + +* Sun Jun 08 2014 Igor Gnatenko - 1.9.0-3 +- properly obsolete ogre-devel-doc + +* Sun Jun 08 2014 Igor Gnatenko - 1.9.0-2 +- obsolete ogre-devel-doc +- fix requiring base package + +* Sat Jun 07 2014 Igor Gnatenko - 1.9.0-1 +- 1.9.0 upstream release (RHBZ #1104309) +- cleanup spec + +* Sat Jun 07 2014 Fedora Release Engineering - 1.8.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 23 2014 Petr Machata - 1.8.1-11 +- Rebuild for boost 1.55.0 +- Fix detection of libfreetype (ogre-1.8.1-cmake-freetype.patch) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.8.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun Jul 28 2013 Petr Machata - 1.8.1-9 +- Update ogre-thread.patch to exclude -mt suffix from Boost.Thread and + Boost.System DSO's. + +* Sat Jul 27 2013 Petr Machata - 1.8.1-8 +- Rebuild for boost 1.54.0 + +* Sat Apr 20 2013 Bruno Wolff III - 1.8.1-7 +- cmake scripts need to be at the top level +- Fix MODULES/Modules oops + +* Sat Apr 20 2013 Bruno Wolff III - 1.8.1-6 +- Avoid opening plugins twice + +* Sat Apr 20 2013 Bruno Wolff III - 1.8.1-5 +- Allow for plugin names to not end in .so - bz 573672 +- Put cmake files in cmake directory instead of an Ogre directory + +* Sun Feb 10 2013 Denis Arnaud - 1.8.1-4 +- Rebuild for Boost-1.53.0 + +* Sat Feb 09 2013 Denis Arnaud - 1.8.1-3 +- Rebuild for Boost-1.53.0 + +* Sun Dec 09 2012 Bruno Wolff III - 1.8.1-2 +- Consuming packages using threads need to link to boost_system-mt + +* Fri Nov 30 2012 Martin Preisler - 1.8.1-1 +- Update to upstream 1.8.1 + +* Fri Nov 30 2012 Martin Preisler - 1.8.0-1 +- Update to upstream 1.8.0 +- Split the components into a subpackages +- Split utils into a subpackage +- Put cmake modules into the -devel subpackage + +* Tue Oct 02 2012 Jon Ciesla - 1.7.4-5 +- Fix FTBFS on ARM, based on debian's patch. + +* Fri Aug 10 2012 Bruno Wolff III - 1.7.4-4 +- Fix for boost 1.50 + +* Sat Jul 21 2012 Bruno Wolff III - 1.7.4-3 +- Fix issue with utilSSE hack breaking under gcc 4.7 (bug 842041) + +* Fri Jul 20 2012 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Apr 01 2012 Bruno Wolff III - 1.7.4-1 +- Update to upstream 1.7.4 +- This is a minor bugfix update from 1.7.3 + +* Tue Feb 28 2012 Fedora Release Engineering - 1.7.3-6 +- Rebuilt for c++ ABI breakage + +* Tue Jan 17 2012 Bruno Wolff III - 1.7.3-5 +- Rebuild for ois 1.3 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sun Nov 20 2011 Bruno Wolff III - 1.7.3-3 +- Rebuild for boost soname bump + +* Fri Jul 22 2011 Bruno Wolff III - 1.7.3-2 +- Rebuild for boost 1.47 + +* Sat May 14 2011 Bruno Wolff III - 1.7.3-1 +- Upstream update to 1.7.3 +- Changelog at http://www.ogre3d.org/2011/05/08/ogre-1-7-3-cthugha-released#more-1284 + +* Mon Apr 04 2011 Jon Ciesla - 1.7.2-14 +- Re-rebuilding for boost 1.46.1, 2011-03-15 rebuild got 1.46.0. + +* Tue Mar 15 2011 Bruno Wolff III - 1.7.2-13 +- Rebuild for boost 1.46.1 update + +* Sun Mar 06 2011 Bruno Wolff III - 1.7.2-12 +- Fix broken pkgconfig files + +* Tue Feb 08 2011 Fedora Release Engineering - 1.7.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 07 2011 Bruno Wolff III - 1.7.2-10 +- With ogre 1.7, cegui is no longer a build dependency. + +* Sun Feb 06 2011 Bruno Wolff III - 1.7.2-9 +- Rebuild for boost soname bump. + +* Tue Jan 11 2011 Bruno Wolff III - 1.7.2-8 +- Fix config for replacement for quake map. + +* Mon Jan 10 2011 Bruno Wolff III - 1.7.2-7 +- Exclude CMakeLists.txt from Media +- Install Samples media where Ogre expects it. +- Ogre expects the *.cfg files in /etc/OGRE + +* Fri Jan 07 2011 Tom Callaway - 1.7.2-6 +- BuildRequires: boost-devel for threading, Remove poco-devel from BR + +* Wed Jan 05 2011 Bruno Wolff III - 1.7.2-5 +- Drop ttb requirement entirely. + +* Wed Jan 05 2011 Dan Horák - 1.7.2-4 +- tbb is available only on selected architectures + +* Wed Jan 05 2011 Bruno Wolff III - 1.7.2-3 +- Use SampleBrowser instead of out of date ogre-samples script + +* Mon Jan 03 2011 Bruno Wolff III - 1.7.2-2 +- ogre-devel requires poco-devel to make sure references to poco headers works. + +* Tue Dec 21 2010 Tom Callaway - 1.7.2-1 +- move to 1.7.2 + +* Sat Nov 28 2009 Bruno Wolff III - 1.6.4-5 +- Get upstream fixes since 1.6.4 release. This includes a couple of crash bugs. + +* Mon Nov 23 2009 Bruno Wolff III - 1.6.4-4 +- Allow CEGIUOgreRenderer to find needed libraries + +* Sat Nov 21 2009 Bruno Wolff III - 1.6.4-3 +- Spec file cleanups + +* Tue Nov 17 2009 Bruno Wolff III - 1.6.4-2 +- Rebuild for ois 1.2 + +* Mon Sep 28 2009 Alexey Torkhov - 1.6.4-1 +- New upstream release 1.6.4 + +* Sat Jul 25 2009 Fedora Release Engineering - 1.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Apr 16 2009 Alexey Torkhov - 1.6.2-1 +- New upstream release 1.6.2 +- Exceptions added to License +- Reenabling OpenEXR plugin, as it fixed now + +* Fri Mar 06 2009 Alexey Torkhov - 1.6.1-5 +- Add licenses of samples to License tag + +* Mon Mar 02 2009 Alexey Torkhov - 1.6.1-4 +- Update Ogre-Samples to work properly without CgProgramManager plugin + +* Fri Feb 27 2009 Alexey Torkhov - 1.6.1-3 +- Fixing PPC build + +* Thu Feb 26 2009 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 10 2009 Alexey Torkhov 1.6.1-1 +- New upstream release 1.6.1 + +* Tue Jan 20 2009 Hans de Goede 1.6.0-5 +- Adjust font requires for font rename (rh 480465) + +* Sat Jan 10 2009 Hans de Goede 1.6.0-4 +- use regular (full) instead of lgc dejavu fonts for the demos (rh 477434) + +* Sat Dec 27 2008 Hans de Goede 1.6.0-3 +- Remove non-free fonts from samples subpackage (rh 477434) + +* Wed Dec 3 2008 Hans de Goede 1.6.0-2 +- Rebuild for new cegui + +* Thu Nov 06 2008 Alexey Torkhov 1.6.0-1 +- New upstream release 1.6.0 +- Updated samples running script +- Removed non-free quake map from samples media +- Added docs license in License tag + +* Sun Sep 21 2008 Alexey Torkhov 1.6.0-0.1.rc1 +- New upstream release 1.6.0rc1 +- Disabling broken OpenEXR plugin, it is not updated for long time and doesn't + compile. FreeImage now have EXR support +- Updated private GLEW sources to 1.5.0 due to license issues and compiling + against it instead of system ones, as it is patched by upstream + +* Fri Jul 11 2008 Hans de Goede 1.4.9-2 +- Rebuild for new cegui + +* Wed Jul 2 2008 Hans de Goede 1.4.9-1 +- New upstream release 1.4.9 + +* Thu May 22 2008 Hans de Goede 1.4.8-2 +- Rebuild for new cegui +- Use system tinyxml (bz 447698) + +* Tue May 13 2008 Hans de Goede 1.4.8-1 +- New upstream release 1.4.8 +- Warning as always with a new upstream ogre release this breaks the ABI + and changes the soname! + +* Sun Mar 30 2008 Hans de Goede 1.4.7-2 +- Switch to freeimage as imagelibrary, as upstream is abandoning DevIL support + (bz 435399) +- Enable the openexr plugin + +* Sun Mar 16 2008 Hans de Goede 1.4.7-1 +- New upstream release 1.4.7 +- Warning as always with a new upstream ogre release this breaks the ABI + and changes the soname! + +* Tue Feb 19 2008 Fedora Release Engineering - 1.4.6-5 +- Autorebuild for GCC 4.3 + +* Thu Jan 24 2008 Hans de Goede 1.4.6-4 +- Install 2 additional header files for ogre4j (bz 429965) + +* Tue Jan 22 2008 Hans de Goede 1.4.6-3 +- Rebuild for new glew + +* Sat Jan 12 2008 Hans de Goede 1.4.6-2 +- Oops I just found out that ogre contains private copies of GL and GLEW + headers, which fall under the not 100% SGI Free Software B and GLX Public + License licenses, remove these (even from the tarbal!) and use the system + versions instead + +* Sat Dec 29 2007 Hans de Goede 1.4.6-1 +- New upstream release 1.4.6 +- Warning as always with a new upstream ogre release this breaks the ABI + and changes the soname! + +* Wed Nov 14 2007 Hans de Goede 1.4.5-3 +- Fix building of ogre with an older version of ogre-devel installed + (bz 382311) + +* Mon Nov 12 2007 Hans de Goede 1.4.5-2 +- Ogre-Samples now takes the name of which samples to run as arguments, if no + arguments are provided, it will run all of them like it used too (bz 377011) +- Don't install a useless / broken plugins.cfg in the Samples folder, + Ogre-Samples will generate a correct one when run (bz 377011) + +* Mon Oct 8 2007 Hans de Goede 1.4.5-1 +- New upstream release 1.4.5 + +* Fri Sep 14 2007 Hans de Goede 1.4.4-1 +- New upstream release 1.4.4 (bz 291481) + +* Wed Aug 15 2007 Hans de Goede 1.4.2-2 +- Update License tag for new Licensing Guidelines compliance + +* Sat Jun 30 2007 Hans de Goede 1.4.2-1 +- New upstream release 1.4.2 +- Warning as always with a new upstream ogre release this breaks the ABI + and changes the soname! +- Warning this release also breaks the API! + +* Thu May 24 2007 Hans de Goede 1.2.5-2 +- Fix building on ppc64 + +* Fri Feb 16 2007 Hans de Goede 1.2.5-1 +- New upstream release 1.2.5 + +* Fri Jan 19 2007 Hans de Goede 1.2.3-2 +- Rebuild for new cairomm +- Added a samples sub-package (suggested by Xavier Decoret) + +* Fri Oct 27 2006 Hans de Goede 1.2.3-1 +- New upstream release 1.2.3 +- Warning as always with a new upstream ogre release this breaks the ABI + and changes the soname! + +* Mon Aug 28 2006 Hans de Goede 1.2.2-2.p1 +- FE6 Rebuild + +* Thu Jul 27 2006 Hans de Goede 1.2.2-1.p1 +- New upstream release 1.2.2p1 +- Drop integrated char_height patch +- Drop ogre-1.2.1-visibility.patch since this is fixed with the latest gcc + release, but keep it in CVS in case things break again. +- Add a patch that replaces -version-info libtool argument with -release, + which results in hardcoding the version number into the soname. This is + needed because upstream changes the ABI every release, without changing the + CURRENT argument passed to -version-info . +- Also add -release when linking libCEGUIOgreRenderer.so as that was previously + unversioned. + +* Tue Jul 18 2006 Hans de Goede 1.2.1-3 +- Add ogre-1.2.1-visibility.patch to fix issues with the interesting new + gcc visibility inheritance. + +* Fri Jul 7 2006 Hans de Goede 1.2.1-2 +- Make -devel package Requires on the main package fully versioned. +- Move libOgrePlatform.so out of %%{_libdir} and into the OGRE plugins dirs as + its not versioned and only used through dlopen, so its effectivly a plugin. + +* Thu Jun 15 2006 Hans de Goede 1.2.1-1 +- Initial FE packaging attempt, loosely based on a specfile created by + Xavier Decoret