Update Bullet to 2.87.

This commit is contained in:
pascal 2017-12-05 19:58:55 +00:00
parent 4a5afdce30
commit 0cc2056e00
9 changed files with 100 additions and 124 deletions

View File

@ -1,24 +1,31 @@
# $OpenBSD: Makefile,v 1.13 2017/09/22 20:59:02 sthen Exp $
# $OpenBSD: Makefile,v 1.14 2017/12/05 19:58:55 pascal Exp $
COMMENT = physics library
GH_ACCOUNT = bulletphysics
GH_PROJECT = bullet3
GH_TAGNAME = 2.86.1
GH_TAGNAME = 2.87
DISTNAME = bullet-${GH_TAGNAME}
REVISION = 1
SHARED_LIBS += BulletCollision 3.0 # 2.79
SHARED_LIBS += BulletDynamics 3.0 # 2.79
SHARED_LIBS += BulletInverseDynamics 1.0 # 2.83
SHARED_LIBS += BulletSoftBody 3.0 # 2.79
SHARED_LIBS += LinearMath 3.0 # 2.79
SHARED_LIBS += Bullet2FileLoader 2.0 # 2.83
SHARED_LIBS += Bullet3Collision 2.0 # 2.83
SHARED_LIBS += Bullet3Common 2.0 # 2.83
SHARED_LIBS += Bullet3Dynamics 2.0 # 2.83
SHARED_LIBS += Bullet3Geometry 2.0 # 2.83
SHARED_LIBS += Bullet3OpenCL_clew 2.0 # 2.83
SHARED_LIBS += BulletCollision 4.0 # 2.79
SHARED_LIBS += BulletDynamics 4.0 # 2.79
SHARED_LIBS += BulletFileLoader 0.0 # 2.87
SHARED_LIBS += BulletInverseDynamics 2.0 # 2.83
SHARED_LIBS += BulletInverseDynamicsUtils 0.0 # 2.87
SHARED_LIBS += BulletRobotics 0.0 # 2.87
SHARED_LIBS += BulletSoftBody 4.0 # 2.79
SHARED_LIBS += BulletWorldImporter 0.0 # 2.87
SHARED_LIBS += BulletXmlWorldImporter 0.0 # 2.87
SHARED_LIBS += LinearMath 4.0 # 2.79
SHARED_LIBS += ConvexDecomposition 0.0 # 2.87
SHARED_LIBS += GIMPACTUtils 0.0 # 2.87
SHARED_LIBS += HACD 0.0 # 2.87
SHARED_LIBS += Bullet2FileLoader 3.0 # 2.83
SHARED_LIBS += Bullet3Collision 3.0 # 2.83
SHARED_LIBS += Bullet3Common 3.0 # 2.83
SHARED_LIBS += Bullet3Dynamics 3.0 # 2.83
SHARED_LIBS += Bullet3Geometry 3.0 # 2.83
SHARED_LIBS += Bullet3OpenCL_clew 3.0 # 2.83
CATEGORIES = devel

View File

