Accepting request 912578 from games

OBS-URL: https://build.opensuse.org/request/show/912578 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libbullet?expand=0&rev=10
2 years ago · 3146e2b8cb
parent 1d56cc978d 2fb4778e63
commit 3146e2b8cb
5 changed files with 81 additions and 26 deletions
--- a/bullet3-2.89.tar.gz
+++ b/bullet3-2.89.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:621b36e91c0371933f3c2156db22c083383164881d2a6b84636759dc4cbb0bb8
-size 135742506
--- a/bullet3-3.17.tar.gz
+++ b/bullet3-3.17.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:baa642c906576d4d98d041d0acb80d85dd6eff6e3c16a009b1abf1ccd2bc0a61
+size 131995187
--- a/libbullet.changes
+++ b/libbullet.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 10 06:56:52 UTC 2021 - kh Lai <dlshcbmuipmam@hotmail.com>
+
+- Update to 3.17
+  * improvements for the finite-element-method (FEM) deformable simulation
+  * See the "Learning Agile Robotic Locomotion Skills by Imitating Animals"
+    paper for more detail about this release
+- Update use-system-libs.patch for 3.17
+- Compile with USE_DOUBLE_PRECISION
+- Disable building BULLET_ROBOTICS and OBJ2SDF by cmake options instead
+  of removing them by sed
+
 -------------------------------------------------------------------
 Wed Mar 11 09:25:19 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>

--- a/libbullet.spec
+++ b/libbullet.spec
@ -1,7 +1,7 @@
 #
 # spec file for package libbullet
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,11 +16,11 @@
 #


-%define sover   2_89
+%define sover   3_17
 %define lname   libbullet%{sover}
 %define pdesc   Bullet is a Collision Detection and Rigid Body Dynamics Library.
 Name:           libbullet
-Version:        2.89
+Version:        3.17
 Release:        0
 Summary:        Bullet Continuous Collision Detection and Physics Library
 License:        Zlib
@ -129,12 +129,6 @@ rm -rf build3/premake*
 rm -rf data
 rm -rf examples

-# Taken from Fedora specfile
-# BulletRobotics and obj2sdf require several bundled libs not yet packaged in 
-# the distribution
-sed -i 's|BulletRobotics||' Extras/CMakeLists.txt
-sed -i 's|obj2sdf||' Extras/CMakeLists.txt
-
 # Fix any file permissions and formats
 dos2unix -c ascii README.md

@ -150,7 +144,11 @@ dos2unix -c ascii README.md
       -DBUILD_SHARED_LIBS=ON \
       -DBUILD_UNIT_TESTS=off \
       -DINSTALL_EXTRA_LIBS=ON \
-       -DINSTALL_LIBS=ON
+       -DINSTALL_LIBS=ON \
+       -DUSE_DOUBLE_PRECISION=ON \
+       -DBUILD_BULLET_ROBOTICS_GUI_EXTRA=OFF \
+       -DBUILD_BULLET_ROBOTICS_EXTRA=OFF \
+       -DBUILD_OBJ2SDF_EXTRA=OFF

 make VERBOSE=1 %{?_smp_mflags}

--- a/use-system-libs.patch
+++ b/use-system-libs.patch
@ -1,14 +1,19 @@
-From: Max Mitschke <max.mitschke@msufcu.org>
-Date: 2019-05-22 22:10:34 -0400
-References: 
-Upstream: never
-Subject: Use system-provided tinyxml2 library instead of bundled library
+From f9163f939804871f8574ccd11cb16719726ef373 Mon Sep 17 00:00:00 2001
+From: Adriankhl <dlshcbmuipmam@hotmail.com>
+Date: Tue, 10 Aug 2021 14:37:36 +0800
+Subject: [PATCH] Use system library
+
 ---
+ CMakeLists.txt                                         | 2 ++
+ Extras/BulletRobotics/CMakeLists.txt                   | 5 ++---
+ Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt | 5 ++---
+ 3 files changed, 6 insertions(+), 6 deletions(-)

