[PR PATCH] bullet: update to 3.17

[PR PATCH] bullet: update to 3.17

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1565 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages bullet
https://github.com/void-linux/void-packages/pull/31135

bullet: update to 3.17
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31135.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bullet-31135.patch --]
[-- Type: text/x-diff, Size: 7390 bytes --]

From 0038bdb7d5229bd0f0a67f74a85478a484ee67ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Oct 2020 21:18:15 +0200
Subject: [PATCH 1/5] bullet: update to 3.17.

---
 common/shlibs                               |  9 +++++----
 srcpkgs/bullet/files/bullet.pc              | 11 -----------
 srcpkgs/bullet/patches/disableExample.patch | 10 ++++++++++
 srcpkgs/bullet/patches/musl.patch           | 11 +++++++++++
 srcpkgs/bullet/template                     | 18 +++++++++---------
 5 files changed, 35 insertions(+), 24 deletions(-)
 delete mode 100644 srcpkgs/bullet/files/bullet.pc
 create mode 100644 srcpkgs/bullet/patches/disableExample.patch

diff --git a/common/shlibs b/common/shlibs
index 666da46e0481..72ffdd1cc5da 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1699,10 +1699,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.2.89 bullet-2.89_1
-libBulletCollision.so.2.89 bullet-2.89_1
-libLinearMath.so.2.89 bullet-2.89_1
-libBulletSoftBody.so.2.89 bullet-2.89_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
 libinotifytools.so.0 libinotify-tools-3.14_2
 libfswatch.so.11 libfswatch-1.13.0_1
 libopensc.so.7 libopensc-0.21.0_2
diff --git a/srcpkgs/bullet/files/bullet.pc b/srcpkgs/bullet/files/bullet.pc
deleted file mode 100644
index d236b477ffa6..000000000000
--- a/srcpkgs/bullet/files/bullet.pc
+++ /dev/null
@@ -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
diff --git a/srcpkgs/bullet/patches/disableExample.patch b/srcpkgs/bullet/patches/disableExample.patch
new file mode 100644
index 000000000000..a2fa26efd51c
--- /dev/null
+++ b/srcpkgs/bullet/patches/disableExample.patch
@@ -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)
diff --git a/srcpkgs/bullet/patches/musl.patch b/srcpkgs/bullet/patches/musl.patch
index 88258064a251..b11ce61278cb 100644
--- a/srcpkgs/bullet/patches/musl.patch
+++ b/srcpkgs/bullet/patches/musl.patch
@@ -15,3 +15,14 @@
  #include "GwenParameterInterface.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
+ 
diff --git a/srcpkgs/bullet/template b/srcpkgs/bullet/template
index 2ab9d35ae0fd..9dabf7d89292 100644
--- a/srcpkgs/bullet/template
+++ b/srcpkgs/bullet/template
@@ -1,21 +1,20 @@
 # Template file for 'bullet'
 pkgname=bullet
-version=2.89
-revision=2
+version=3.17
+revision=1
 wrksrc="bullet3-${version}"
 build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=0 -DBUILD_CPU_DEMOS=0
- -DBUILD_UNIT_TESTS=0 -DBUILD_OPENGL3_DEMOS=0 -DBUILD_EXTRAS=1 -DINSTALL_EXTRA_LIBS=1"
-make_cmd=make
+configure_args="-DBUILD_SHARED_LIBS=1 -DBUILD_BULLET2_DEMOS=1 -DBUILD_CPU_DEMOS=0
+ -DBUILD_UNIT_TESTS=1 -DBUILD_OPENGL3_DEMOS=1 -DBUILD_EXTRAS=1 -DINSTALL_EXTRA_LIBS=1
+ -DINSTALL_LIBS=1"
 makedepends="glu-devel"
 short_desc="3D Collision Detection and Rigid Body Dynamics Library"
 maintainer="John <me@johnnynator.dev>"
 license="Zlib"
 homepage="http://www.bulletphysics.com/Bullet/"
 distfiles="https://github.com/bulletphysics/bullet3/archive/${version}.tar.gz"
-checksum=621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8
-
-export CMAKE_GENERATOR="Unix Makefiles"
+checksum=baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61
+shlib_provides="libOpenGLWindow.so libgwen.so"
 
 post_install() {
 	vlicense LICENSE.txt
@@ -26,7 +25,8 @@ bullet-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.so
+		vmove "usr/lib/libBullet*.so"
+		vmove "usr/lib/*.a"
 		vmove usr/lib/pkgconfig
 		vmove usr/lib/cmake
 	}

From 679204b107459e50fc3fc9d02f7fd4a967c55386 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Oct 2020 21:29:25 +0200
Subject: [PATCH 2/5] godot: rebuild against bullet-3.17

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

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index 2f86a7d36b4e..aa63677d6d8c 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,7 +1,7 @@
 # Template file for 'godot'
 pkgname=godot
 version=3.3
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 wrksrc="${pkgname}-${version}-stable"
 build_style=scons

From 874d6da2910e5326c6c8fca844915ddf1a18afca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Oct 2020 21:29:25 +0200
Subject: [PATCH 3/5] openmw: rebuild against bullet-3.17

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

diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index bcb29bd3cdf0..b6c7b8ffb587 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
 # Template file for 'openmw'
 pkgname=openmw
 version=0.46.0
-revision=1
+revision=2
 wrksrc="${pkgname}-${pkgname}-${version}"
 build_style=cmake
 configure_args="-DDESIRED_QT_VERSION=5"

From 6c8c8fa31b961a041ad74885ceafe82956609ced Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sat, 10 Oct 2020 21:29:40 +0200
Subject: [PATCH 4/5] efl: rebuild against bullet-3.17

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

diff --git a/srcpkgs/efl/template b/srcpkgs/efl/template
index 5fe76b6ad1a1..8786d5d94edf 100644
--- a/srcpkgs/efl/template
+++ b/srcpkgs/efl/template
@@ -1,7 +1,7 @@
 # Template file for 'efl'
 pkgname=efl
 version=1.25.1
-revision=3
+revision=4
 build_style=meson
 configure_args="
  -Dbuild-examples=false

From ec378953ff72d54a2719098137ab082e87a1503d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 26 May 2021 21:28:30 +0200
Subject: [PATCH 5/5] vdrift: rebuild against bullet-3.17

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

diff --git a/srcpkgs/vdrift/template b/srcpkgs/vdrift/template
index 5674f951a88a..cc586376b4e6 100644
--- a/srcpkgs/vdrift/template
+++ b/srcpkgs/vdrift/template
@@ -1,7 +1,7 @@
 # Template file for 'vdrift'
 pkgname=vdrift
 version=2014.10.20
-revision=10
+revision=11
 wrksrc="$pkgname"
 build_style=scons
 make_build_args="release=1 force_feedback=1 extbullet=1 datadir=share/${pkgname}"

Re: [PR PATCH] [Merged]: bullet: update to 3.17

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1407 bytes --]

There's a merged pull request on the void-packages repository

bullet: update to 3.17
https://github.com/void-linux/void-packages/pull/31135

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->