bullet: update to 3.17.

This commit is contained in:
John 2020-10-10 21:18:15 +02:00 committed by John Zimmermann
parent dcf6b3ef52
commit 1d66c39aa6
5 changed files with 35 additions and 24 deletions

View file

@ -1702,10 +1702,11 @@ libvtv.so.0 libvtv-6.3.0_1
libatomic.so.1 libatomic-4.9.0_1 libatomic.so.1 libatomic-4.9.0_1
libpcsclite.so.1 libpcsclite-1.8.11_1 libpcsclite.so.1 libpcsclite-1.8.11_1
libpcscspy.so.0 libpcsclite-1.8.11_1 libpcscspy.so.0 libpcsclite-1.8.11_1
libBulletDynamics.so.2.89 bullet-2.89_1 libBulletDynamics.so.3.17 bullet-3.17_1
libBulletCollision.so.2.89 bullet-2.89_1 libBulletCollision.so.3.17 bullet-3.17_1
libLinearMath.so.2.89 bullet-2.89_1 libLinearMath.so.3.17 bullet-3.17_1
libBulletSoftBody.so.2.89 bullet-2.89_1 libBulletSoftBody.so.3.17 bullet-3.17_1
libBullet3Common.so.3.17 bullet-3.17_1
libinotifytools.so.0 libinotify-tools-3.14_2 libinotifytools.so.0 libinotify-tools-3.14_2
libfswatch.so.11 libfswatch-1.13.0_1 libfswatch.so.11 libfswatch-1.13.0_1
libopensc.so.7 libopensc-0.21.0_2 libopensc.so.7 libopensc-0.21.0_2

View file

@ -1,11 +0,0 @@
prefix=/usr
exec_prefix=${prefix}
libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: bullet
Description: Bullet Continuous Collision Detection and Physics Library
Requires:
Version: VERSION
Libs: -L${libdir} -lBulletDynamics -lBulletCollision -lLinearMath -lBulletSoftBody
Cflags: -I${includedir}/bullet

View file

@ -0,0 +1,10 @@
--- examples/CMakeLists.txt 2020-10-07 20:28:14.000000000 +0200
+++ - 2020-10-10 21:40:10.823966203 +0200
@@ -1,6 +1,6 @@
SUBDIRS( HelloWorld BasicDemo)
IF(BUILD_BULLET3)
- SUBDIRS( ExampleBrowser RobotSimulator SharedMemory ThirdPartyLibs/Gwen ThirdPartyLibs/BussIK ThirdPartyLibs/clsocket OpenGLWindow TwoJoint )
+ SUBDIRS( ExampleBrowser RobotSimulator ThirdPartyLibs/Gwen ThirdPartyLibs/BussIK ThirdPartyLibs/clsocket OpenGLWindow TwoJoint )
ENDIF()
IF(BUILD_PYBULLET)

View file

@ -15,3 +15,14 @@
#include "GwenParameterInterface.h" #include "GwenParameterInterface.h"
#include "gwenInternalData.h" #include "gwenInternalData.h"
--- Extras/VHACD/inc/vhacdMutex.h 2021-05-07 20:04:02.000000000 +0200
+++ - 2021-05-26 20:28:52.836634329 +0200
@@ -69,7 +69,7 @@
#include <pthread.h>
#endif
-#if defined(__APPLE__)
+#if defined(__APPLE__) || !defined(__GLIBC__)
#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
#endif

View file

@ -1,21 +1,20 @@
# Template file for 'bullet' # Template file for 'bullet'
pkgname=bullet pkgname=bullet
version=2.89 version=3.17
revision=2 revision=1
wrksrc="bullet3-${version}" wrksrc="bullet3-${version}"
build_style=cmake build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=0 -DBUILD_CPU_DEMOS=0 configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=1 -DBUILD_CPU_DEMOS=0
-DBUILD_UNIT_TESTS=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_EXTRAS=1 -DINSTALL_EXTRA_LIBS=1" -DBUILD_UNIT_TESTS=1 -DBUILD_OPENGL3_DEMOS=1 -DBUILD_EXTRAS=1 -DINSTALL_EXTRA_LIBS=1
make_cmd=make -DINSTALL_LIBS=1"
makedepends="glu-devel" makedepends="glu-devel"
short_desc="3D Collision Detection and Rigid Body Dynamics Library" short_desc="3D Collision Detection and Rigid Body Dynamics Library"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
license="Zlib" license="Zlib"
homepage="http://www.bulletphysics.com/Bullet/" homepage="http://www.bulletphysics.com/Bullet/"
distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz" distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz"
checksum=621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8 checksum=baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61
shlib_provides="libOpenGLWindow.so libgwen.so"
export CMAKE_GENERATOR="Unix Makefiles"
post_install() { post_install() {
vlicense LICENSE.txt vlicense LICENSE.txt
@ -26,7 +25,8 @@ bullet-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"
pkg_install() { pkg_install() {
vmove usr/include vmove usr/include
vmove usr/lib/*.so vmove "usr/lib/libBullet*.so"
vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig vmove usr/lib/pkgconfig
vmove usr/lib/cmake vmove usr/lib/cmake
} }