From cce95f197d2df81a5f1046b10aa7283cd4be86fb Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Fri, 16 May 2014 16:57:31 -0400 Subject: [PATCH 01/48] Install all of the bullet extras (rhbz#1097452) - Spec file cleanup --- bullet-2.77-extras-version.patch | 12 ----- bullet-2.77-lib.patch | 24 --------- bullet-2.77-zero_initialize.patch | 23 -------- bullet.spec | 88 ++++++++++++++++--------------- 4 files changed, 45 insertions(+), 102 deletions(-) delete mode 100644 bullet-2.77-extras-version.patch delete mode 100644 bullet-2.77-lib.patch delete mode 100644 bullet-2.77-zero_initialize.patch diff --git a/bullet-2.77-extras-version.patch b/bullet-2.77-extras-version.patch deleted file mode 100644 index bc7769a..0000000 --- a/bullet-2.77-extras-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up bullet-2.77/Extras/glui/CMakeLists.txt.extras-version bullet-2.77/Extras/glui/CMakeLists.txt ---- bullet-2.77/Extras/glui/CMakeLists.txt.extras-version 2010-03-06 16:23:36.000000000 +0100 -+++ bullet-2.77/Extras/glui/CMakeLists.txt 2010-07-26 12:09:01.000000000 +0200 -@@ -61,6 +61,8 @@ arcball.cpp glui_button.cpp glui_fil - - ) - -+SET_TARGET_PROPERTIES(GLUI PROPERTIES VERSION ${BULLET_VERSION}) -+SET_TARGET_PROPERTIES(GLUI PROPERTIES SOVERSION ${BULLET_VERSION}) - IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) - ENDIF (BUILD_SHARED_LIBS) diff --git a/bullet-2.77-lib.patch b/bullet-2.77-lib.patch deleted file mode 100644 index 9575add..0000000 --- a/bullet-2.77-lib.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt.lib bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt ---- bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt.lib 2010-10-08 12:45:59.000000000 +0200 -+++ bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-10-08 12:46:26.000000000 +0200 -@@ -84,7 +84,7 @@ IF (INSTALL_LIBS) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletMultiThreaded DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -- INSTALL(TARGETS BulletMultiThreaded DESTINATION lib) -+ INSTALL(TARGETS BulletMultiThreaded DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING - PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) -diff -up bullet-2.77/src/MiniCL/CMakeLists.txt.lib bullet-2.77/src/MiniCL/CMakeLists.txt ---- bullet-2.77/src/MiniCL/CMakeLists.txt.lib 2010-10-08 12:44:50.000000000 +0200 -+++ bullet-2.77/src/MiniCL/CMakeLists.txt 2010-10-08 12:46:42.000000000 +0200 -@@ -32,7 +32,7 @@ IF (INSTALL_LIBS) - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS MiniCL DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -- INSTALL(TARGETS MiniCL DESTINATION lib) -+ INSTALL(TARGETS MiniCL DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING - PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) diff --git a/bullet-2.77-zero_initialize.patch b/bullet-2.77-zero_initialize.patch deleted file mode 100644 index c9db2fb..0000000 --- a/bullet-2.77-zero_initialize.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: src/BulletSoftBody/btSoftBodyInternals.h -=================================================================== ---- src/BulletSoftBody/btSoftBodyInternals.h (revision 2286) -+++ src/BulletSoftBody/btSoftBodyInternals.h (working copy) -@@ -25,7 +25,7 @@ - #include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" - #include "BulletCollision/CollisionShapes/btConvexInternalShape.h" - #include "BulletCollision/NarrowPhaseCollision/btGjkEpa2.h" -- -+#include //for memset - // - // btSymMatrix - // -@@ -172,8 +172,7 @@ - template - static inline void ZeroInitialize(T& value) - { -- static const T zerodummy; -- value=zerodummy; -+ memset(&value,0,sizeof(T)); - } - // - template diff --git a/bullet.spec b/bullet.spec index 028cc06..25050d6 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.81 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -16,8 +16,6 @@ Source0: %{name}-%{version}-rev%{svnrev}-free.tar.gz # ./generate-tarball.sh 2.81-rev2613 Source1: generate-tarball.sh -Patch0: %{name}-2.77-extras-version.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake @@ -61,7 +59,6 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}-%{version}-rev%{svnrev} -%patch0 -p1 -b .extras-version # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -75,25 +72,24 @@ mv ChangeLog.utf8 ChangeLog %build mkdir build pushd build -%cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=ON -DCMAKE_BUILD_TYPE=NONE -DCMAKE_SKIP_BUILD_RPATH=ON -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet .. +%cmake .. \ + -DBUILD_DEMOS=OFF \ + -DBUILD_EXTRAS=ON \ + -DINSTALL_EXTRA_LIBS=ON \ + -DCMAKE_BUILD_TYPE=NONE \ + -DCMAKE_SKIP_BUILD_RPATH=ON \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet + make %{?_smp_mflags} popd - %install rm -rf $RPM_BUILD_ROOT pushd build -#make install/fast DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - -# install libs from Extras -pushd Extras -cp -a ConvexDecomposition/*so* $RPM_BUILD_ROOT%{_libdir} -cp -a glui/*so* $RPM_BUILD_ROOT%{_libdir} -popd - popd +# Create symlinks for .so.X pushd $RPM_BUILD_ROOT%{_libdir} for f in lib*.so.*.* do @@ -101,18 +97,10 @@ do done popd -# install includes from Extras -pushd Extras -install -p -m 644 ConvexDecomposition/Convex*.h $RPM_BUILD_ROOT%{_includedir}/bullet -install -p -m 644 ConvexDecomposition/vlookup.h $RPM_BUILD_ROOT%{_includedir}/bullet -cp -a glui/GL $RPM_BUILD_ROOT%{_includedir}/bullet -popd - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -123,40 +111,54 @@ rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc README AUTHORS COPYING NEWS ChangeLog -%{_libdir}/*.so.* -%exclude %{_libdir}/libConvexDecomposition.so.* -%exclude %{_libdir}/libGLUI.so.* +%{_libdir}/libBulletCollision.so.* +%{_libdir}/libBulletDynamics.so.* +%{_libdir}/libBulletSoftBody.so.* +%{_libdir}/libLinearMath.so.* %files devel -%defattr(-,root,root,-) %doc Bullet_User_Manual.pdf -%{_includedir}/bullet -%exclude %{_includedir}/bullet/Convex*.h -%exclude %{_includedir}/bullet/vlookup.h -%exclude %{_includedir}/bullet/GL -%{_libdir}/*.so -%exclude %{_libdir}/libConvexDecomposition.so -%exclude %{_libdir}/libGLUI.so +%dir %{_includedir}/%{name} +%{_includedir}/%{name}/*.h +%{_includedir}/%{name}/BulletCollision +%{_includedir}/%{name}/BulletDynamics +%{_includedir}/%{name}/BulletSoftBody +%{_includedir}/%{name}/LinearMath +%{_includedir}/%{name}/vectormath +%{_libdir}/libBulletCollision.so +%{_libdir}/libBulletDynamics.so +%{_libdir}/libBulletSoftBody.so +%{_libdir}/libLinearMath.so %{_libdir}/pkgconfig/bullet.pc %files extras -%defattr(-,root,root,-) %{_libdir}/libConvexDecomposition.so.* -%{_libdir}/libGLUI.so.* +%{_libdir}/libGIMPACTUtils.so.* +%{_libdir}/libHACD.so.* +%{_libdir}/libBulletFileLoader.so.* +%{_libdir}/libBulletWorldImporter.so.* +%{_libdir}/libBulletXmlWorldImporter.so.* %files extras-devel -%defattr(-,root,root,-) -%doc Extras/glui/readme.txt -%{_includedir}/bullet/Convex*.h -%{_includedir}/bullet/vlookup.h -%{_includedir}/bullet/GL +%{_includedir}/%{name}/ConvexDecomposition +%{_includedir}/%{name}/GIMPACTUtils +%{_includedir}/%{name}/HACD +%{_includedir}/%{name}/BulletFileLoader +%{_includedir}/%{name}/BulletWorldImporter +%{_includedir}/%{name}/BulletXmlWorldImporter %{_libdir}/libConvexDecomposition.so -%{_libdir}/libGLUI.so - +%{_libdir}/libGIMPACTUtils.so +%{_libdir}/libHACD.so +%{_libdir}/libBulletFileLoader.so +%{_libdir}/libBulletWorldImporter.so +%{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sun May 18 2014 Rich Mattes - 2.81-3 +- Fix installation of bullet extras (rhbz#1097452) +- Spec file cleanup + * Wed Feb 13 2013 Fedora Release Engineering - 2.81-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 41ac8ccad30278bfd7424b644decd1ec5a25c65b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:41:37 -0500 Subject: [PATCH 02/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 61c2fe3..fee823b 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.82-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri May 16 2014 Rich Mattes - 2.82-2 - Install all of the bullet extras (rhbz#1097452) - Spec file cleanup From 37aff58f48104e39a7849c1041f821584695cc4d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 23:14:23 +0000 Subject: [PATCH 03/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index fee823b..b97cb24 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 2.82-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sat Jun 07 2014 Fedora Release Engineering - 2.82-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From bd1f212ab3fdcb211632aa0afce6ec120935a5bc Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 2 May 2015 12:51:20 +0200 Subject: [PATCH 04/48] Rebuilt for GCC 5 C++11 ABI change --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index b97cb24..d77907a 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sat May 02 2015 Kalev Lember - 2.82-5 +- Rebuilt for GCC 5 C++11 ABI change + * Fri Aug 15 2014 Fedora Release Engineering - 2.82-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 423d63a76ac347e3090997c2d2938fac1feed745 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 02:09:01 +0000 Subject: [PATCH 05/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index d77907a..946555d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.82-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sat May 02 2015 Kalev Lember - 2.82-5 - Rebuilt for GCC 5 C++11 ABI change From 9cefbf556331a2ce4502b27d0fee4eca2d33e8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Wed, 7 Oct 2015 23:21:21 +0200 Subject: [PATCH 06/48] Move Bullet_User_Manual.pdf to a separate devel-doc package --- bullet.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/bullet.spec b/bullet.spec index 946555d..c18a7ff 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 6%{?dist} +Release: 7%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -37,6 +37,16 @@ Requires: cmake Development headers and libraries for %{name}. +%package devel-doc +Summary: Documentation for developing programs that will use %{name}-devel +Group: Development/Libraries +License: zlib and LGPLv2+ +Requires: %{name}-extras%{?_isa} = %{version}-%{release} + +%description devel-doc +Documentation (PDF) for developing programs that will use %{name}-devel. + + %package extras Summary: Extra libraries for %{name} Group: Development/Libraries @@ -119,7 +129,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libLinearMath.so.* %files devel -%doc Bullet_User_Manual.pdf %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h %{_includedir}/%{name}/BulletCollision @@ -134,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/bullet.pc %{_libdir}/cmake/%{name} +%files devel-doc +%doc Bullet_User_Manual.pdf + %files extras %{_libdir}/libConvexDecomposition.so.* %{_libdir}/libGIMPACTUtils.so.* @@ -157,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sat Oct 03 2015 François Cami - 2.82-7 +- Move Bullet_User_Manual.pdf to a separate devel-doc package. + * Wed Jun 17 2015 Fedora Release Engineering - 2.82-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From e3e4924c30fa3ddf547f30610279087ed63e0916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Cami?= Date: Thu, 8 Oct 2015 00:11:04 +0200 Subject: [PATCH 07/48] start preparing generate-tarball.sh for bullet3 (2.83.6) --- generate-tarball.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 0e33b70..88a6ce4 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -6,18 +6,16 @@ if [ $# -ne 1 ]; then fi VERSION=$1 -NAME=bullet +NAME=bullet3 if [ ! -f $NAME-$VERSION.tgz ]; then - wget "https://bullet.googlecode.com/files/$NAME-$VERSION.tgz" + wget "https://codeload.github.com/bulletphysics/bullet3/tar.gz/$VERSION" -O ${NAME}-${VERSION}.tgz fi tar -xzvf $NAME-$VERSION.tgz -rm -f $NAME-$VERSION/*.{DLL,dll} -rm -rf $NAME-$VERSION/Demos -rm -rf $NAME-$VERSION/Extras/{CUDA,khx2dae,software_cache,sph,CDTestFramework} -rm -rf $NAME-$VERSION/Glut -rm -rf $NAME-$VERSION/build +rm -rf $NAME-$VERSION/build3/*.{bat,exe} +rm -rf $NAME-$VERSION/build3/xcode* +rm -rf $NAME-$VERSION/build3/*osx* tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION From 9eb86eed772387912338b3c5b225a9fb0be9d0d5 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 4 Jan 2016 23:19:53 -0500 Subject: [PATCH 08/48] Update to release 2.83 --- .gitignore | 1 + bullet.spec | 62 ++++++++++++++++++++++++++++++--------------- generate-tarball.sh | 5 ++-- sources | 2 +- 4 files changed, 46 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 690cfda..54ae289 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ bullet-2.75-free.tar.gz /bullet-2.80-rev2531-free.tar.gz /bullet-2.81-rev2613-free.tar.gz /bullet-2.82-r2704-free.tar.gz +/bullet3-2.83-free.tar.xz diff --git a/bullet.spec b/bullet.spec index c18a7ff..61346dd 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,14 +1,14 @@ -%global svnrev 2704 +%global _docdir_fmt %{name} Name: bullet -Version: 2.82 -Release: 7%{?dist} +Version: 2.83 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries -License: zlib and MIT and BSD +License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com -Source0: %{name}-%{version}-r%{svnrev}-free.tar.gz +Source0: %{name}3-%{version}-free.tar.xz # bullet contains non-free code that we cannot ship. Therefore we use # this script to remove the non-free code before shipping it. # Download the upstream tarball and invoke this script while in the @@ -16,9 +16,8 @@ Source0: %{name}-%{version}-r%{svnrev}-free.tar.gz # ./generate-tarball.sh 2.82-r2704 Source1: generate-tarball.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: cmake +BuildRequires: dos2unix BuildRequires: freeglut-devel BuildRequires: libICE-devel @@ -68,23 +67,18 @@ Development headers and libraries for %{name} extra libraries. %prep -%setup -q -n %{name}-%{version}-r%{svnrev} +%setup -q -n %{name}3-%{version} +rm -rf examples +dos2unix README.md -# Set these files to right permission -chmod 644 src/LinearMath/btPoolAllocator.h -chmod 644 src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp -chmod 644 src/BulletDynamics/ConstraintSolver/btSliderConstraint.h - -iconv -f ISO-8859-1 -t UTF-8 -o ChangeLog.utf8 ChangeLog -mv ChangeLog.utf8 ChangeLog -# Don't build bundled glui -rm -fr Extras/glui/* +chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.h +chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp %build mkdir build pushd build %cmake .. \ - -DBUILD_DEMOS=OFF \ + -DBUILD_BULLET2_DEMOS=OFF \ -DBUILD_EXTRAS=ON \ -DINSTALL_EXTRA_LIBS=ON \ -DCMAKE_BUILD_TYPE=NONE \ @@ -94,6 +88,8 @@ pushd build make %{?_smp_mflags} popd +doxygen Doxyfile + %install rm -rf $RPM_BUILD_ROOT pushd build @@ -122,7 +118,13 @@ rm -rf $RPM_BUILD_ROOT %files -%doc README AUTHORS COPYING NEWS ChangeLog +%license LICENSE.txt +%doc README.md AUTHORS.txt VERSION +%{_libdir}/libBullet3Collision.so.* +%{_libdir}/libBullet3Common.so.* +%{_libdir}/libBullet3Dynamics.so.* +%{_libdir}/libBullet3Geometry.so.* +%{_libdir}/libBullet3OpenCL_clew.so.* %{_libdir}/libBulletCollision.so.* %{_libdir}/libBulletDynamics.so.* %{_libdir}/libBulletSoftBody.so.* @@ -131,11 +133,20 @@ rm -rf $RPM_BUILD_ROOT %files devel %dir %{_includedir}/%{name} %{_includedir}/%{name}/*.h +%{_includedir}/%{name}/Bullet3Collision +%{_includedir}/%{name}/Bullet3Common +%{_includedir}/%{name}/Bullet3Dynamics +%{_includedir}/%{name}/Bullet3Geometry +%{_includedir}/%{name}/Bullet3OpenCL %{_includedir}/%{name}/BulletCollision %{_includedir}/%{name}/BulletDynamics %{_includedir}/%{name}/BulletSoftBody %{_includedir}/%{name}/LinearMath -%{_includedir}/%{name}/vectormath +%{_libdir}/libBullet3Collision.so +%{_libdir}/libBullet3Common.so +%{_libdir}/libBullet3Dynamics.so +%{_libdir}/libBullet3Geometry.so +%{_libdir}/libBullet3OpenCL_clew.so %{_libdir}/libBulletCollision.so %{_libdir}/libBulletDynamics.so %{_libdir}/libBulletSoftBody.so @@ -144,13 +155,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/cmake/%{name} %files devel-doc -%doc Bullet_User_Manual.pdf +%doc docs/Bullet_User_Manual.pdf +%doc docs/BulletQuickstart.pdf +%doc docs/GPU_rigidbody_using_OpenCL.pdf +%doc html %files extras %{_libdir}/libConvexDecomposition.so.* %{_libdir}/libGIMPACTUtils.so.* %{_libdir}/libHACD.so.* %{_libdir}/libBulletFileLoader.so.* +%{_libdir}/libBullet2FileLoader.so.* %{_libdir}/libBulletWorldImporter.so.* %{_libdir}/libBulletXmlWorldImporter.so.* @@ -159,16 +174,21 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}/GIMPACTUtils %{_includedir}/%{name}/HACD %{_includedir}/%{name}/BulletFileLoader +%{_includedir}/%{name}/Bullet2FileLoader %{_includedir}/%{name}/BulletWorldImporter %{_includedir}/%{name}/BulletXmlWorldImporter %{_libdir}/libConvexDecomposition.so %{_libdir}/libGIMPACTUtils.so %{_libdir}/libHACD.so %{_libdir}/libBulletFileLoader.so +%{_libdir}/libBullet2FileLoader.so %{_libdir}/libBulletWorldImporter.so %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Mon Jan 04 2016 Rich Mattes - 2.83-1 +- Update to release 2.83 + * Sat Oct 03 2015 François Cami - 2.82-7 - Move Bullet_User_Manual.pdf to a separate devel-doc package. diff --git a/generate-tarball.sh b/generate-tarball.sh index 88a6ce4..e949bc9 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -16,6 +16,7 @@ tar -xzvf $NAME-$VERSION.tgz rm -rf $NAME-$VERSION/build3/*.{bat,exe} rm -rf $NAME-$VERSION/build3/xcode* rm -rf $NAME-$VERSION/build3/*osx* +rm -rf $NAME-$VERSION/build3/premake4_* +rm -rf $NAME-$VERSION/data -tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION - +tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION diff --git a/sources b/sources index 157ad3d..915c303 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0557861c6cc334228e2a8e5ac8bb1732 bullet-2.82-r2704-free.tar.gz +392430f0909a3f913f07fcdb599d4950 bullet3-2.83-free.tar.xz From 75909213b8da1ef2cdcf4b81bbedcc9e8411dfa1 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Fri, 15 Jan 2016 20:44:22 -0500 Subject: [PATCH 09/48] Fix include install dir, add missing BR on doxygen --- bullet.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 61346dd..c392625 100644 --- a/bullet.spec +++ b/bullet.spec @@ -18,6 +18,7 @@ Source1: generate-tarball.sh BuildRequires: cmake BuildRequires: dos2unix +BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: libICE-devel @@ -83,7 +84,7 @@ pushd build -DINSTALL_EXTRA_LIBS=ON \ -DCMAKE_BUILD_TYPE=NONE \ -DCMAKE_SKIP_BUILD_RPATH=ON \ - -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet + -DINCLUDE_INSTALL_DIR=include/bullet make %{?_smp_mflags} popd From a240091e623a391ced4b87d944d76d9e1799feb4 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Fri, 15 Jan 2016 21:03:11 -0500 Subject: [PATCH 10/48] Fix include install destination in .pc file --- bullet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bullet.spec b/bullet.spec index c392625..7858fff 100644 --- a/bullet.spec +++ b/bullet.spec @@ -71,7 +71,7 @@ Development headers and libraries for %{name} extra libraries. %setup -q -n %{name}3-%{version} rm -rf examples dos2unix README.md - +sed -i 's|-I@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@|-I@INCLUDE_INSTALL_DIR@|' bullet.pc.cmake chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.h chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp @@ -84,7 +84,7 @@ pushd build -DINSTALL_EXTRA_LIBS=ON \ -DCMAKE_BUILD_TYPE=NONE \ -DCMAKE_SKIP_BUILD_RPATH=ON \ - -DINCLUDE_INSTALL_DIR=include/bullet + -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ make %{?_smp_mflags} popd From c6f0870c21e08d223cd1c358cdb0510a4e4716ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:16:56 +0000 Subject: [PATCH 11/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 7858fff..a44b55a 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.83 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.83-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 04 2016 Rich Mattes - 2.83-1 - Update to release 2.83 From aeb2246380d90d6f5274fbd22bc34718c1a6b9d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:07:32 +0000 Subject: [PATCH 12/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index a44b55a..02f63f8 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.83 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.83-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 2.83-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 45e110a5633857f4c1b930fea6710fadd4c82aa1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 04:19:20 +0000 Subject: [PATCH 13/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 02f63f8..7cd8761 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.83 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.83-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.83-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 88fd4e7a9fb0085c234613806b1b066a5254b2d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 18:28:03 +0000 Subject: [PATCH 14/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 7cd8761..c85dba4 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.83 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 2.83-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 2.83-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 61eafb381db5bf7a2ab601471ee6b7b56e01eb7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Aug 2017 11:51:42 +0200 Subject: [PATCH 15/48] Rebuilt for AutoReq cmake-filesystem --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index c85dba4..96b1e36 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.83 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -187,6 +187,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sun Aug 06 2017 Björn Esser - 2.83-6 +- Rebuilt for AutoReq cmake-filesystem + * Wed Aug 02 2017 Fedora Release Engineering - 2.83-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a113b848bb9e70d8201177cfe886e507fed61df0 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 18 Dec 2017 10:27:05 -0500 Subject: [PATCH 16/48] Update to release 2.87 (rhbz#1442838) --- .gitignore | 1 + bullet-2.87-tinyxml.patch | 73 +++++++++++++++++++++++++++++++++++++++ bullet.spec | 56 ++++++++++++++++++------------ generate-tarball.sh | 3 +- sources | 2 +- 5 files changed, 110 insertions(+), 25 deletions(-) create mode 100644 bullet-2.87-tinyxml.patch diff --git a/.gitignore b/.gitignore index 54ae289..dc1f6ec 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ bullet-2.75-free.tar.gz /bullet-2.81-rev2613-free.tar.gz /bullet-2.82-r2704-free.tar.gz /bullet3-2.83-free.tar.xz +/bullet3-2.87-free.tar.xz diff --git a/bullet-2.87-tinyxml.patch b/bullet-2.87-tinyxml.patch new file mode 100644 index 0000000..f6438f0 --- /dev/null +++ b/bullet-2.87-tinyxml.patch @@ -0,0 +1,73 @@ +diff -up ./CMakeLists.txt.tinyxml ./CMakeLists.txt +--- ./CMakeLists.txt.tinyxml 2017-09-29 19:20:39.000000000 -0400 ++++ ./CMakeLists.txt 2017-11-28 19:14:12.377026680 -0500 +@@ -324,6 +324,8 @@ OPTION(BUILD_PYBULLET "Set when you want + 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) + ++include(FindPkgConfig) ++pkg_check_modules(tinyxml REQUIRED tinyxml) + + IF(BUILD_PYBULLET) + FIND_PACKAGE(PythonLibs) +diff -up ./Extras/BulletRobotics/CMakeLists.txt.tinyxml ./Extras/BulletRobotics/CMakeLists.txt +--- ./Extras/BulletRobotics/CMakeLists.txt.tinyxml 2017-09-29 19:20:39.000000000 -0400 ++++ ./Extras/BulletRobotics/CMakeLists.txt 2017-11-28 19:14:12.377026680 -0500 +@@ -1,5 +1,6 @@ + + INCLUDE_DIRECTORIES( ++ ${tinyxml_INCLUDE_DIRS} + ${BULLET_PHYSICS_SOURCE_DIR}/src + ${BULLET_PHYSICS_SOURCE_DIR}/examples + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs +@@ -59,11 +60,6 @@ SET(BulletRobotics_SRCS + ../../examples/Utils/b3ReferenceFrameHelper.hpp + ../../examples/Utils/ChromeTraceUtil.cpp + +- ../../examples/ThirdPartyLibs/tinyxml/tinystr.cpp +- ../../examples/ThirdPartyLibs/tinyxml/tinyxml.cpp +- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlerror.cpp +- ../../examples/ThirdPartyLibs/tinyxml/tinyxmlparser.cpp +- + ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp + ../../examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.h + +@@ -162,7 +158,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PRO + 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 ${tinyxml_LIBRARIES}) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) +diff -up ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +--- ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml 2017-11-28 19:15:57.409991121 -0500 ++++ ./Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt 2017-11-28 19:16:25.840981495 -0500 +@@ -1,4 +1,5 @@ + INCLUDE_DIRECTORIES( ++ ${tinyxml_INCLUDE_DIRS} + ${BULLET_PHYSICS_SOURCE_DIR}/src + ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader + ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter +@@ -10,19 +11,13 @@ ADD_LIBRARY( + btBulletXmlWorldImporter.h + string_split.cpp + string_split.h +- tinyxml.cpp +- tinyxml.h +- tinystr.cpp +- tinystr.h +- tinyxmlerror.cpp +- tinyxmlparser.cpp + ) + + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath ${tinyxml_LIBRARIES}) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) diff --git a/bullet.spec b/bullet.spec index 96b1e36..5bb89db 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,8 +1,8 @@ %global _docdir_fmt %{name} Name: bullet -Version: 2.83 -Release: 6%{?dist} +Version: 2.87 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -13,9 +13,12 @@ Source0: %{name}3-%{version}-free.tar.xz # this script to remove the non-free code before shipping it. # Download the upstream tarball and invoke this script while in the # tarball's directory: -# ./generate-tarball.sh 2.82-r2704 +# ./generate-tarball.sh 2.87 Source1: generate-tarball.sh +# Build against system tinyxml +Patch0: %{name}-2.87-tinyxml.patch + BuildRequires: cmake BuildRequires: dos2unix BuildRequires: doxygen @@ -69,9 +72,19 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}3-%{version} -rm -rf examples -dos2unix README.md +%patch0 -p0 -b .tinyxml +# The examples directory isn't needed for building +rm -r examples + +# Fix the pkg-config module so it doesn't list the prefix twice in the include install dir. sed -i 's|-I@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@|-I@INCLUDE_INSTALL_DIR@|' bullet.pc.cmake + +# 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 up file permissions and formats +dos2unix README.md chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.h chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp @@ -79,11 +92,14 @@ chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp mkdir build pushd build %cmake .. \ + -DCLSOCKET_DEP_ONLY=ON \ -DBUILD_BULLET2_DEMOS=OFF \ -DBUILD_EXTRAS=ON \ + -DBUILD_OPENGL_DEMOS=OFF \ + -DBUILD_CPU_DEMOS=OFF \ + -DBUILD_UNIT_TESTS=OFF \ -DINSTALL_EXTRA_LIBS=ON \ - -DCMAKE_BUILD_TYPE=NONE \ - -DCMAKE_SKIP_BUILD_RPATH=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ make %{?_smp_mflags} @@ -92,22 +108,7 @@ popd doxygen Doxyfile %install -rm -rf $RPM_BUILD_ROOT -pushd build -make install DESTDIR=$RPM_BUILD_ROOT -popd - -# Create symlinks for .so.X -pushd $RPM_BUILD_ROOT%{_libdir} -for f in lib*.so.*.* -do - ln -sf $f ${f%\.*} -done -popd - - -%clean -rm -rf $RPM_BUILD_ROOT +%make_install -C build %post -p /sbin/ldconfig @@ -128,6 +129,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBullet3OpenCL_clew.so.* %{_libdir}/libBulletCollision.so.* %{_libdir}/libBulletDynamics.so.* +%{_libdir}/libBulletInverseDynamics.so.* %{_libdir}/libBulletSoftBody.so.* %{_libdir}/libLinearMath.so.* @@ -141,7 +143,9 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/%{name}/Bullet3OpenCL %{_includedir}/%{name}/BulletCollision %{_includedir}/%{name}/BulletDynamics +%{_includedir}/%{name}/BulletInverseDynamics %{_includedir}/%{name}/BulletSoftBody +%{_includedir}/%{name}/InverseDynamics %{_includedir}/%{name}/LinearMath %{_libdir}/libBullet3Collision.so %{_libdir}/libBullet3Common.so @@ -150,6 +154,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBullet3OpenCL_clew.so %{_libdir}/libBulletCollision.so %{_libdir}/libBulletDynamics.so +%{_libdir}/libBulletInverseDynamics.so %{_libdir}/libBulletSoftBody.so %{_libdir}/libLinearMath.so %{_libdir}/pkgconfig/bullet.pc @@ -167,6 +172,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libHACD.so.* %{_libdir}/libBulletFileLoader.so.* %{_libdir}/libBullet2FileLoader.so.* +%{_libdir}/libBulletInverseDynamicsUtils.so.* %{_libdir}/libBulletWorldImporter.so.* %{_libdir}/libBulletXmlWorldImporter.so.* @@ -183,10 +189,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libHACD.so %{_libdir}/libBulletFileLoader.so %{_libdir}/libBullet2FileLoader.so +%{_libdir}/libBulletInverseDynamicsUtils.so %{_libdir}/libBulletWorldImporter.so %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Mon Dec 18 2017 Rich Mattes - 2.87-1 +- Update to release 2.87 (rhbz#1442838) + * Sun Aug 06 2017 Björn Esser - 2.83-6 - Rebuilt for AutoReq cmake-filesystem diff --git a/generate-tarball.sh b/generate-tarball.sh index e949bc9..8466b81 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -16,7 +16,8 @@ tar -xzvf $NAME-$VERSION.tgz rm -rf $NAME-$VERSION/build3/*.{bat,exe} rm -rf $NAME-$VERSION/build3/xcode* rm -rf $NAME-$VERSION/build3/*osx* -rm -rf $NAME-$VERSION/build3/premake4_* +rm -rf $NAME-$VERSION/build3/premake* rm -rf $NAME-$VERSION/data +rm -rf $NAME-$VERSION/examples/ThirdPartyLibs tar -cJvf $NAME-$VERSION-free.tar.xz $NAME-$VERSION diff --git a/sources b/sources index 915c303..0719e2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -392430f0909a3f913f07fcdb599d4950 bullet3-2.83-free.tar.xz +SHA512 (bullet3-2.87-free.tar.xz) = 391fd2cdfe0932f4bf7e78555d56c2de5c5051cc251d3a3c7d72d942a3f764330295ae207cf670294157fe9508e8a667faf6b75099a282f8c2e2757f01c56b47 From fc8278d32022f70fa48ed91b4f8a66a6fd957bd6 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Mon, 18 Dec 2017 10:32:01 -0500 Subject: [PATCH 17/48] Add tinyxml dep --- bullet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 5bb89db..f42c174 100644 --- a/bullet.spec +++ b/bullet.spec @@ -24,7 +24,7 @@ BuildRequires: dos2unix BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: libICE-devel - +BuildRequires: tinyxml-devel %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games From f43e55d9754fc07532acc13be609292416f66a5c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 04:17:33 +0000 Subject: [PATCH 18/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index f42c174..7770c0a 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -194,6 +194,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.87-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Dec 18 2017 Rich Mattes - 2.87-1 - Update to release 2.87 (rhbz#1442838) From 33b0f1499756a7006a3a8d92e2154d6bb43fad09 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 7 Mar 2018 16:28:27 -0800 Subject: [PATCH 19/48] Rebuild to fix GCC 8 mis-compilation See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") --- bullet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 7770c0a..990f308 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -194,6 +194,10 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Mar 07 2018 Adam Williamson - 2.87-3 +- Rebuild to fix GCC 8 mis-compilation + See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") + * Wed Feb 07 2018 Fedora Release Engineering - 2.87-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From c21c4d3f7478e14adfccb7ae0fbb4bcfb7cd5b91 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:42 +0200 Subject: [PATCH 20/48] add BuildRequires: gcc-c++,gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- bullet.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bullet.spec b/bullet.spec index 990f308..960ba3a 100644 --- a/bullet.spec +++ b/bullet.spec @@ -19,6 +19,8 @@ Source1: generate-tarball.sh # Build against system tinyxml Patch0: %{name}-2.87-tinyxml.patch +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: dos2unix BuildRequires: doxygen From 0aa3f552d848fb8468991fed9cbed616ed2bcdd4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:25:09 +0000 Subject: [PATCH 21/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 960ba3a..ad03fbb 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD and Boost @@ -196,6 +196,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 2.87-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Mar 07 2018 Adam Williamson - 2.87-3 - Rebuild to fix GCC 8 mis-compilation See https://da.gd/YJVwk ("GCC 8 ABI change on x86_64") From c683bf326aca51ecb6d4655b28bf979c3dbf1021 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 15 Aug 2018 14:40:05 +0200 Subject: [PATCH 22/48] Few clean-ups --- bullet.spec | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/bullet.spec b/bullet.spec index ad03fbb..38b1bab 100644 --- a/bullet.spec +++ b/bullet.spec @@ -4,7 +4,6 @@ Name: bullet Version: 2.87 Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library -Group: Development/Libraries License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -35,7 +34,6 @@ and animation. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: cmake %description devel @@ -44,7 +42,6 @@ Development headers and libraries for %{name}. %package devel-doc Summary: Documentation for developing programs that will use %{name}-devel -Group: Development/Libraries License: zlib and LGPLv2+ Requires: %{name}-extras%{?_isa} = %{version}-%{release} @@ -54,7 +51,6 @@ Documentation (PDF) for developing programs that will use %{name}-devel. %package extras Summary: Extra libraries for %{name} -Group: Development/Libraries License: zlib and LGPLv2+ %description extras @@ -63,7 +59,6 @@ Extra libraries for %{name}. %package extras-devel Summary: Development files for %{name} extras -Group: Development/Libraries License: zlib and LGPLv2+ Requires: %{name}-extras%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release} @@ -104,7 +99,7 @@ pushd build -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ -make %{?_smp_mflags} +%make_build popd doxygen Doxyfile @@ -112,13 +107,10 @@ doxygen Doxyfile %install %make_install -C build -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets -%post extras -p /sbin/ldconfig - -%postun extras -p /sbin/ldconfig +%ldconfig_scriptlets extras %files From 3bee26481c6a3db3123aa6ec141333ca22af1627 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 27 Aug 2018 12:41:46 +0200 Subject: [PATCH 23/48] Add changelog --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 38b1bab..8491b85 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -188,6 +188,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Mon Aug 27 2018 Nicolas Chauvet - 2.87-5 +- Spec clean-up + * Thu Jul 12 2018 Fedora Release Engineering - 2.87-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 00d1d31682b43d848a4f3bea340da05ef68b28ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 15:01:00 +0000 Subject: [PATCH 24/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 8491b85..f19db85 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -188,6 +188,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.87-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Aug 27 2018 Nicolas Chauvet - 2.87-5 - Spec clean-up From 042f6baa25862426145b20c59e8739e9a22146cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:40:56 +0000 Subject: [PATCH 25/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index f19db85..40bf2a7 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 6%{?dist} +Release: 7%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -188,6 +188,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 2.87-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 2.87-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 400a88ed727a45c3d5dc2ef9fca7b4202f0b9412 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 13:24:35 +0000 Subject: [PATCH 26/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 40bf2a7..2e6a6ef 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 7%{?dist} +Release: 8%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -188,6 +188,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.87-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 2.87-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 361338d556a35650de687771f8bc797dfe0834f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:29:08 +0000 Subject: [PATCH 27/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 2e6a6ef..c830977 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 8%{?dist} +Release: 9%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -188,6 +188,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.87-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 2.87-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2f710f13c4e8715117637c7ef3e9a8b1574e9128 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Wed, 29 Jul 2020 19:02:21 -0400 Subject: [PATCH 28/48] Apply upstream patch for compiler warnings (rhbz#1856910) --- bullet-compile-warning.patch | 42 ++++++++++++++++++++++++++++++++++++ bullet.spec | 10 ++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 bullet-compile-warning.patch diff --git a/bullet-compile-warning.patch b/bullet-compile-warning.patch new file mode 100644 index 0000000..9c9338a --- /dev/null +++ b/bullet-compile-warning.patch @@ -0,0 +1,42 @@ +From 886650a038f610081d9fe420f64d23d89b9a139c Mon Sep 17 00:00:00 2001 +From: "erwin.coumans@gmail.com" + +Date: Sun, 17 Nov 2013 20:13:50 +0000 +Subject: [PATCH] fix 'unused' warning. Fixes Issue 770 + +--- + src/LinearMath/btScalar.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h +index 37c6dec191..225d49f3ff 100644 +--- a/src/LinearMath/btScalar.h ++++ b/src/LinearMath/btScalar.h +@@ -284,6 +284,10 @@ static int btNanMask = 0x7F800001; + #ifndef BT_INFINITY + static int btInfinityMask = 0x7F800000; + #define BT_INFINITY (*(float*)&btInfinityMask) ++inline int btGetInfinityMask()//suppress stupid compiler warning ++{ ++ return btInfinityMask; ++} + #endif + + //use this, in case there are clashes (such as xnamath.h) +@@ -336,6 +340,10 @@ inline __m128 operator * (const __m128 A, const __m128 B) + #ifndef BT_INFINITY + static int btInfinityMask = 0x7F800000; + #define BT_INFINITY (*(float*)&btInfinityMask) ++ inline int btGetInfinityMask()//suppress stupid compiler warning ++ { ++ return btInfinityMask; ++ } + #endif + #endif//BT_USE_NEON + +@@ -728,4 +736,5 @@ template T* btAlignPointer(T* unalignedPtr, size_t alignment) + return converter.ptr; + } + ++ + #endif //BT_SCALAR_H diff --git a/bullet.spec b/bullet.spec index 7dd8c40..cb12272 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -22,6 +22,10 @@ BuildRequires: cmake BuildRequires: freeglut-devel BuildRequires: libICE-devel +# Patch to silence some compiler warnings. +# Backport of upstream 886650a03 +# rhbz#1856910 +Patch0: bullet-compile-warning.patch %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games @@ -59,6 +63,7 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}-%{version}-r%{svnrev} +%patch0 -p1 # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -157,6 +162,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 29 2020 Rich Mattes - 2.82-3 +- Apply upstream patch for compiler warnings (rhbz#1856910) + * Sun Sep 07 2014 Rich Mattes - 2.82-2 - Install all of the bullet extras (rhbz#1097452) - Spec file cleanup From 09611636c4c1af13fb735cea1f5820873048822a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:17:15 +0000 Subject: [PATCH 29/48] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index c830977..23436a6 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 9%{?dist} +Release: 10%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -188,6 +188,10 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.87-10 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.87-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 10e598244e79a420720214f8fbeeb8aa6be6a5f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Mon, 3 Aug 2020 12:33:10 +0200 Subject: [PATCH 30/48] update for out of tree build --- bullet.spec | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/bullet.spec b/bullet.spec index 23436a6..ee5e743 100644 --- a/bullet.spec +++ b/bullet.spec @@ -86,9 +86,7 @@ chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.h chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp %build -mkdir build -pushd build -%cmake .. \ +%cmake \ -DCLSOCKET_DEP_ONLY=ON \ -DBUILD_BULLET2_DEMOS=OFF \ -DBUILD_EXTRAS=ON \ @@ -99,13 +97,12 @@ pushd build -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ -%make_build -popd +%cmake_build doxygen Doxyfile %install -%make_install -C build +%cmake_install %ldconfig_scriptlets From 6ff148d4742380ff535fe51608ad77e9942cc78e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:28:57 +0000 Subject: [PATCH 31/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index ee5e743..0e8c9d1 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.87 -Release: 10%{?dist} +Release: 11%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -185,6 +185,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.87-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 01 2020 Fedora Release Engineering - 2.87-10 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b39416b1892e436e258f57689032e31c703dec21 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 11 Feb 2021 17:15:58 -0500 Subject: [PATCH 32/48] update to 3.08 --- .gitignore | 1 + ...ix-c++-one-definition-rule-violation.patch | 60 +++++++++++++++ bullet-3.08-tinyxml2.patch | 76 +++++++++++++++++++ bullet.spec | 25 ++++-- sources | 2 +- 5 files changed, 155 insertions(+), 9 deletions(-) create mode 100644 bullet-3.08-fix-c++-one-definition-rule-violation.patch create mode 100644 bullet-3.08-tinyxml2.patch diff --git a/.gitignore b/.gitignore index dc1f6ec..8587488 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bullet-2.75-free.tar.gz /bullet-2.82-r2704-free.tar.gz /bullet3-2.83-free.tar.xz /bullet3-2.87-free.tar.xz +/bullet3-3.08-free.tar.xz diff --git a/bullet-3.08-fix-c++-one-definition-rule-violation.patch b/bullet-3.08-fix-c++-one-definition-rule-violation.patch new file mode 100644 index 0000000..d8cb70b --- /dev/null +++ b/bullet-3.08-fix-c++-one-definition-rule-violation.patch @@ -0,0 +1,60 @@ +diff -up bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp.fix-odr bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp +--- bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp.fix-odr 2021-02-11 11:17:29.417618076 -0500 ++++ bullet3-3.08/src/BulletSoftBody/btSoftMultiBodyDynamicsWorld.cpp 2021-02-11 11:18:01.669770577 -0500 +@@ -177,7 +177,7 @@ void btSoftMultiBodyDynamicsWorld::debug + } + } + +-struct btSoftSingleRayCallback : public btBroadphaseRayCallback ++struct btSoftMultiBodySingleRayCallback : public btBroadphaseRayCallback + { + btVector3 m_rayFromWorld; + btVector3 m_rayToWorld; +@@ -188,7 +188,7 @@ struct btSoftSingleRayCallback : public + const btSoftMultiBodyDynamicsWorld* m_world; + btCollisionWorld::RayResultCallback& m_resultCallback; + +- btSoftSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftMultiBodyDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) ++ btSoftMultiBodySingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftMultiBodyDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) + : m_rayFromWorld(rayFromWorld), + m_rayToWorld(rayToWorld), + m_world(world), +@@ -256,7 +256,7 @@ void btSoftMultiBodyDynamicsWorld::rayTe + BT_PROFILE("rayTest"); + /// use the broadphase to accelerate the search for objects, based on their aabb + /// and for each object with ray-aabb overlap, perform an exact ray test +- btSoftSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); ++ btSoftMultiBodySingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); + + #ifndef USE_BRUTEFORCE_RAYBROADPHASE + m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB); +diff -up bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp.fix-odr bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp +--- bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp.fix-odr 2021-02-11 11:16:19.157285864 -0500 ++++ bullet3-3.08/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp 2021-02-11 11:16:44.220404370 -0500 +@@ -172,7 +172,7 @@ void btSoftRigidDynamicsWorld::debugDraw + } + } + +-struct btSoftSingleRayCallback : public btBroadphaseRayCallback ++struct btSoftRigidSingleRayCallback : public btBroadphaseRayCallback + { + btVector3 m_rayFromWorld; + btVector3 m_rayToWorld; +@@ -183,7 +183,7 @@ struct btSoftSingleRayCallback : public + const btSoftRigidDynamicsWorld* m_world; + btCollisionWorld::RayResultCallback& m_resultCallback; + +- btSoftSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftRigidDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) ++ btSoftRigidSingleRayCallback(const btVector3& rayFromWorld, const btVector3& rayToWorld, const btSoftRigidDynamicsWorld* world, btCollisionWorld::RayResultCallback& resultCallback) + : m_rayFromWorld(rayFromWorld), + m_rayToWorld(rayToWorld), + m_world(world), +@@ -251,7 +251,7 @@ void btSoftRigidDynamicsWorld::rayTest(c + BT_PROFILE("rayTest"); + /// use the broadphase to accelerate the search for objects, based on their aabb + /// and for each object with ray-aabb overlap, perform an exact ray test +- btSoftSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); ++ btSoftRigidSingleRayCallback rayCB(rayFromWorld, rayToWorld, this, resultCallback); + + #ifndef USE_BRUTEFORCE_RAYBROADPHASE + m_broadphasePairCache->rayTest(rayFromWorld, rayToWorld, rayCB); diff --git a/bullet-3.08-tinyxml2.patch b/bullet-3.08-tinyxml2.patch new file mode 100644 index 0000000..0bbf7b5 --- /dev/null +++ b/bullet-3.08-tinyxml2.patch @@ -0,0 +1,76 @@ +diff -up bullet3-3.08/CMakeLists.txt.tinyxml bullet3-3.08/CMakeLists.txt +--- bullet3-3.08/CMakeLists.txt.tinyxml 2020-12-22 20:29:33.000000000 -0500 ++++ bullet3-3.08/CMakeLists.txt 2021-02-11 10:42:15.135608499 -0500 +@@ -349,6 +349,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) + ++include(FindPkgConfig) ++pkg_check_modules(tinyxml2 REQUIRED tinyxml2) + + IF(BUILD_PYBULLET) + FIND_PACKAGE(PythonLibs) +diff -up bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt.tinyxml bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt +--- bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt.tinyxml 2021-02-11 10:42:15.136608503 -0500 ++++ bullet3-3.08/Extras/BulletRobotics/CMakeLists.txt 2021-02-11 10:46:27.929805933 -0500 +@@ -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 +@@ -60,7 +61,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 +@@ -129,7 +129,6 @@ SET(BulletRobotics_SRCS ${BulletRobotics + ../../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 +@@ -245,7 +244,7 @@ SET_TARGET_PROPERTIES(BulletRobotics PRO + 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 -up bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt +--- bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt.tinyxml 2020-12-22 20:29:33.000000000 -0500 ++++ bullet3-3.08/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt 2021-02-11 10:47:36.997133090 -0500 +@@ -1,8 +1,8 @@ + INCLUDE_DIRECTORIES( ++ ${tinyxml2_INCLUDE_DIRS} + ${BULLET_PHYSICS_SOURCE_DIR}/src + ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader + ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter +- ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/tinyxml2 + ) + + ADD_LIBRARY( +@@ -11,14 +11,13 @@ ADD_LIBRARY( + btBulletXmlWorldImporter.h + string_split.cpp + string_split.h +- ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/tinyxml2/tinyxml2.cpp + ) + + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) + SET_TARGET_PROPERTIES(BulletXmlWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + + IF (BUILD_SHARED_LIBS) +- TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) ++ TARGET_LINK_LIBRARIES(BulletXmlWorldImporter BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath ${tinyxml2_LIBRARIES}) + ENDIF (BUILD_SHARED_LIBS) + + IF (INSTALL_EXTRA_LIBS) diff --git a/bullet.spec b/bullet.spec index 0e8c9d1..d893857 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,8 +1,8 @@ %global _docdir_fmt %{name} Name: bullet -Version: 2.87 -Release: 11%{?dist} +Version: 3.08 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -16,7 +16,10 @@ Source0: %{name}3-%{version}-free.tar.xz Source1: generate-tarball.sh # Build against system tinyxml -Patch0: %{name}-2.87-tinyxml.patch +Patch0: %{name}-3.08-tinyxml2.patch + +# Fix C++ One Definition Rule violation +Patch1: %{name}-3.08-fix-c++-one-definition-rule-violation.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -25,7 +28,8 @@ BuildRequires: dos2unix BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: libICE-devel -BuildRequires: tinyxml-devel +BuildRequires: tinyxml2-devel +BuildRequires: libglvnd-devel %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games @@ -69,15 +73,16 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}3-%{version} -%patch0 -p0 -b .tinyxml +%patch0 -p1 -b .tinyxml +%patch1 -p1 -b .fix-odr # The examples directory isn't needed for building rm -r examples # Fix the pkg-config module so it doesn't list the prefix twice in the include install dir. -sed -i 's|-I@CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@|-I@INCLUDE_INSTALL_DIR@|' bullet.pc.cmake +sed -i 's|${prefix}/@INCLUDE_INSTALL_DIR@|@INCLUDE_INSTALL_DIR@|' bullet.pc.cmake -# BulletRobotics and obj2sdf require several bundled libs not yet packaged in the distribution -sed -i 's|BulletRobotics||' Extras/CMakeLists.txt +# BulletRobotics, BulletRoboticsGUI and obj2sdf require several bundled libs not yet packaged in the distribution +sed -i 's|BulletRoboticsGUI BulletRobotics||' Extras/CMakeLists.txt sed -i 's|obj2sdf||' Extras/CMakeLists.txt # Fix up file permissions and formats @@ -95,6 +100,7 @@ chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp -DBUILD_UNIT_TESTS=OFF \ -DINSTALL_EXTRA_LIBS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DOpenGL_GL_PREFERENCE=GLVND \ -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ %cmake_build @@ -185,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Thu Feb 11 2021 Tom Callaway - 3.08-1 +- update to 3.08 + * Tue Jan 26 2021 Fedora Release Engineering - 2.87-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 0719e2b..e4abbb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bullet3-2.87-free.tar.xz) = 391fd2cdfe0932f4bf7e78555d56c2de5c5051cc251d3a3c7d72d942a3f764330295ae207cf670294157fe9508e8a667faf6b75099a282f8c2e2757f01c56b47 +SHA512 (bullet3-3.08-free.tar.xz) = 33f4b187a643e046eda6c2b5dd7ae77743000802105b5ec4324883c5e148917809dfd819dd7b0b6687e03a114a5a66e3ef876e423d58e9f4b7101b550942de33 From 8418ab8725e82d1bb9fff509117350045494a509 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 14:00:41 +0000 Subject: [PATCH 33/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7eb28c407b7f3bf3c2956e1c9d568e0f1e9842d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:58:03 +0000 Subject: [PATCH 34/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index d893857..fb05591 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 3.08-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Feb 11 2021 Tom Callaway - 3.08-1 - update to 3.08 From f859c2aba22dcfa1dd563eb39c145b781fc94c95 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 22:41:51 +0000 Subject: [PATCH 35/48] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index fb05591..7d638a0 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 3.08-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 3.08-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f577fee31354f70ca1b5a7098650ef513bccb0a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 22:22:30 +0000 Subject: [PATCH 36/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 7d638a0..a013c95 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 3.08-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 3.08-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a3e839990a7d3d4ce8320cd6e82b674f2f5a1e36 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sun, 25 Sep 2022 14:41:01 -0400 Subject: [PATCH 37/48] Rebuild for tinyxml2-9.0.0 --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index a013c95..ab0d497 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 4%{?dist} +Release: 5%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sun Sep 25 2022 Rich Mattes - 3.08-5 +- Rebuild for tinyxml2-9.0.0 + * Wed Jul 20 2022 Fedora Release Engineering - 3.08-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From bd531bce5086f328ab29a9f50870200b699d396e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 23:17:16 +0000 Subject: [PATCH 38/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index ab0d497..daf68fa 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 5%{?dist} +Release: 6%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 3.08-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sun Sep 25 2022 Rich Mattes - 3.08-5 - Rebuild for tinyxml2-9.0.0 From 625ca9cf6ac26bdbeddb518f2dd66adeb99a8e34 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 15:04:26 +0000 Subject: [PATCH 39/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index daf68fa..d7e141d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 6%{?dist} +Release: 7%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 3.08-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 3.08-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a4ac8fb3e1f11ce5fd7b6360ea3decf39133f9cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:49:42 +0000 Subject: [PATCH 40/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index d7e141d..3808a95 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 7%{?dist} +Release: 8%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 3.08-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 3.08-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 248f72deca4c1582609b186841b7c195f6fc0053 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:57:22 +0000 Subject: [PATCH 41/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 3808a95..337eece 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 8%{?dist} +Release: 9%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 3.08-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 3.08-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b191b4fddcb700df4021b8fd7523e6db50944608 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 42/48] Eliminate use of obsolete %patchN syntax (#2283636) --- bullet.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bullet.spec b/bullet.spec index 337eece..cdfd43d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -73,8 +73,8 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}3-%{version} -%patch0 -p1 -b .tinyxml -%patch1 -p1 -b .fix-odr +%patch -P0 -p1 -b .tinyxml +%patch -P1 -p1 -b .fix-odr # The examples directory isn't needed for building rm -r examples From 954c753771ad6fbf2d9055725387dc55588fda5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:43:37 +0000 Subject: [PATCH 43/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index cdfd43d..84d993c 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 9%{?dist} +Release: 10%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library License: zlib and MIT and BSD and Boost URL: http://www.bulletphysics.com @@ -191,6 +191,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 3.08-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jan 23 2024 Fedora Release Engineering - 3.08-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 12e661ee7ced9952c39b15995ebfd54c4e96633a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 28 Aug 2024 08:20:44 +0200 Subject: [PATCH 44/48] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- bullet.spec | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/bullet.spec b/bullet.spec index 84d993c..6276d53 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,9 +2,10 @@ Name: bullet Version: 3.08 -Release: 10%{?dist} +Release: 11%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library -License: zlib and MIT and BSD and Boost +# Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 URL: http://www.bulletphysics.com Source0: %{name}3-%{version}-free.tar.xz @@ -46,7 +47,8 @@ Development headers and libraries for %{name}. %package devel-doc Summary: Documentation for developing programs that will use %{name}-devel -License: zlib and LGPLv2+ +# Automatically converted from old format: zlib and LGPLv2+ - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-LGPLv2+ Requires: %{name}-extras%{?_isa} = %{version}-%{release} %description devel-doc @@ -55,7 +57,8 @@ Documentation (PDF) for developing programs that will use %{name}-devel. %package extras Summary: Extra libraries for %{name} -License: zlib and LGPLv2+ +# Automatically converted from old format: zlib and LGPLv2+ - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-LGPLv2+ %description extras Extra libraries for %{name}. @@ -63,7 +66,8 @@ Extra libraries for %{name}. %package extras-devel Summary: Development files for %{name} extras -License: zlib and LGPLv2+ +# Automatically converted from old format: zlib and LGPLv2+ - review is highly recommended. +License: Zlib AND LicenseRef-Callaway-LGPLv2+ Requires: %{name}-extras%{?_isa} = %{version}-%{release} Requires: %{name}-devel%{?_isa} = %{version}-%{release} @@ -191,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Aug 28 2024 Miroslav Suchý - 3.08-11 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 3.08-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 463db811f83b4c71b9529b852e2eac2145ddb662 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 12 Nov 2024 00:51:45 +0000 Subject: [PATCH 45/48] rebuilt for tinyxml2 rebuilt for tinyxml2 rebuilt for tinyxml2 rebuilt for tinyxml2 rebuilt for tinyxml2 --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 6276d53..b1cfbae 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 11%{?dist} +Release: 12%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Tue Nov 12 2024 Dominik Mierzejewski - 3.08-12 +- rebuilt for tinyxml2 + * Wed Aug 28 2024 Miroslav Suchý - 3.08-11 - convert license to SPDX From 67c868aa93a5f19bf37ee90f70c4dd8b1d3e87ba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:02:22 +0000 Subject: [PATCH 46/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index b1cfbae..dd1801d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 12%{?dist} +Release: 13%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 3.08-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Nov 12 2024 Dominik Mierzejewski - 3.08-12 - rebuilt for tinyxml2 From 5a38dbcbd4f90c31f7303dc01320dae4fb8f4360 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:57:44 +0000 Subject: [PATCH 47/48] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index dd1801d..802bc1c 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 13%{?dist} +Release: 14%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 3.08-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 3.08-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7a4e0699ae856610860271a6c3155969d48f40e2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 23 Aug 2025 06:59:01 -0400 Subject: [PATCH 48/48] Rebuilt for tinyxml2 11.0.0 --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 802bc1c..5a26dee 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 3.08 -Release: 14%{?dist} +Release: 15%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library # Automatically converted from old format: zlib and MIT and BSD and Boost - review is highly recommended. License: Zlib AND LicenseRef-Callaway-MIT AND LicenseRef-Callaway-BSD AND BSL-1.0 @@ -195,6 +195,9 @@ doxygen Doxyfile %{_libdir}/libBulletXmlWorldImporter.so %changelog +* Sat Aug 23 2025 Benjamin A. Beasley - 3.08-15 +- Rebuilt for tinyxml2 11.0.0 + * Wed Jul 23 2025 Fedora Release Engineering - 3.08-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild