update Ogre3D to 1.11.5
PR: 236925 Submitted by: Hiroo Ono
This commit is contained in:
Oliver Lehmann
parent
0026b8cff2
commit
23358c0c2d
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=507479
@ -2,60 +2,120 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= ogre3d
|
||||
PORTVERSION= 1.9.0
|
||||
PORTREVISION= 19
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 1.11.5
|
||||
PORTREVISION= 0
|
||||
CATEGORIES= graphics devel
|
||||
MASTER_SITES= https://bitbucket.org/sinbad/ogre/get/
|
||||
DISTNAME= v1-9-0
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= OGRECave
|
||||
GH_PROJECT= ogre
|
||||
|
||||
MAINTAINER= oliver@FreeBSD.org
|
||||
COMMENT= Scene-oriented, flexible 3D engine written in C++
|
||||
|
||||
LICENSE= MIT
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
LICENSE_FILE= ${WRKSRC}/LICENSE
|
||||
|
||||
BUILD_DEPENDS= pkgconf:devel/pkgconf
|
||||
LIB_DEPENDS= libzzip.so:devel/zziplib \
|
||||
libfreetype.so:print/freetype2 \
|
||||
libfreeimage.so:graphics/freeimage
|
||||
libfreetype.so:print/freetype2
|
||||
|
||||
CONFLICTS= ogre3d19-[0-9]*
|
||||
|
||||
USE_LDCONFIG= yes
|
||||
USES= tar:bzip2 cmake pkgconfig compiler:c++11-lib
|
||||
USE_SDL= sdl
|
||||
USE_XORG= xaw xrandr
|
||||
WRKSRC= ${WRKDIR}/sinbad-ogre-dd30349ea667
|
||||
USES= cmake pkgconfig compiler:c++11-lib sdl
|
||||
USE_SDL= sdl sdl2
|
||||
USE_XORG= x11 xaw xext xrandr xt
|
||||
|
||||
OPTIONS_DEFINE= BOOST DOCS
|
||||
OPTIONS_SUB= yes
|
||||
CMAKE_OFF= DOXYGEN_GENERATE_LATEX
|
||||
CMAKE_ARGS+= -DOGRE_BUILD_RENDERSYSTEM_GL3PLUS:BOOL=OFF \
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GL:BOOL=OFF \
|
||||
-DOGRE_BUILD_RENDERSYSTEM_GLES2:BOOL=OFF \
|
||||
-DOGRE_BUILD_COMPONENT_PYTHON:BOOL=OFF \
|
||||
-DOGRE_BUILD_COMPONENT_JAVA:BOOL=OFF \
|
||||
-DOGRE_BUILD_COMPONENT_CSHARP:BOOL=OFF \
|
||||
-DOGRE_BUILD_PLUGIN_FREEIMAGE:BOOL=OFF \
|
||||
-DOGRE_BUILD_PLUGIN_EXRCODEC:BOOL=OFF \
|
||||
-DOGRE_CONFIG_ENABLE_ZIP:BOOL=ON \
|
||||
-DOGRE_INSTALL_DOCS:BOOL=OFF \
|
||||
-DOGRE_INSTALL_SAMPLES_SOURCE:BOOL=OFF
|
||||
|
||||
BOOST_BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
|
||||
BOOST_RUN_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
|
||||
OPTIONS_DEFINE= CSHARP DOCS FREEIMAGE JAVA OPENEXR OPENGL PROFILE \
|
||||
PYTHON
|
||||
OPTIONS_DEFAULT= DOCS OPENGL
|
||||
OPTIONS_SUB= yes
|
||||
|
||||
BROKEN_aarch64= does not compile: error: class member cannot be redeclared
|
||||
BROKEN_powerpc= does not install
|
||||
DOCS_BUILD_DEPENDS= doxygen:devel/doxygen
|
||||
DOCS_CMAKE_BOOL= OGRE_INSTALL_DOCS
|
||||
|
||||
FREEIMAGE_DESC= Build FreeImage codec
|
||||
FREEIMAGE_CMAKE_BOOL= OGRE_BUILD_PLUGIN_FREEIMAGE
|
||||
FREEIMAGE_LIB_DEPENDS= libfreeimage.so:graphics/freeimage
|
||||
|
||||
OPENEXR_DESC= Build EXR Codec plugin
|
||||
OPENEXR_USE= XORG=ice
|
||||
OPENEXR_CMAKE_BOOL= OGRE_BUILD_PLUGIN_EXRCODEC
|
||||
OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \
|
||||
libIlmThread-2_3.so:graphics/ilmbase \
|
||||
libHalf.so:graphics/ilmbase \
|
||||
libIex-2_3.so:graphics/ilmbase
|
||||
|
||||
OPENGL_DESC= OpenGL support
|
||||
OPENGL_CMAKE_BOOL= OGRE_BUILD_RENDERSYSTEM_GL3PLUS \
|
||||
OGRE_BUILD_RENDERSYSTEM_GL \
|
||||
OGRE_BUILD_RENDERSYSTEM_GLES2
|
||||
OPENGL_LIB_DEPENDS= libGL.so:graphics/mesa-libs
|
||||
OPENGL_VARS= USE_XORG+=sm ice
|
||||
|
||||
PROFILE_DESC= Enable internal profiling support
|
||||
PROFILE_CMAKE_BOOL= OGRE_PROFILING
|
||||
|
||||
CSHARP_DESC= Build Csharp bindings
|
||||
CSHARP_CMAKE_BOOL= OGRE_BUILD_COMPONENT_CSHARP
|
||||
CSHARP_BUILD_DEPENDS= swig3.0:devel/swig30
|
||||
|
||||
JAVA_DESC= Build java bindings
|
||||
JAVA_CMAKE_BOOL= OGRE_BUILD_COMPONENT_JAVA
|
||||
JAVA_BUILD_DEPENDS= swig3.0:devel/swig30
|
||||
JAVA_VARS= USE_JAVA=yes \
|
||||
CMAKE_ARGS+=-DJAVA_HOME=${JAVA_HOME}
|
||||
|
||||
PYTHON_DESC= Build python bindings
|
||||
PYTHON_CMAKE_BOOL= OGRE_BUILD_COMPONENT_PYTHON
|
||||
PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30
|
||||
PYTHON_USES= python
|
||||
|
||||
CXXFLAGS+= -DNDEBUG -I${LOCALBASE}/include
|
||||
|
||||
# BROKEN_aarch64= does not compile: error: class member cannot be redeclared
|
||||
# BROKEN_powerpc= does not install
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} -e 's|include(FindPkgMacros)|return()|g' \
|
||||
${WRKSRC}/CMake/Packages/FindOIS.cmake \
|
||||
${WRKSRC}/CMake/Packages/FindPOCO.cmake \
|
||||
${WRKSRC}/CMake/Packages/FindTBB.cmake
|
||||
@${REINPLACE_CMD} -e 's|\(OGRE_RW_MUTEX[^;]*\)$$|\1;|g' \
|
||||
${WRKSRC}/OgreMain/include/OgreWorkQueue.h
|
||||
@${REINPLACE_CMD} -e 's|\(OGRE_RW_MUTEX.*\);$$|\1|g' \
|
||||
${WRKSRC}/OgreMain/include/Threading/OgreThreadDefinesBoost.h
|
||||
@${REINPLACE_CMD} -e '\
|
||||
s,defined(__x86_64__),& || defined(__powerpc__) || defined(__sparc64__) || defined(__amd64__),' \
|
||||
s,defined(__x86_64__),& || defined(__sparc64__) || defined(__amd64__),' \
|
||||
${WRKSRC}/OgreMain/include/OgrePlatform.h
|
||||
|
||||
post-patch-BOOST-off:
|
||||
@${REINPLACE_CMD} -e 's|Boost|No_Boost|g' \
|
||||
post-patch-PYTHON-on:
|
||||
${REINPLACE_CMD} -e 's/\(Python_ADDITIONAL_VERSIONS\) [0-9\.]*/\$1 ${PYTHON_VER}/' \
|
||||
${WRKSRC}/CMake/Dependencies.cmake
|
||||
${REINPLACE_CMD} -e "s/dist-packages/site-packages/" \
|
||||
${WRKSRC}/Components/Python/CMakeLists.txt
|
||||
|
||||
post-build-DOCS-on:
|
||||
${MAKE_CMD} -C ${BUILD_WRKSRC} OgreDoc
|
||||
|
||||
post-install-DOCS-on:
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
.for docfile in README COPYING AUTHORS
|
||||
.for docfile in README.md LICENSE AUTHORS
|
||||
${INSTALL_DATA} ${WRKSRC}/${docfile} ${STAGEDIR}${DOCSDIR}
|
||||
.endfor
|
||||
|
||||
post-install-JAVA-on:
|
||||
@${MKDIR} ${STAGEDIR}${LOCALBASE}/share/OGRE/java
|
||||
${INSTALL_DATA} ${BUILD_WRKSRC}/java/Ogre-${DISTVERSION}.jar \
|
||||
${STAGEDIR}${LOCALBASE}/share/OGRE/java
|
||||
${INSTALL_LIB} ${BUILD_WRKSRC}/java/libs/libOgreJNI.so \
|
||||
${STAGEDIR}${LOCALBASE}/lib/OGRE
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,3 @@
|
||||
SHA256 (v1-9-0.tar.bz2) = 3072df52b2bed2a1b52e969f140ae9a4373ec931029d3eaa032e7c609a91ef82
|
||||
SIZE (v1-9-0.tar.bz2) = 128098305
|
||||
TIMESTAMP = 1553869941
|
||||
SHA256 (OGRECave-ogre-v1.11.5_GH0.tar.gz) = fadcedf2e58c27f92b94342903c89dad06d0ee93998f5043994ac4ed45ab81da
|
||||
SIZE (OGRECave-ogre-v1.11.5_GH0.tar.gz) = 125185699
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
--- CMakeLists.txt.orig 2013-12-01 18:28:12.000000000 +0100
|
||||
+++ CMakeLists.txt 2014-03-11 21:56:26.000000000 +0100
|
||||
@@ -102,9 +102,9 @@
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
|
||||
endif ()
|
||||
# This is a set of sensible warnings that provide meaningful output
|
||||
- set(OGRE_WARNING_FLAGS "-Wall -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wextra -Wno-unused-parameter -Wshadow -Wno-missing-field-initializers -Wno-long-long")
|
||||
+ set(OGRE_WARNING_FLAGS "-Wall -Winit-self -Wno-overloaded-virtual -Wcast-qual -Wwrite-strings -Wno-unused-parameter -Wshadow -Wno-missing-field-initializers -Wno-long-long")
|
||||
if (NOT APPLE)
|
||||
- set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS} -Wno-unused-but-set-parameter")
|
||||
+ set(OGRE_WARNING_FLAGS "${OGRE_WARNING_FLAGS}")
|
||||
endif ()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OGRE_WARNING_FLAGS}")
|
||||
endif ()
|
||||
@@ -435,6 +435,7 @@
|
||||
option(OGRE_PROFILING "Enable internal profiling support." FALSE)
|
||||
cmake_dependent_option(OGRE_CONFIG_STATIC_LINK_CRT "Statically link the MS CRT dlls (msvcrt)" FALSE "MSVC" FALSE)
|
||||
set(OGRE_LIB_DIRECTORY "lib${LIB_SUFFIX}" CACHE STRING "Install path for libraries, e.g. 'lib64' on some 64-bit Linux distros.")
|
||||
+set(OGRE_LIBDATA_DIRECTORY "libdata" CACHE STRING "Install path for data files.")
|
||||
if (WIN32)
|
||||
option(OGRE_INSTALL_VSPROPS "Install Visual Studio Property Page." FALSE)
|
||||
if (OGRE_INSTALL_VSPROPS)
|
||||
@@ -477,6 +478,7 @@
|
||||
OGRE_PROFILING
|
||||
OGRE_CONFIG_STATIC_LINK_CRT
|
||||
OGRE_LIB_DIRECTORY
|
||||
+ OGRE_LIBDATA_DIRECTORY
|
||||
)
|
||||
|
||||
###################################################################
|
||||
@ -1,57 +0,0 @@
|
||||
--- CMake/ConfigureBuild.cmake.orig 2013-04-16 03:54:30.000000000 +0200
|
||||
+++ CMake/ConfigureBuild.cmake 2013-08-12 14:32:35.000000000 +0200
|
||||
@@ -211,18 +211,18 @@
|
||||
else ()
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY)
|
||||
endif ()
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
|
||||
# configure additional packages
|
||||
|
||||
if (OGRE_BUILD_PLUGIN_PCZ)
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE-PCZ.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-PCZ.pc @ONLY)
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-PCZ.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-PCZ.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
endif ()
|
||||
|
||||
if (OGRE_BUILD_COMPONENT_PAGING)
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Paging.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc @ONLY)
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Paging.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
endif ()
|
||||
|
||||
if (OGRE_BUILD_COMPONENT_TERRAIN)
|
||||
@@ -230,27 +230,27 @@
|
||||
set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Paging = ${OGRE_VERSION}")
|
||||
endif ()
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Terrain.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc @ONLY)
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
endif ()
|
||||
|
||||
if (OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE-RTShaderSystem.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc @ONLY)
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-RTShaderSystem.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
endif ()
|
||||
|
||||
if (OGRE_BUILD_COMPONENT_PROPERTY)
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Property.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc @ONLY)
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
endif ()
|
||||
|
||||
if (OGRE_BUILD_COMPONENT_OVERLAY)
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Overlay.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Overlay.pc @ONLY)
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Overlay.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Overlay.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
endif ()
|
||||
|
||||
if (OGRE_BUILD_COMPONENT_VOLUME)
|
||||
configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Volume.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Volume.pc @ONLY)
|
||||
- install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Volume.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
|
||||
+ install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Volume.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig)
|
||||
endif ()
|
||||
|
||||
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
11
graphics/ogre3d/files/patch-Ogre.i
Normal file
11
graphics/ogre3d/files/patch-Ogre.i
Normal file
@ -0,0 +1,11 @@
|
||||
--- OgreMain/include/Ogre.i.orig 2019-03-30 12:47:36 UTC
|
||||
+++ OgreMain/include/Ogre.i
|
||||
@@ -386,7 +386,7 @@ SHARED_PTR(HardwareUniformBuffer);
|
||||
%ignore Ogre::ResourceGroupManager::openResource(const String&, const String&, bool, Resource*) const;
|
||||
%ignore Ogre::ResourceGroupManager::openResource(const String&, const String&, bool) const;
|
||||
%include "OgreResourceGroupManager.h"
|
||||
-#if SWIG_VERSION < 0x030012 || defined(SWIGJAVA)
|
||||
+#if SWIG_VERSION <= 0x030012 || defined(SWIGJAVA)
|
||||
// conflicts with overloaded versions (GpuProgram, Texture)
|
||||
%ignore Ogre::ResourceManager::getResourceByName;
|
||||
%ignore Ogre::ResourceManager::createOrRetrieve;
|
||||
12
graphics/ogre3d/files/patch-OgreBitwise.h
Normal file
12
graphics/ogre3d/files/patch-OgreBitwise.h
Normal file
@ -0,0 +1,12 @@
|
||||
--- OgreMain/include/OgreBitwise.h.orig 2019-03-30 05:11:05 UTC
|
||||
+++ OgreMain/include/OgreBitwise.h
|
||||
@@ -29,6 +29,9 @@ THE SOFTWARE.
|
||||
#define _Bitwise_H__
|
||||
|
||||
#include "OgrePrerequisites.h"
|
||||
+#undef bswap16
|
||||
+#undef bswap32
|
||||
+#undef bswap64
|
||||
|
||||
#ifndef __has_builtin
|
||||
// Compatibility with non-clang compilers
|
||||
@ -1,11 +0,0 @@
|
||||
--- OgreMain/include/OgrePlatformInformation.h.orig 2013-12-01 18:28:12.000000000 +0100
|
||||
+++ OgreMain/include/OgrePlatformInformation.h 2014-06-15 21:59:18.000000000 +0200
|
||||
@@ -94,6 +94,7 @@
|
||||
OGRE_PLATFORM != OGRE_PLATFORM_NACL
|
||||
# define __OGRE_HAVE_SSE 1
|
||||
#elif OGRE_DOUBLE_PRECISION == 0 && OGRE_CPU == OGRE_CPU_X86 && (OGRE_COMPILER == OGRE_COMPILER_GNUC || OGRE_COMPILER == OGRE_COMPILER_CLANG) && \
|
||||
+ defined(__SSE__) && \
|
||||
OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS && OGRE_PLATFORM != OGRE_PLATFORM_NACL
|
||||
# define __OGRE_HAVE_SSE 1
|
||||
#endif
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- Tools/XMLConverter/CMakeLists.txt.orig 2013-04-16 03:54:34.000000000 +0200
|
||||
+++ Tools/XMLConverter/CMakeLists.txt 2013-08-12 14:34:48.000000000 +0200
|
||||
@@ -37,6 +37,7 @@
|
||||
set(TINYXML_LIBRARIES "")
|
||||
endif(NOT TINYXML_FOUND)
|
||||
|
||||
+set (CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include ${TINYXML_INCLUDE_DIR})
|
||||
add_definitions(-DTIXML_USE_STL)
|
||||
ogre_add_executable(OgreXMLConverter ${HEADER_FILES} ${SOURCE_FILES})
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user