Skip to content
Browse files

Revert "update to bullet 2.80"

This reverts commit 4ba7163.

Bullet 2.80 causes crashes in OpenMW.
  • Loading branch information...
1 parent 21fac44 commit 11cb6912ab36465bc2ab171308d4ed0d06e42f6b @pstumpf pstumpf committed Mar 20, 2012
View
10 devel/bullet/Makefile
@@ -4,14 +4,15 @@ SHARED_ONLY = Yes
COMMENT = physics library
-V = 2.80
-DISTNAME = bullet-${V}-rev2527
+V = 2.79
+DISTNAME = bullet-${V}-rev2440
PKGNAME = bullet-${V}
SHARED_LIBS += BulletCollision 0.0 # 2.79
SHARED_LIBS += BulletDynamics 0.0 # 2.79
SHARED_LIBS += BulletMultiThreaded 0.0 # 2.79
SHARED_LIBS += BulletSoftBody 0.0 # 2.79
+SHARED_LIBS += BulletSoftBodySolvers_CPU 0.0 # 2.79
SHARED_LIBS += BulletSoftBodySolvers_OpenCL_Mini 0.0 # 2.79
SHARED_LIBS += LinearMath 0.0 # 2.79
SHARED_LIBS += MiniCL 0.0 # 2.79
@@ -47,5 +48,10 @@ CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \
NO_REGRESS = Yes
CFLAGS += -I${X11BASE}/include
+WRKDIST = ${WRKDIR}/bullet-${V}
+
+post-extract:
+ perl -pi -e 's/\015//g' \
+ ${WRKSRC}/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/*
.include <bsd.port.mk>
View
10 devel/bullet/distinfo
@@ -1,5 +1,5 @@
-MD5 (bullet-2.80-rev2527.tgz) = bKjjI6saNj/YQiEZosSiYw==
-RMD160 (bullet-2.80-rev2527.tgz) = 8f3vgjled5C0LXEsi4U/VF53aCU=
-SHA1 (bullet-2.80-rev2527.tgz) = gUgqdoZe8LcI2e+z9yu4rtHGxHs=
-SHA256 (bullet-2.80-rev2527.tgz) = +ljecvi8eFTcDeSVsEGIQdpriKwPa3QfPSn7WQtJ0Lo=
-SIZE (bullet-2.80-rev2527.tgz) = 9561220
+MD5 (bullet-2.79-rev2440.tgz) = Kdb0OWTYSU8DZs1p5Ig90Q==
+RMD160 (bullet-2.79-rev2440.tgz) = In0cIslaJDtQSCorSFxjOrC3U48=
+SHA1 (bullet-2.79-rev2440.tgz) = SbSzYqDI0nnjK5Ru+VeLHdjFmHw=
+SHA256 (bullet-2.79-rev2440.tgz) = hQ2QTpVpQV7wn2/+JBrYONjJfrGRhthK2CNvEuP0c8w=
+SIZE (bullet-2.79-rev2440.tgz) = 7720240
View
9 devel/bullet/patches/patch-src_BulletCollision_NarrowPhaseCollision_btPersistentManifold_cpp
@@ -1,9 +0,0 @@
-$OpenBSD$
---- src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp.orig Mon Mar 12 22:40:46 2012
-+++ src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.cpp Mon Mar 12 22:40:50 2012
-@@ -1,4 +1,4 @@
--/*
-+/*
- Bullet Continuous Collision Detection and Physics Library
- Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
-
View
11 ...etMultiThreaded_GpuSoftBodySolvers_OpenCL_OpenCLC10_SolveCollisionsAndUpdateVelocities_cl
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocities.cl.orig Sun Feb 26 18:08:29 2012
++++ src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/SolveCollisionsAndUpdateVelocities.cl Sun Feb 26 18:08:33 2012
+@@ -1,7 +1,5 @@
+ MSTRINGIFY(
+
+-#pragma OPENCL EXTENSION cl_amd_printf : enable\n
+-
+ float mydot3(float4 a, float4 b)
+ {
+ return a.x*b.x + a.y*b.y + a.z*b.z;
View
24 devel/bullet/pkg/PLIST
@@ -166,6 +166,9 @@ include/bullet/BulletDynamics/btBulletDynamicsCommon.h
include/bullet/BulletDynamics/ibmsdk/
include/bullet/BulletMultiThreaded/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/
+include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/CPU/
+include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolverData.h
+include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/CPU/btSoftBodySolver_CPU.h
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/DX11/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/DX11/HLSL/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/DX11/btSoftBodySolverBuffer_DX11.h
@@ -182,6 +185,7 @@ include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Apple/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/
+include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/OpenCLC10/
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverBuffer_OpenCL.h
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverLinkData_OpenCL.h
@@ -192,8 +196,6 @@ include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVer
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolverVertexData_OpenCL.h
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h
include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCLSIMDAware.h
-include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/Shared/
-include/bullet/BulletMultiThreaded/GpuSoftBodySolvers/Shared/btSoftBodySolverData.h
include/bullet/BulletMultiThreaded/HeapManager.h
include/bullet/BulletMultiThreaded/PlatformDefinitions.h
include/bullet/BulletMultiThreaded/PosixThreadSupport.h
@@ -285,27 +287,11 @@ include/bullet/MiniCL/cl_gl.h
include/bullet/MiniCL/cl_platform.h
include/bullet/btBulletCollisionCommon.h
include/bullet/btBulletDynamicsCommon.h
-include/bullet/vectormath/
-include/bullet/vectormath/scalar/
-include/bullet/vectormath/scalar/boolInVec.h
-include/bullet/vectormath/scalar/floatInVec.h
-include/bullet/vectormath/scalar/mat_aos.h
-include/bullet/vectormath/scalar/quat_aos.h
-include/bullet/vectormath/scalar/vec_aos.h
-include/bullet/vectormath/scalar/vectormath_aos.h
-include/bullet/vectormath/sse/
-include/bullet/vectormath/sse/boolInVec.h
-include/bullet/vectormath/sse/floatInVec.h
-include/bullet/vectormath/sse/mat_aos.h
-include/bullet/vectormath/sse/quat_aos.h
-include/bullet/vectormath/sse/vec_aos.h
-include/bullet/vectormath/sse/vecidx_aos.h
-include/bullet/vectormath/sse/vectormath_aos.h
-include/bullet/vectormath/vmInclude.h
@lib lib/libBulletCollision.so.${LIBBulletCollision_VERSION}
@lib lib/libBulletDynamics.so.${LIBBulletDynamics_VERSION}
@lib lib/libBulletMultiThreaded.so.${LIBBulletMultiThreaded_VERSION}
@lib lib/libBulletSoftBody.so.${LIBBulletSoftBody_VERSION}
+@lib lib/libBulletSoftBodySolvers_CPU.so.${LIBBulletSoftBodySolvers_CPU_VERSION}
@lib lib/libBulletSoftBodySolvers_OpenCL_Mini.so.${LIBBulletSoftBodySolvers_OpenCL_Mini_VERSION}
@lib lib/libLinearMath.so.${LIBLinearMath_VERSION}
@lib lib/libMiniCL.so.${LIBMiniCL_VERSION}

0 comments on commit 11cb691

Please sign in to comment.
Something went wrong with that request. Please try again.