@ -1,2 +1,2 @@
SHA256 (bullet-2.86.1.tar.gz) = wFiy5DIbpq2qZWl2waE4wHsY/AOyn1uCiA1dgij78Fk=
SIZE (bullet-2.86.1.tar.gz) = 26065278
SHA256 (bullet-2.87.tar.gz) = Q4wVHEiED+P5AuwmDZSW+L6ybbpLF3aaSlMhKQOTX5U=
SIZE (bullet-2.87.tar.gz) = 56691047

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-examples_BasicDemo_CMakeLists_txt,v 1.1 2017/04/24 18:09:25 pascal Exp $
--- examples/BasicDemo/CMakeLists.txt.orig Thu Apr 13 20:11:32 2017
+++ examples/BasicDemo/CMakeLists.txt Thu Apr 13 20:12:05 2017
@@ -84,7 +84,7 @@ ELSE(WIN32)
ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
- LINK_LIBRARIES( pthread dl )
+ LINK_LIBRARIES( pthread )
ENDIF(APPLE)
ENDIF(WIN32)

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-examples_ExampleBrowser_CMakeLists_txt,v 1.3 2017/04/24 18:09:25 pascal Exp $
--- examples/ExampleBrowser/CMakeLists.txt.orig Fri Feb 17 23:43:38 2017
+++ examples/ExampleBrowser/CMakeLists.txt Thu Apr 13 20:23:52 2017
@@ -65,7 +65,7 @@ IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(
BulletExampleBrowserLib Bullet3Common BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamicsUtils
BulletInverseDynamics LinearMath OpenGLWindow gwen BussIK
- pthread dl
+ pthread
)
ENDIF(APPLE)
ENDIF(WIN32)
@@ -106,7 +106,7 @@ ELSE(WIN32)
ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew )
- LINK_LIBRARIES( pthread dl)
+ LINK_LIBRARIES( pthread)
ENDIF(APPLE)
ENDIF(WIN32)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-examples_OpenGLWindow_CMakeLists_txt,v 1.1 2017/04/24 18:09:25 pascal Exp $
--- examples/OpenGLWindow/CMakeLists.txt.orig Thu Apr 13 20:12:22 2017
+++ examples/OpenGLWindow/CMakeLists.txt Thu Apr 13 20:12:37 2017
@@ -59,7 +59,7 @@ if (BUILD_SHARED_LIBS)
else()
set (CMAKE_THREAD_PREFER_PTHREAD TRUE)
FIND_PACKAGE(Threads)
- target_link_libraries(OpenGLWindow dl ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(OpenGLWindow ${CMAKE_THREAD_LIBS_INIT})
endif()
endif()

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-examples_SharedMemory_CMakeLists_txt,v 1.1 2017/04/24 18:09:25 pascal Exp $
--- examples/SharedMemory/CMakeLists.txt.orig Thu Apr 13 20:12:47 2017
+++ examples/SharedMemory/CMakeLists.txt Thu Apr 13 20:13:11 2017
@@ -112,7 +112,7 @@ ELSE(WIN32)
)
ELSE(APPLE)
- LINK_LIBRARIES( pthread dl )
+ LINK_LIBRARIES( pthread )
ADD_EXECUTABLE(App_SharedMemoryPhysics
${SharedMemory_SRCS}
../MultiThreading/b3PosixThreadSupport.cpp
@@ -179,7 +179,7 @@ ELSE(WIN32)
)
ELSE(APPLE)
- LINK_LIBRARIES( pthread dl )
+ LINK_LIBRARIES( pthread )
ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1")
ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
@@ -288,4 +288,4 @@ IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(App_SharedMemoryPhysics_VR PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
-ENDIF(WIN32)
\ No newline at end of file
+ENDIF(WIN32)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-examples_SimpleOpenGL3_CMakeLists_txt,v 1.1 2017/04/24 18:09:25 pascal Exp $
--- examples/SimpleOpenGL3/CMakeLists.txt.orig Thu Apr 13 20:13:21 2017
+++ examples/SimpleOpenGL3/CMakeLists.txt Thu Apr 13 20:13:30 2017
@@ -37,7 +37,7 @@ ELSE(WIN32)
ADD_DEFINITIONS("-DGLEW_STATIC")
ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1")
- LINK_LIBRARIES( X11 pthread dl Xext)
+ LINK_LIBRARIES( X11 pthread Xext)
ENDIF(APPLE)
ENDIF(WIN32)

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-examples_ThirdPartyLibs_Gwen_Macros_h,v 1.1 2015/12/25 15:30:05 pascal Exp $
--- examples/ThirdPartyLibs/Gwen/Macros.h.orig Fri Dec 25 16:08:29 2015
+++ examples/ThirdPartyLibs/Gwen/Macros.h Fri Dec 25 16:09:02 2015
@@ -4,7 +4,7 @@
#define GWEN_MACROS_H
#include <stdlib.h>
#include <stdarg.h>
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__OpenBSD__)
#include <malloc.h>
#endif //__APPLE__
#include <memory.h>
@@ -38,7 +38,7 @@
#define GwenUtil_OutputDebugWideString( lpOutputString ) //wprintf( lpOutputString )
#define GwenUtil_WideStringToFloat( _Str ) wcstof(_Str, NULL)
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__OpenBSD__)
#define GwenUtil_VSNPrintFSafe( _DstBuf, _DstSize, _MaxCount, _Format, _ArgList ) vsnprintf( _DstBuf, _DstSize, _Format, _ArgList )
#define GwenUtil_VSWPrintFSafe( _DstBuf, _SizeInWords, _Format, _ArgList ) vswprintf( _DstBuf, _SizeInWords, _Format, _ArgList )

View File

