diff --git a/.gitignore b/.gitignore index 690cfda..8587488 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ 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 +/bullet3-2.87-free.tar.xz +/bullet3-3.08-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-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 61c2fe3..5a26dee 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,27 +1,36 @@ -%global svnrev 2704 +%global _docdir_fmt %{name} Name: bullet -Version: 2.82 -Release: 2%{?dist} +Version: 3.08 +Release: 15%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library -Group: Development/Libraries -License: zlib and MIT and BSD +# 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}-%{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 # tarball's directory: -# ./generate-tarball.sh 2.82-r2704 +# ./generate-tarball.sh 2.87 Source1: generate-tarball.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Build against system tinyxml +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++ BuildRequires: cmake +BuildRequires: dos2unix +BuildRequires: doxygen BuildRequires: freeglut-devel BuildRequires: libICE-devel - +BuildRequires: tinyxml2-devel +BuildRequires: libglvnd-devel %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games @@ -30,17 +39,26 @@ and animation. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} Requires: cmake %description devel Development headers and libraries for %{name}. +%package devel-doc +Summary: Documentation for developing programs that will use %{name}-devel +# 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 +Documentation (PDF) for developing programs that will use %{name}-devel. + + %package extras Summary: Extra libraries for %{name} -Group: Development/Libraries -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}. @@ -48,8 +66,8 @@ Extra libraries for %{name}. %package extras-devel Summary: Development files for %{name} extras -Group: Development/Libraries -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} @@ -58,87 +76,104 @@ Development headers and libraries for %{name} extra libraries. %prep -%setup -q -n %{name}-%{version}-r%{svnrev} +%setup -q -n %{name}3-%{version} +%patch -P0 -p1 -b .tinyxml +%patch -P1 -p1 -b .fix-odr +# The examples directory isn't needed for building +rm -r examples -# 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 +# Fix the pkg-config module so it doesn't list the prefix twice in the include install dir. +sed -i 's|${prefix}/@INCLUDE_INSTALL_DIR@|@INCLUDE_INSTALL_DIR@|' bullet.pc.cmake -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/* +# 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 +dos2unix README.md +chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.h +chmod -x src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp %build -mkdir build -pushd build -%cmake .. \ - -DBUILD_DEMOS=OFF \ +%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 \ - -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DOpenGL_GL_PREFERENCE=GLVND \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet/ -make %{?_smp_mflags} -popd +%cmake_build + +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 +%cmake_install -%clean -rm -rf $RPM_BUILD_ROOT +%ldconfig_scriptlets -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%post extras -p /sbin/ldconfig - -%postun extras -p /sbin/ldconfig +%ldconfig_scriptlets extras %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}/libBulletInverseDynamics.so.* %{_libdir}/libBulletSoftBody.so.* %{_libdir}/libLinearMath.so.* %files devel -%doc Bullet_User_Manual.pdf %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}/BulletInverseDynamics %{_includedir}/%{name}/BulletSoftBody +%{_includedir}/%{name}/InverseDynamics %{_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}/libBulletInverseDynamics.so %{_libdir}/libBulletSoftBody.so %{_libdir}/libLinearMath.so %{_libdir}/pkgconfig/bullet.pc %{_libdir}/cmake/%{name} +%files devel-doc +%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}/libBulletInverseDynamicsUtils.so.* %{_libdir}/libBulletWorldImporter.so.* %{_libdir}/libBulletXmlWorldImporter.so.* @@ -147,16 +182,132 @@ 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}/libBulletInverseDynamicsUtils.so %{_libdir}/libBulletWorldImporter.so %{_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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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") + +* 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) + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 diff --git a/generate-tarball.sh b/generate-tarball.sh index 0e33b70..8466b81 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -6,18 +6,18 @@ 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 - -tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION +rm -rf $NAME-$VERSION/build3/*.{bat,exe} +rm -rf $NAME-$VERSION/build3/xcode* +rm -rf $NAME-$VERSION/build3/*osx* +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 157ad3d..e4abbb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0557861c6cc334228e2a8e5ac8bb1732 bullet-2.82-r2704-free.tar.gz +SHA512 (bullet3-3.08-free.tar.xz) = 33f4b187a643e046eda6c2b5dd7ae77743000802105b5ec4324883c5e148917809dfd819dd7b0b6687e03a114a5a66e3ef876e423d58e9f4b7101b550942de33