NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/bullet: bump to version 3.21

Browse Source 
- Drop patch (already in version)
- Update indentation in hash file (two spaces)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2022-01-26 22:12:20 +01:00 committed by Peter Korsgaard
parent dc66c5901c
commit 7ddbcb76aa
3 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
package/bullet/0001-Extras-VHACD-inc-vhacdMutex.h-fix-musl-build.patch
View File

@ -1,42 +0,0 @@
From dd37b97e79aea231ae026ac93c6ca4c7a2667582 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 7 Aug 2021 17:11:24 +0200
Subject: [PATCH] Extras/VHACD/inc/vhacdMutex.h: fix musl build
Fix the following build failure on musl (which does not provide
PTHREAD_MUTEX_RECURSIVE_NP):
In file included from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btScalar.h:289,
from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btVector3.h:19,
from /tmp/instance-5/output-1/build/bullet-3.09/src/LinearMath/btConvexHullComputer.h:18,
from /tmp/instance-5/output-1/build/bullet-3.09/Extras/VHACD/src/VHACD.cpp:28:
/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h: In constructor 'VHACD::Mutex::Mutex()':
/tmp/instance-5/output-1/build/bullet-3.09/Extras/BulletRobotics/../../Extras/VHACD/inc/vhacdMutex.h:97:54: error: 'PTHREAD_MUTEX_RECURSIVE_NP' was not declared in this scope; did you mean 'PTHREAD_MUTEX_RECURSIVE'?
97 | VHACD_VERIFY(pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_RECURSIVE_NP) == 0);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/79cd2024b3dfc8d3e896cdacf67fb891df81ca6e
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/bulletphysics/bullet3/pull/3930]
---
Extras/VHACD/inc/vhacdMutex.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Extras/VHACD/inc/vhacdMutex.h b/Extras/VHACD/inc/vhacdMutex.h
index 4d1ad2a7d..78c111383 100644
--- a/Extras/VHACD/inc/vhacdMutex.h
+++ b/Extras/VHACD/inc/vhacdMutex.h
@@ -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
--
2.30.2

2
package/bullet/bullet.hash
View File

@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 f2feef9322329c0571d9066fede2db0ede92b19f7f7fdf54def3b4651f02af03 bullet-3.09.tar.gz sha256 49d1ee47aa8cbb0bc6bb459f0a4cfb9579b40e28f5c7d9a36c313e3031fb3965 bullet-3.21.tar.gz
sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt sha256 885cd516a8420acb7c3e0b1a7119913b686495001ae564e3229740460e8cff59 LICENSE.txt

2
package/bullet/bullet.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
BULLET_VERSION = 3.09 BULLET_VERSION = 3.21
BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION))
BULLET_INSTALL_STAGING = YES BULLET_INSTALL_STAGING = YES
BULLET_LICENSE = Zlib BULLET_LICENSE = Zlib