@ -1,4 +1,9 @@
@comment $OpenBSD: PLIST,v 1.5 2017/04/24 18:09:25 pascal Exp $
@comment $OpenBSD: PLIST,v 1.6 2017/12/05 19:58:55 pascal Exp $
include/ActiveSocket.h
include/Host.h
include/PassiveSocket.h
include/SimpleSocket.h
include/StatTimer.h
include/bullet/
include/bullet/Bullet2FileLoader/
include/bullet/Bullet2FileLoader/autogenerated/
@ -56,6 +61,7 @@ include/bullet/Bullet3Common/b3PoolAllocator.h
include/bullet/Bullet3Common/b3QuadWord.h
include/bullet/Bullet3Common/b3Quaternion.h
include/bullet/Bullet3Common/b3Random.h
include/bullet/Bullet3Common/b3ResizablePool.h
include/bullet/Bullet3Common/b3Scalar.h
include/bullet/Bullet3Common/b3StackAlloc.h
include/bullet/Bullet3Common/b3Transform.h
@ -111,7 +117,6 @@ include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3ContactCache.h
include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.h
include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3ConvexPolyhedronCL.h
include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3GjkEpa.h
include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3GjkPairDetector.h
include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3OptimizedBvh.h
include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3QuantizedBvh.h
include/bullet/Bullet3OpenCL/NarrowphaseCollision/b3StridingMeshInterface.h
@ -174,6 +179,7 @@ include/bullet/Bullet3OpenCL/RigidBody/kernels/updateAabbsKernel.h
include/bullet/BulletCollision/
include/bullet/BulletCollision/BroadphaseCollision/
include/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h
include/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3Internal.h
include/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
include/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
include/bullet/BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h
@ -193,6 +199,7 @@ include/bullet/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
include/bullet/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
include/bullet/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
include/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
include/bullet/BulletCollision/CollisionDispatch/btCollisionDispatcherMt.h
include/bullet/BulletCollision/CollisionDispatch/btCollisionObject.h
include/bullet/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
include/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.h
@ -260,10 +267,13 @@ include/bullet/BulletCollision/Gimpact/btBoxCollision.h
include/bullet/BulletCollision/Gimpact/btClipPolygon.h
include/bullet/BulletCollision/Gimpact/btCompoundFromGimpact.h
include/bullet/BulletCollision/Gimpact/btContactProcessing.h
include/bullet/BulletCollision/Gimpact/btContactProcessingStructs.h
include/bullet/BulletCollision/Gimpact/btGImpactBvh.h
include/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h
include/bullet/BulletCollision/Gimpact/btGImpactCollisionAlgorithm.h
include/bullet/BulletCollision/Gimpact/btGImpactMassUtil.h
include/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
include/bullet/BulletCollision/Gimpact/btGImpactQuantizedBvhStructs.h
include/bullet/BulletCollision/Gimpact/btGImpactShape.h
include/bullet/BulletCollision/Gimpact/btGenericPoolAllocator.h
include/bullet/BulletCollision/Gimpact/btGeometryOperations.h
@ -347,6 +357,7 @@ include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyFixedConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyGearConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyJointFeedback.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.h
include/bullet/BulletDynamics/Featherstone/btMultiBodyJointMotor.h
@ -369,6 +380,15 @@ include/bullet/BulletDynamics/Vehicle/btRaycastVehicle.h
include/bullet/BulletDynamics/Vehicle/btVehicleRaycaster.h
include/bullet/BulletDynamics/Vehicle/btWheelInfo.h
include/bullet/BulletDynamics/btBulletDynamicsCommon.h
include/bullet/BulletFileLoader/
include/bullet/BulletFileLoader/autogenerated/
include/bullet/BulletFileLoader/autogenerated/bullet.h
include/bullet/BulletFileLoader/bChunk.h
include/bullet/BulletFileLoader/bCommon.h
include/bullet/BulletFileLoader/bDNA.h
include/bullet/BulletFileLoader/bDefines.h
include/bullet/BulletFileLoader/bFile.h
include/bullet/BulletFileLoader/btBulletFile.h
include/bullet/BulletInverseDynamics/
include/bullet/BulletInverseDynamics/btBulletCollisionCommon.h
include/bullet/BulletInverseDynamics/details/
@ -387,6 +407,44 @@ include/bullet/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
include/bullet/BulletSoftBody/btSoftRigidDynamicsWorld.h
include/bullet/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
include/bullet/BulletSoftBody/btSparseSDF.h
include/bullet/BulletWorldImporter/
include/bullet/BulletWorldImporter/btBulletWorldImporter.h
include/bullet/BulletWorldImporter/btWorldImporter.h
include/bullet/BulletXmlWorldImporter/
include/bullet/BulletXmlWorldImporter/btBulletXmlWorldImporter.h
include/bullet/BulletXmlWorldImporter/string_split.h
include/bullet/BulletXmlWorldImporter/tinystr.h
include/bullet/BulletXmlWorldImporter/tinyxml.h
include/bullet/ConvexDecomposition/
include/bullet/ConvexDecomposition/ConvexBuilder.h
include/bullet/ConvexDecomposition/ConvexDecomposition.h
include/bullet/ConvexDecomposition/bestfit.h
include/bullet/ConvexDecomposition/bestfitobb.h
include/bullet/ConvexDecomposition/cd_hull.h
include/bullet/ConvexDecomposition/cd_vector.h
include/bullet/ConvexDecomposition/cd_wavefront.h
include/bullet/ConvexDecomposition/concavity.h
include/bullet/ConvexDecomposition/fitsphere.h
include/bullet/ConvexDecomposition/float_math.h
include/bullet/ConvexDecomposition/meshvolume.h
include/bullet/ConvexDecomposition/planetri.h
include/bullet/ConvexDecomposition/raytri.h
include/bullet/ConvexDecomposition/splitplane.h
include/bullet/ConvexDecomposition/vlookup.h
include/bullet/GIMPACTUtils/
include/bullet/GIMPACTUtils/btGImpactConvexDecompositionShape.h
include/bullet/HACD/
include/bullet/HACD/hacdCircularList.h
include/bullet/HACD/hacdCircularList.inl
include/bullet/HACD/hacdGraph.h
include/bullet/HACD/hacdHACD.h
include/bullet/HACD/hacdICHull.h
include/bullet/HACD/hacdManifoldMesh.h
include/bullet/HACD/hacdVector.h
include/bullet/HACD/hacdVector.inl
include/bullet/HACD/hacdVersion.h
include/bullet/InverseDynamics/
include/bullet/InverseDynamics/BulletInverseDynamicsUtilsCommon.h
include/bullet/LinearMath/
include/bullet/LinearMath/btAabbUtil2.h
include/bullet/LinearMath/btAlignedAllocator.h
@ -418,6 +476,14 @@ include/bullet/LinearMath/btThreads.h
include/bullet/LinearMath/btTransform.h
include/bullet/LinearMath/btTransformUtil.h
include/bullet/LinearMath/btVector3.h
include/bullet/PhysicsClientC_API.h
include/bullet/PhysicsClientSharedMemory2_C_API.h
include/bullet/PhysicsClientSharedMemory_C_API.h
include/bullet/PhysicsClientTCP_C_API.h
include/bullet/PhysicsClientUDP_C_API.h
include/bullet/PhysicsDirectC_API.h
include/bullet/SharedMemoryInProcessPhysicsC_API.h
include/bullet/SharedMemoryPublic.h
include/bullet/btBulletCollisionCommon.h
include/bullet/btBulletDynamicsCommon.h
lib/cmake/
@ -432,7 +498,16 @@ lib/cmake/bullet/UseBullet.cmake
@lib lib/libBullet3OpenCL_clew.so.${LIBBullet3OpenCL_clew_VERSION}
@lib lib/libBulletCollision.so.${LIBBulletCollision_VERSION}
@lib lib/libBulletDynamics.so.${LIBBulletDynamics_VERSION}
@lib lib/libBulletFileLoader.so.${LIBBulletFileLoader_VERSION}
@lib lib/libBulletInverseDynamics.so.${LIBBulletInverseDynamics_VERSION}
@lib lib/libBulletInverseDynamicsUtils.so.${LIBBulletInverseDynamicsUtils_VERSION}
@lib lib/libBulletRobotics.so.${LIBBulletRobotics_VERSION}
@lib lib/libBulletSoftBody.so.${LIBBulletSoftBody_VERSION}
@lib lib/libBulletWorldImporter.so.${LIBBulletWorldImporter_VERSION}
@lib lib/libBulletXmlWorldImporter.so.${LIBBulletXmlWorldImporter_VERSION}
@lib lib/libConvexDecomposition.so.${LIBConvexDecomposition_VERSION}
@lib lib/libGIMPACTUtils.so.${LIBGIMPACTUtils_VERSION}
@lib lib/libHACD.so.${LIBHACD_VERSION}
@lib lib/libLinearMath.so.${LIBLinearMath_VERSION}
lib/libclsocket.a
lib/pkgconfig/bullet.pc