From 6bd7e7b0fe531ab3fce91542133fcd8ed31d1eaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 8 Jan 2025 01:03:30 +0100
Subject: [PATCH 1/2] bullet: update to 3.25.

---
 common/shlibs                     | 10 +++++-----
 srcpkgs/bullet/patches/musl.patch | 28 ----------------------------
 srcpkgs/bullet/template           |  4 ++--
 3 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 srcpkgs/bullet/patches/musl.patch

diff --git a/common/shlibs b/common/shlibs
index cc76cbdd35cd7c..9f78c1843f9313 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1702,11 +1702,11 @@ libvtv.so.0 libvtv-6.3.0_1
 libatomic.so.1 libatomic-4.9.0_1
 libpcsclite.so.1 libpcsclite-1.8.11_1
 libpcscspy.so.0 libpcsclite-1.8.11_1
-libBulletDynamics.so.3.17 bullet-3.17_1
-libBulletCollision.so.3.17 bullet-3.17_1
-libLinearMath.so.3.17 bullet-3.17_1
-libBulletSoftBody.so.3.17 bullet-3.17_1
-libBullet3Common.so.3.17 bullet-3.17_1
+libBulletDynamics.so.3.25 bullet-3.25_1
+libBulletCollision.so.3.25 bullet-3.25_1
+libLinearMath.so.3.25 bullet-3.25_1
+libBulletSoftBody.so.3.25 bullet-3.25_1
+libBullet3Common.so.3.25 bullet-3.25_1
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.13 libfswatch-1.17.1_1
 libopensc.so.11 libopensc-0.25.1_1
diff --git a/srcpkgs/bullet/patches/musl.patch b/srcpkgs/bullet/patches/musl.patch
deleted file mode 100644
index fade48fb2efb36..00000000000000
--- a/srcpkgs/bullet/patches/musl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/examples/ThirdPartyLibs/Gwen/Gwen.cpp	2015-08-05 11:31:24.936137203 +0200
-+++ b/examples/ThirdPartyLibs/Gwen/Gwen.cpp	2015-08-05 11:31:33.447238474 +0200
-@@ -5,6 +5,7 @@
- */
- 
- 
-+#include <stdio.h>
- #include "Gwen/Gwen.h"
- 
- 
---- a/examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp	2015-08-05 11:34:15.185162987 +0200
-+++ b/examples/ExampleBrowser/GwenGUISupport/GwenParameterInterface.cpp	2015-08-05 11:34:24.896278540 +0200
-@@ -1,3 +1,4 @@
-+#include <stdio.h>
- #include "GwenParameterInterface.h"
- #include "gwenInternalData.h"
- 
---- a/Extras/VHACD/inc/vhacdMutex.h	2021-05-07 20:04:02.000000000 +0200
-+++ b/Extras/VHACD/inc/vhacdMutex.h	2021-05-07 20:04:02.000000000 +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
- 
diff --git a/srcpkgs/bullet/template b/srcpkgs/bullet/template
index 1dc872c07982e1..54ae67591f8bcf 100644
--- a/srcpkgs/bullet/template
+++ b/srcpkgs/bullet/template
@@ -1,6 +1,6 @@
 # Template file for 'bullet'
 pkgname=bullet
-version=3.17
+version=3.25
 revision=1
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=1 -DBUILD_CPU_DEMOS=0
@@ -12,7 +12,7 @@ maintainer="John <me@johnnynator.dev>"
 license="Zlib"
 homepage="http://www.bulletphysics.com/Bullet/"
 distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz"
-checksum=baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61
+checksum=c45afb6399e3f68036ddb641c6bf6f552bf332d5ab6be62f7e6c54eda05ceb77
 shlib_provides="libOpenGLWindow.so libgwen.so"
 
 post_install() {

From 546cda84ecc804bb721ae8abddc570b0d65a98bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 8 Jan 2025 01:09:22 +0100
Subject: [PATCH 2/2] vdrift: rebuild for bullet-3.25

---
 srcpkgs/vdrift/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vdrift/template b/srcpkgs/vdrift/template
index 90b702affecbc6..693175ba173875 100644
--- a/srcpkgs/vdrift/template
+++ b/srcpkgs/vdrift/template
@@ -1,7 +1,7 @@
 # Template file for 'vdrift'
 pkgname=vdrift
 version=2014.10.20
-revision=12
+revision=13
 build_style=scons
 scons_use_destdir=yes
 make_build_args="release=1 force_feedback=1 extbullet=1 datadir=share/${pkgname}"