-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2018-12-31 15:42:41.000000000 -0500
-+++ b/CMakeLists.txt	2019-05-22 21:00:13.301474451 -0400
-@@ -328,6 +328,8 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a695b7172..e549616c2 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -352,6 +352,8 @@ ENDIF(BUILD_PYBULLET)
 OPTION(BUILD_ENET "Set when you want to build apps with enet UDP networking support" ON)
 OPTION(BUILD_CLSOCKET "Set when you want to build apps with enet TCP networking support" ON)
 
@ -17,9 +22,46 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt
 
 IF(BUILD_PYBULLET)
 	FIND_PACKAGE(PythonLibs)
-diff -Naur a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt	2018-12-31 15:42:41.000000000 -0500
-+++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt	2019-05-22 21:14:35.432401242 -0400
+diff --git a/Extras/BulletRobotics/CMakeLists.txt b/Extras/BulletRobotics/CMakeLists.txt
+index d2ab42334..442f003a5 100644
+--- a/Extras/BulletRobotics/CMakeLists.txt
+++ b/Extras/BulletRobotics/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ 
+ INCLUDE_DIRECTORIES(
+		${tinyxml2_INCLUDE_DIRS}
+ 		${BULLET_PHYSICS_SOURCE_DIR}/src
+ 		${BULLET_PHYSICS_SOURCE_DIR}/examples
+ 		${BULLET_PHYSICS_SOURCE_DIR}/examples/SharedMemory
+@@ -63,7 +64,6 @@ SET(BulletRobotics_INCLUDES
+   ../../examples/Utils/b3ERPCFMHelper.hpp
+   ../../examples/Utils/b3ReferenceFrameHelper.hpp  
+ 
+-  ../../examples/ThirdPartyLibs/tinyxml2/tinyxml2.h
+   ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h
+   ../../examples/ThirdPartyLibs/stb_image/stb_image.h
+   ../../examples/ThirdPartyLibs/BussIK/Jacobian.h
+@@ -147,7 +147,6 @@ SET(BulletRobotics_SRCS ${BulletRobotics_INCLUDES}
+ 	../../examples/Utils/b3ResourcePath.cpp
+ 	../../examples/Utils/ChromeTraceUtil.cpp
+ 
+-	../../examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp
+ 	../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
+ 	../../examples/ThirdPartyLibs/stb_image/stb_image.cpp
+ 	../../examples/ThirdPartyLibs/BussIK/Jacobian.cpp
+@@ -282,7 +281,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES VERSION ${BULLET_VERSION})
+ SET_TARGET_PROPERTIES(BulletRobotics PROPERTIES SOVERSION ${BULLET_VERSION})
+ 
+ IF (BUILD_SHARED_LIBS)
+-	TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common)
+	TARGET_LINK_LIBRARIES(BulletRobotics BulletInverseDynamicsUtils BulletWorldImporter BulletFileLoader BulletSoftBody BulletDynamics BulletCollision BulletInverseDynamics LinearMath Bullet3Common ${tinyxml2_LIBRARIES})
+ ENDIF (BUILD_SHARED_LIBS)
+ 
+   
+diff --git a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
+index 9fd125e44..560ede3d4 100644
+--- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
+++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt
@@ -1,8 +1,8 @@
 INCLUDE_DIRECTORIES(
 +	${tinyxml2_INCLUDE_DIRS}
@ -30,7 +72,7 @@ diff -Naur a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Ser
 )
 
 ADD_LIBRARY(
-@@ -11,14 +11,13 @@
+@@ -11,14 +11,13 @@ ADD_LIBRARY(
 	btBulletXmlWorldImporter.h
 	string_split.cpp
 	string_split.h
@ -46,3 +88,6 @@ diff -Naur a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Ser
 ENDIF (BUILD_SHARED_LIBS)
 
 IF (INSTALL_EXTRA_LIBS)
+-- 
+2.32.0
+