From 51a5ae086c6c82ef5b2dd46ee93fc9fe410fffd2 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Sat, 27 Jun 2009 21:39:49 +0000 Subject: [PATCH 01/81] *** empty log message *** --- .cvsignore | 1 + bullet.spec | 147 ++++++++++++++++++++++++++++++++++++++++++++ generate-tarball.sh | 12 ++++ import.log | 1 + lib_suffix.patch | 44 +++++++++++++ sources | 1 + 6 files changed, 206 insertions(+) create mode 100644 bullet.spec create mode 100644 generate-tarball.sh create mode 100644 import.log create mode 100644 lib_suffix.patch diff --git a/.cvsignore b/.cvsignore index e69de29..37faaf5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +bullet-2.74-free.tar.gz diff --git a/bullet.spec b/bullet.spec new file mode 100644 index 0000000..3dc3fcc --- /dev/null +++ b/bullet.spec @@ -0,0 +1,147 @@ +Name: bullet +Version: 2.74 +Release: 1%{?dist} +Summary: 3D Collision Detection and Rigid Body Dynamics Library +Group: Development/Libraries +License: zlib and MIT and BSD +URL: http://www.bulletphysics.com + +Source0: %{name}-%{version}-free.tar.gz +# 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.74 +Source1: generate-tarball.sh + +# See http://code.google.com/p/bullet/issues/detail?id=174 +Patch0: lib_suffix.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: cmake, libGL-devel, libGLU-devel, freeglut-devel, libICE-devel + +%description +Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games +and animation. + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development headers and libraries for %{name}. + + +%prep +%setup -q +%patch0 + +# 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 + +%build +%cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=OFF -DCMAKE_BUILD_TYPE=NONE . +make VERBOSE=1 %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +pushd $RPM_BUILD_ROOT%{_libdir} +for f in lib*.so.*.* +do + ln -sf $f ${f%\.*} +done +popd + + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc README AUTHORS LICENSE NEWS ChangeLog Bullet_Faq.pdf +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%doc Bullet_User_Manual.pdf +%dir %{_includedir}/BulletCollision +%dir %{_includedir}/BulletCollision/BroadphaseCollision +%dir %{_includedir}/BulletCollision/CollisionDispatch +%dir %{_includedir}/BulletCollision/CollisionShapes +%dir %{_includedir}/BulletCollision/Gimpact +%dir %{_includedir}/BulletCollision/NarrowPhaseCollision +%dir %{_includedir}/LinearMath +%dir %{_includedir}/BulletDynamics +%dir %{_includedir}/BulletDynamics/Character +%dir %{_includedir}/BulletDynamics/ConstraintSolver +%dir %{_includedir}/BulletDynamics/Dynamics +%dir %{_includedir}/BulletDynamics/Vehicle +%dir %{_includedir}/BulletSoftBody +%{_includedir}/*.h +%{_includedir}/BulletCollision/BroadphaseCollision/*.h +%{_includedir}/BulletCollision/CollisionDispatch/*.h +%{_includedir}/BulletCollision/CollisionShapes/*.h +%{_includedir}/BulletCollision/Gimpact/*.h +%{_includedir}/BulletCollision/NarrowPhaseCollision/*.h +%{_includedir}/BulletDynamics/Character/*.h +%{_includedir}/BulletDynamics/ConstraintSolver/*.h +%{_includedir}/BulletDynamics/Dynamics/*.h +%{_includedir}/BulletDynamics/Vehicle/*.h +%{_includedir}/BulletSoftBody/*.h +%{_includedir}/LinearMath/*.h +%{_libdir}/*.so + + +%changelog + +* Thu Jun 25 2009 Thomas Kowaliczek - 2.74-1 +- Updatet to version 2.74 +- Updatet the patch file to work agian + +* Sun Feb 22 2009 Bruno Mahé - 2.73-5 +- Shortened the description +- Fix directory ownership for directories BulletCollision and BulletDynamics +- Convert ChangeLog to UTF-8 +- chmod generate-tarball.sh to 644 + +* Fri Feb 20 2009 Bruno Mahé - 2.73-4 +- Remove gcc-g++ in BuildRequires +- Add option -DCMAKE_BUILD_TYPE=NONE to %%cmake. This will make CMake using default compiler flags +- Use %% instead of single % in %%changelog to prevent macros from being expanded +- Specify we are not shipping pristine source because of some non-free parts +- Change licence to "zlib and MIT and BSD" +- Make include directory being owned by this package +- Remove duplicate documents +- Convert spec file to UTF8 +- Set some files permission to 644 + +* Sun Feb 15 2009 Bruno Mahé - 2.73-3 +- Remove non-free directories Demos/, Extras/ and Glut/ from the source + +* Sun Jan 18 2009 Bruno Mahé - 2.73-2 +- Add "rm -rf $RPM_BUILD_ROOT" to the install target +- Moved unversioned shared libraries (e.g. libfoo.so) to the -devel package +- Update %%post and %%postrun +- Change %%description +- Reduce length of %%summary +- Changed %%group to Development/Libraries +- Changed Zlib licence to lowercase zlib +- %%description kept below 80 characters wide + +* Sat Dec 13 2008 Bruno Mahé - 2.73-1 +- Initial build. diff --git a/generate-tarball.sh b/generate-tarball.sh new file mode 100644 index 0000000..c9755c3 --- /dev/null +++ b/generate-tarball.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +VERSION=$1 +NAME=bullet + +tar -xzvf $NAME-$VERSION.tgz +rm -rf $NAME-$VERSION/Demos +rm -rf $NAME-$VERSION/Extras +rm -rf $NAME-$VERSION/Glut + +tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION + diff --git a/import.log b/import.log new file mode 100644 index 0000000..1144a72 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +bullet-2_74-1_fc11:HEAD:bullet-2.74-1.fc11.src.rpm:1246138693 diff --git a/lib_suffix.patch b/lib_suffix.patch new file mode 100644 index 0000000..ce446e6 --- /dev/null +++ b/lib_suffix.patch @@ -0,0 +1,44 @@ +--- ./src/BulletCollision/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 ++++ ./src/BulletCollision/CMakeLists.txt 2009-06-24 23:54:42.899191024 +0200 +@@ -216,7 +216,7 @@ + + #INSTALL of other files requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) +- INSTALL(TARGETS BulletCollision DESTINATION lib) ++ INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + +--- ./src/BulletDynamics/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 ++++ ./src/BulletDynamics/CMakeLists.txt 2009-06-24 23:55:00.587135244 +0200 +@@ -76,7 +76,7 @@ + ENDIF (BUILD_SHARED_LIBS) + + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) +- INSTALL(TARGETS BulletDynamics DESTINATION lib) ++ INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + +--- ./src/BulletSoftBody/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 ++++ ./src/BulletSoftBody/CMakeLists.txt 2009-06-24 23:54:18.388094145 +0200 +@@ -33,7 +33,7 @@ + ENDIF (BUILD_SHARED_LIBS) + + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) +- INSTALL(TARGETS BulletSoftBody DESTINATION lib) ++ INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + +--- ./src/LinearMath/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 ++++ ./src/LinearMath/CMakeLists.txt 2009-06-24 23:53:03.892114830 +0200 +@@ -41,7 +41,7 @@ + + #FILES_MATCHING requires CMake 2.6 + IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) +- INSTALL(TARGETS LinearMath DESTINATION lib) ++ INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + diff --git a/sources b/sources index e69de29..e41f501 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +9bb1421961549813216a39de0f9f8649 bullet-2.74-free.tar.gz From 76a08a3886b7ce0bb2b30052f7aabf49a748468a Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 18:29:21 +0000 Subject: [PATCH 02/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 3dc3fcc..25f8d6b 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.74 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.74-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jun 25 2009 Thomas Kowaliczek - 2.74-1 - Updatet to version 2.74 From bfe1989e1d95f0d585c5c22acd72b8480bd19955 Mon Sep 17 00:00:00 2001 From: Thomas Kowaliczek Date: Sat, 3 Oct 2009 16:23:20 +0000 Subject: [PATCH 03/81] Updatet to new upstream release --- .cvsignore | 2 +- bullet.spec | 13 +++++---- import.log | 1 + lib_suffix.patch | 72 ++++++++++++++++++++++++------------------------ sources | 2 +- 5 files changed, 47 insertions(+), 43 deletions(-) diff --git a/.cvsignore b/.cvsignore index 37faaf5..6aa9f7e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bullet-2.74-free.tar.gz +bullet-2.75-free.tar.gz diff --git a/bullet.spec b/bullet.spec index 25f8d6b..a9431b0 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet -Version: 2.74 -Release: 2%{?dist} +Version: 2.75 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -11,7 +11,7 @@ Source0: %{name}-%{version}-free.tar.gz # 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.74 +# ./generate-tarball.sh 2.75 Source1: generate-tarball.sh # See http://code.google.com/p/bullet/issues/detail?id=174 @@ -98,19 +98,22 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/BulletCollision/CollisionShapes/*.h %{_includedir}/BulletCollision/Gimpact/*.h %{_includedir}/BulletCollision/NarrowPhaseCollision/*.h +%{_includedir}/BulletCollision/*.h %{_includedir}/BulletDynamics/Character/*.h %{_includedir}/BulletDynamics/ConstraintSolver/*.h %{_includedir}/BulletDynamics/Dynamics/*.h %{_includedir}/BulletDynamics/Vehicle/*.h +%{_includedir}/BulletDynamics/*.h %{_includedir}/BulletSoftBody/*.h %{_includedir}/LinearMath/*.h %{_libdir}/*.so %changelog -* Fri Jul 24 2009 Fedora Release Engineering - 2.74-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Sat Oct 03 2009 Thomas Kowaliczek - 2.75-1 +- Updatet to new upstream version 2.75 +- Updatet the patch file to work agian * Thu Jun 25 2009 Thomas Kowaliczek - 2.74-1 - Updatet to version 2.74 diff --git a/import.log b/import.log index 1144a72..1b2f2a5 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ bullet-2_74-1_fc11:HEAD:bullet-2.74-1.fc11.src.rpm:1246138693 +bullet-2_75-1_fc11:HEAD:bullet-2.75-1.fc11.src.rpm:1254586610 diff --git a/lib_suffix.patch b/lib_suffix.patch index ce446e6..979db1e 100644 --- a/lib_suffix.patch +++ b/lib_suffix.patch @@ -1,44 +1,44 @@ ---- ./src/BulletCollision/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 -+++ ./src/BulletCollision/CMakeLists.txt 2009-06-24 23:54:42.899191024 +0200 -@@ -216,7 +216,7 @@ - - #INSTALL of other files requires CMake 2.6 - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) -- INSTALL(TARGETS BulletCollision DESTINATION lib) -+ INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - ---- ./src/BulletDynamics/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 -+++ ./src/BulletDynamics/CMakeLists.txt 2009-06-24 23:55:00.587135244 +0200 -@@ -76,7 +76,7 @@ - ENDIF (BUILD_SHARED_LIBS) - - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) -- INSTALL(TARGETS BulletDynamics DESTINATION lib) -+ INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - ---- ./src/BulletSoftBody/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 -+++ ./src/BulletSoftBody/CMakeLists.txt 2009-06-24 23:54:18.388094145 +0200 -@@ -33,7 +33,7 @@ - ENDIF (BUILD_SHARED_LIBS) - - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) +--- ./src/BulletCollision/CMakeLists.txt 2009-09-17 23:33:29.000000000 +0200 ++++ ./src/BulletCollision/CMakeLists.txt 2009-10-03 17:51:09.556672424 +0200 +@@ -248,7 +248,7 @@ + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS BulletCollision DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletCollision DESTINATION lib) ++ INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + INSTALL(FILES ../btBulletCollisionCommon.h DESTINATION include/BulletCollision) + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +--- ./src/BulletDynamics/CMakeLists.txt 2009-09-17 23:33:29.000000000 +0200 ++++ ./src/BulletDynamics/CMakeLists.txt 2009-10-03 17:51:16.724672532 +0200 +@@ -89,7 +89,7 @@ + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS BulletDynamics DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +- INSTALL(TARGETS BulletDynamics DESTINATION lib) ++ INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX}) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + INSTALL(FILES ../btBulletDynamicsCommon.h DESTINATION include/BulletDynamics) + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) +--- ./src/BulletSoftBody/CMakeLists.txt 2009-07-14 04:10:03.000000000 +0200 ++++ ./src/BulletSoftBody/CMakeLists.txt 2009-10-03 17:51:25.189672245 +0200 +@@ -37,7 +37,7 @@ + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS BulletSoftBody DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBody DESTINATION lib) + INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - ---- ./src/LinearMath/CMakeLists.txt 2009-02-18 23:52:03.000000000 +0100 -+++ ./src/LinearMath/CMakeLists.txt 2009-06-24 23:53:03.892114830 +0200 -@@ -41,7 +41,7 @@ - - #FILES_MATCHING requires CMake 2.6 - IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) +--- ./src/LinearMath/CMakeLists.txt 2009-07-14 04:10:03.000000000 +0200 ++++ ./src/LinearMath/CMakeLists.txt 2009-10-03 17:51:32.196672442 +0200 +@@ -44,7 +44,7 @@ + IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(TARGETS LinearMath DESTINATION .) + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS LinearMath DESTINATION lib) + INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) - diff --git a/sources b/sources index e41f501..bfa8dd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9bb1421961549813216a39de0f9f8649 bullet-2.74-free.tar.gz +ac92978bb8d808ac5e5f9cbd246fe334 bullet-2.75-free.tar.gz From e4b6cab521d771768042a89b45273c29704bab99 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:46:08 +0000 Subject: [PATCH 04/81] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1f2ae69..8efa60a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: bullet -# $Id$ +# $Id: Makefile,v 1.1 2009/06/27 00:44:16 tibbs Exp $ NAME := bullet SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a5d1814b68c70adf45f53a0f2c90b875dc330faa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 9 Mar 2010 23:33:06 +0000 Subject: [PATCH 05/81] - pkgconfig file not installed (#549051) --- bullet-2.75-cmake_pkgconfig.patch | 23 +++++++++++++++++++++++ bullet.pc.cmake | 6 ++++++ bullet.spec | 19 +++++++++++++++---- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 bullet-2.75-cmake_pkgconfig.patch create mode 100644 bullet.pc.cmake diff --git a/bullet-2.75-cmake_pkgconfig.patch b/bullet-2.75-cmake_pkgconfig.patch new file mode 100644 index 0000000..58ab074 --- /dev/null +++ b/bullet-2.75-cmake_pkgconfig.patch @@ -0,0 +1,23 @@ +diff -up bullet-2.75/CMakeLists.txt.pkgconfig bullet-2.75/CMakeLists.txt +--- bullet-2.75/CMakeLists.txt.pkgconfig 2009-09-11 14:21:29.000000000 -0500 ++++ bullet-2.75/CMakeLists.txt 2010-03-09 17:23:00.937193505 -0600 +@@ -70,3 +70,19 @@ IF(BUILD_EXTRAS) + ENDIF(BUILD_EXTRAS) + + SUBDIRS(src) ++ ++set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) ++set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name") ++## the following are directories where stuff will be installed to ++set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "The subdirectory to the header prefix") ++set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files") ++ ++if(NOT WIN32) ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY) ++ install( ++ FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc ++ DESTINATION ++ ${PKGCONFIG_INSTALL_PREFIX}) ++endif(NOT WIN32) ++ diff --git a/bullet.pc.cmake b/bullet.pc.cmake new file mode 100644 index 0000000..c6be414 --- /dev/null +++ b/bullet.pc.cmake @@ -0,0 +1,6 @@ +Name: bullet +Description: Bullet Continuous Collision Detection and Physics Library +Requires: +Version: @BULLET_VERSION@ +Libs: -L@LIB_DESTINATION@ -lbulletdynamics -lbulletcollision -lbulletmath +Cflags: -I@INCLUDE_INSTALL_DIR@/bullet diff --git a/bullet.spec b/bullet.spec index a9431b0..1a908d0 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.75 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -14,6 +14,8 @@ Source0: %{name}-%{version}-free.tar.gz # ./generate-tarball.sh 2.75 Source1: generate-tarball.sh +Source10: bullet.pc.cmake + # See http://code.google.com/p/bullet/issues/detail?id=174 Patch0: lib_suffix.patch @@ -21,6 +23,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake, libGL-devel, libGLU-devel, freeglut-devel, libICE-devel +# upstreamable patch (plus Source10 above) +Patch10: bullet-2.75-cmake_pkgconfig.patch + %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games and animation. @@ -36,7 +41,11 @@ Development headers and libraries for %{name}. %prep %setup -q + +install -p %{SOURCE10} . + %patch0 +%patch10 -p1 -b .cmake_pkgconfig # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -48,12 +57,11 @@ mv ChangeLog.utf8 ChangeLog %build %cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=OFF -DCMAKE_BUILD_TYPE=NONE . -make VERBOSE=1 %{?_smp_mflags} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install/fast DESTDIR=$RPM_BUILD_ROOT pushd $RPM_BUILD_ROOT%{_libdir} for f in lib*.so.*.* @@ -107,9 +115,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/BulletSoftBody/*.h %{_includedir}/LinearMath/*.h %{_libdir}/*.so +%{_libdir}/pkgconfig/bullet.pc %changelog +* Tue Mar 09 2010 Rex Dieter - 2.75-2 +- pkgconfig file not installed (#549051) * Sat Oct 03 2009 Thomas Kowaliczek - 2.75-1 - Updatet to new upstream version 2.75 From e919d87e3c990f80ba240acf75e9cf7103849c60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 11:19:15 +0000 Subject: [PATCH 06/81] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- import.log | 2 -- 3 files changed, 23 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 import.log diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8efa60a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: bullet -# $Id: Makefile,v 1.1 2009/06/27 00:44:16 tibbs Exp $ -NAME := bullet -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/import.log b/import.log deleted file mode 100644 index 1b2f2a5..0000000 --- a/import.log +++ /dev/null @@ -1,2 +0,0 @@ -bullet-2_74-1_fc11:HEAD:bullet-2.74-1.fc11.src.rpm:1246138693 -bullet-2_75-1_fc11:HEAD:bullet-2.75-1.fc11.src.rpm:1254586610 From 5d0ed1455a045282448fb70ae9351ca17ea67d8a Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Sat, 21 Aug 2010 00:52:26 +0200 Subject: [PATCH 07/81] Hope fix #619885 --- bullet.pc.cmake | 2 +- bullet.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bullet.pc.cmake b/bullet.pc.cmake index c6be414..269ebfb 100644 --- a/bullet.pc.cmake +++ b/bullet.pc.cmake @@ -3,4 +3,4 @@ Description: Bullet Continuous Collision Detection and Physics Library Requires: Version: @BULLET_VERSION@ Libs: -L@LIB_DESTINATION@ -lbulletdynamics -lbulletcollision -lbulletmath -Cflags: -I@INCLUDE_INSTALL_DIR@/bullet +Cflags: -I@INCLUDE_INSTALL_DIR@/ diff --git a/bullet.spec b/bullet.spec index 1a908d0..a1ece32 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.75 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -119,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 09 2010 Thomas Kowaliczek - 2.75-3 +- Hope fix (#619885) + * Tue Mar 09 2010 Rex Dieter - 2.75-2 - pkgconfig file not installed (#549051) From a6bbb418c698cf3a23d62c8204daf2b8cad66249 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Sat, 21 Aug 2010 01:16:03 +0200 Subject: [PATCH 08/81] Hope fix #599495 --- bullet.pc.cmake | 2 +- bullet.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bullet.pc.cmake b/bullet.pc.cmake index 269ebfb..826948f 100644 --- a/bullet.pc.cmake +++ b/bullet.pc.cmake @@ -2,5 +2,5 @@ Name: bullet Description: Bullet Continuous Collision Detection and Physics Library Requires: Version: @BULLET_VERSION@ -Libs: -L@LIB_DESTINATION@ -lbulletdynamics -lbulletcollision -lbulletmath +Libs: -L@LIB_DESTINATION@ -lBulletDynamics -lBulletCollision -lBulletMath -lBulletSoftBody Cflags: -I@INCLUDE_INSTALL_DIR@/ diff --git a/bullet.spec b/bullet.spec index a1ece32..d80a50f 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.75 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -119,7 +119,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sat Aug 09 2010 Thomas Kowaliczek - 2.75-3 +* Sat Aug 21 2010 Thomas Kowaliczek - 2.75-4 +- Hope fix (#599495) + +* Sat Aug 21 2010 Thomas Kowaliczek - 2.75-3 - Hope fix (#619885) * Tue Mar 09 2010 Rex Dieter - 2.75-2 From 97f6a93aaa6f1c2a87789516a553ed2fd8bc3125 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Sat, 21 Aug 2010 01:29:25 +0200 Subject: [PATCH 09/81] Hope fix #599495 --- bullet.pc.cmake | 4 ++-- bullet.spec | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bullet.pc.cmake b/bullet.pc.cmake index c6be414..826948f 100644 --- a/bullet.pc.cmake +++ b/bullet.pc.cmake @@ -2,5 +2,5 @@ Name: bullet Description: Bullet Continuous Collision Detection and Physics Library Requires: Version: @BULLET_VERSION@ -Libs: -L@LIB_DESTINATION@ -lbulletdynamics -lbulletcollision -lbulletmath -Cflags: -I@INCLUDE_INSTALL_DIR@/bullet +Libs: -L@LIB_DESTINATION@ -lBulletDynamics -lBulletCollision -lBulletMath -lBulletSoftBody +Cflags: -I@INCLUDE_INSTALL_DIR@/ diff --git a/bullet.spec b/bullet.spec index 1a908d0..d80a50f 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.75 -Release: 2%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -119,6 +119,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 21 2010 Thomas Kowaliczek - 2.75-4 +- Hope fix (#599495) + +* Sat Aug 21 2010 Thomas Kowaliczek - 2.75-3 +- Hope fix (#619885) + * Tue Mar 09 2010 Rex Dieter - 2.75-2 - pkgconfig file not installed (#549051) From fc04712ce8dc9d57646a6bd3efe4943dd37640d8 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 00:19:05 +0200 Subject: [PATCH 10/81] Updatet to version 2.77 --- bullet-2.75-cmake_pkgconfig.patch | 23 ---------------- bullet.pc.cmake | 6 ----- bullet.spec | 22 +++++----------- lib_suffix.patch | 44 ------------------------------- 4 files changed, 7 insertions(+), 88 deletions(-) delete mode 100644 bullet-2.75-cmake_pkgconfig.patch delete mode 100644 bullet.pc.cmake delete mode 100644 lib_suffix.patch diff --git a/bullet-2.75-cmake_pkgconfig.patch b/bullet-2.75-cmake_pkgconfig.patch deleted file mode 100644 index 58ab074..0000000 --- a/bullet-2.75-cmake_pkgconfig.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up bullet-2.75/CMakeLists.txt.pkgconfig bullet-2.75/CMakeLists.txt ---- bullet-2.75/CMakeLists.txt.pkgconfig 2009-09-11 14:21:29.000000000 -0500 -+++ bullet-2.75/CMakeLists.txt 2010-03-09 17:23:00.937193505 -0600 -@@ -70,3 +70,19 @@ IF(BUILD_EXTRAS) - ENDIF(BUILD_EXTRAS) - - SUBDIRS(src) -+ -+set (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) -+set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name") -+## the following are directories where stuff will be installed to -+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "The subdirectory to the header prefix") -+set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files") -+ -+if(NOT WIN32) -+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bullet.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc @ONLY) -+ install( -+ FILES -+ ${CMAKE_CURRENT_BINARY_DIR}/bullet.pc -+ DESTINATION -+ ${PKGCONFIG_INSTALL_PREFIX}) -+endif(NOT WIN32) -+ diff --git a/bullet.pc.cmake b/bullet.pc.cmake deleted file mode 100644 index 826948f..0000000 --- a/bullet.pc.cmake +++ /dev/null @@ -1,6 +0,0 @@ -Name: bullet -Description: Bullet Continuous Collision Detection and Physics Library -Requires: -Version: @BULLET_VERSION@ -Libs: -L@LIB_DESTINATION@ -lBulletDynamics -lBulletCollision -lBulletMath -lBulletSoftBody -Cflags: -I@INCLUDE_INSTALL_DIR@/ diff --git a/bullet.spec b/bullet.spec index d80a50f..19dd49d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet -Version: 2.75 -Release: 4%{?dist} +Version: 2.77 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -11,21 +11,13 @@ Source0: %{name}-%{version}-free.tar.gz # 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.75 +# ./generate-tarball.sh 2.77 Source1: generate-tarball.sh -Source10: bullet.pc.cmake - -# See http://code.google.com/p/bullet/issues/detail?id=174 -Patch0: lib_suffix.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake, libGL-devel, libGLU-devel, freeglut-devel, libICE-devel -# upstreamable patch (plus Source10 above) -Patch10: bullet-2.75-cmake_pkgconfig.patch - %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games and animation. @@ -41,11 +33,7 @@ Development headers and libraries for %{name}. %prep %setup -q - -install -p %{SOURCE10} . - %patch0 -%patch10 -p1 -b .cmake_pkgconfig # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -119,6 +107,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wen Sep 29 2010 Thomas Kowaliczek - 2.77-1 +- Updatet to version 2.77 +- Droped all patches because they are all in upstream + * Sat Aug 21 2010 Thomas Kowaliczek - 2.75-4 - Hope fix (#599495) diff --git a/lib_suffix.patch b/lib_suffix.patch deleted file mode 100644 index 979db1e..0000000 --- a/lib_suffix.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- ./src/BulletCollision/CMakeLists.txt 2009-09-17 23:33:29.000000000 +0200 -+++ ./src/BulletCollision/CMakeLists.txt 2009-10-03 17:51:09.556672424 +0200 -@@ -248,7 +248,7 @@ - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletCollision DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -- INSTALL(TARGETS BulletCollision DESTINATION lib) -+ INSTALL(TARGETS BulletCollision DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") - INSTALL(FILES ../btBulletCollisionCommon.h DESTINATION include/BulletCollision) - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ---- ./src/BulletDynamics/CMakeLists.txt 2009-09-17 23:33:29.000000000 +0200 -+++ ./src/BulletDynamics/CMakeLists.txt 2009-10-03 17:51:16.724672532 +0200 -@@ -89,7 +89,7 @@ - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletDynamics DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -- INSTALL(TARGETS BulletDynamics DESTINATION lib) -+ INSTALL(TARGETS BulletDynamics DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") - INSTALL(FILES ../btBulletDynamicsCommon.h DESTINATION include/BulletDynamics) - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) ---- ./src/BulletSoftBody/CMakeLists.txt 2009-07-14 04:10:03.000000000 +0200 -+++ ./src/BulletSoftBody/CMakeLists.txt 2009-10-03 17:51:25.189672245 +0200 -@@ -37,7 +37,7 @@ - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS BulletSoftBody DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -- INSTALL(TARGETS BulletSoftBody DESTINATION lib) -+ INSTALL(TARGETS BulletSoftBody DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) ---- ./src/LinearMath/CMakeLists.txt 2009-07-14 04:10:03.000000000 +0200 -+++ ./src/LinearMath/CMakeLists.txt 2009-10-03 17:51:32.196672442 +0200 -@@ -44,7 +44,7 @@ - IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - INSTALL(TARGETS LinearMath DESTINATION .) - ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) -- INSTALL(TARGETS LinearMath DESTINATION lib) -+ INSTALL(TARGETS LinearMath DESTINATION lib${LIB_SUFFIX}) - INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h") - ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) - ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) From d60e4d8bbc1a231205d7ebd9b7b49b51e52f53ac Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 00:21:35 +0200 Subject: [PATCH 11/81] Updatet to version 2.77 --- bullet.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bullet.spec b/bullet.spec index 19dd49d..5253465 100644 --- a/bullet.spec +++ b/bullet.spec @@ -33,7 +33,6 @@ Development headers and libraries for %{name}. %prep %setup -q -%patch0 # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -107,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wen Sep 29 2010 Thomas Kowaliczek - 2.77-1 +* Wed Sep 29 2010 Thomas Kowaliczek - 2.77-1 - Updatet to version 2.77 - Droped all patches because they are all in upstream From 00f63e076b453df531fdcefb8a4c2c0b0efd26c3 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 00:24:39 +0200 Subject: [PATCH 12/81] Updatet to version 2.77 --- .gitignore | 1 + generate-tarball.sh | 0 sources | 1 + 3 files changed, 2 insertions(+) mode change 100644 => 100755 generate-tarball.sh diff --git a/.gitignore b/.gitignore index 6aa9f7e..64b1499 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ bullet-2.75-free.tar.gz +/bullet-2.77-free.tar.gz diff --git a/generate-tarball.sh b/generate-tarball.sh old mode 100644 new mode 100755 diff --git a/sources b/sources index bfa8dd4..5504d2f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ ac92978bb8d808ac5e5f9cbd246fe334 bullet-2.75-free.tar.gz +36dc0ef7f0905925bc33e14abfa60f86 bullet-2.77-free.tar.gz From 290cd72ea5548b67a2e7241f304a5a0f6e641829 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 00:32:47 +0200 Subject: [PATCH 13/81] Updated spec file --- bullet.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 5253465..f262ff2 100644 --- a/bullet.spec +++ b/bullet.spec @@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README AUTHORS LICENSE NEWS ChangeLog Bullet_Faq.pdf +%doc README AUTHORS LICENSE NEWS ChangeLog Bullet_User_Manual.pdf %{_libdir}/*.so.* %files devel From cfe1aa71ea0232f0c341d035692b582177781ad6 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 00:44:45 +0200 Subject: [PATCH 14/81] fixed more spec problems --- bullet.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/bullet.spec b/bullet.spec index f262ff2..f4f7b60 100644 --- a/bullet.spec +++ b/bullet.spec @@ -87,6 +87,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_includedir}/BulletDynamics/Dynamics %dir %{_includedir}/BulletDynamics/Vehicle %dir %{_includedir}/BulletSoftBody +%dir %{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/CPU/ +%dir %{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/DX11/ +%dir %{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/ +%dir %{_includedir}/BulletMultiThreaded/ +%dir %{_includedir}/MiniCL/MiniCLTask/ +%dir %{_includedir}/MiniCL/ %{_includedir}/*.h %{_includedir}/BulletCollision/BroadphaseCollision/*.h %{_includedir}/BulletCollision/CollisionDispatch/*.h @@ -101,6 +107,12 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/BulletDynamics/*.h %{_includedir}/BulletSoftBody/*.h %{_includedir}/LinearMath/*.h +%{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/CPU/*.h +%{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/DX11/*.h +%{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/*.h +%{_includedir}/BulletMultiThreaded/*.h +%{_includedir}/MiniCL/MiniCLTask/*.h +%{_includedir}/MiniCL/*.h %{_libdir}/*.so %{_libdir}/pkgconfig/bullet.pc From c8432d3973976f51f4fa4741c8405f3518bafaf4 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 00:54:50 +0200 Subject: [PATCH 15/81] fixed more spec problems i think only an new 64bit arch bugis now open --- bullet.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bullet.spec b/bullet.spec index f4f7b60..b771e81 100644 --- a/bullet.spec +++ b/bullet.spec @@ -93,6 +93,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{_includedir}/BulletMultiThreaded/ %dir %{_includedir}/MiniCL/MiniCLTask/ %dir %{_includedir}/MiniCL/ +%dir %{_includedir}/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/ +%dir %{_includedir}/BulletMultiThreaded/SpuSampleTask/ %{_includedir}/*.h %{_includedir}/BulletCollision/BroadphaseCollision/*.h %{_includedir}/BulletCollision/CollisionDispatch/*.h @@ -113,6 +115,8 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/BulletMultiThreaded/*.h %{_includedir}/MiniCL/MiniCLTask/*.h %{_includedir}/MiniCL/*.h +%{_includedir}/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/*.h +%{_includedir}/BulletMultiThreaded/SpuSampleTask/*.h %{_libdir}/*.so %{_libdir}/pkgconfig/bullet.pc From e2d08938708d17b9f6cec3ead2958a32770d955f Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 01:08:03 +0200 Subject: [PATCH 16/81] added an ptach for the new bullet libs for the libsuffix problem --- bullet.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index b771e81..faf65a3 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.77 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -14,6 +14,9 @@ Source0: %{name}-%{version}-free.tar.gz # ./generate-tarball.sh 2.77 Source1: generate-tarball.sh +# See http://code.google.com/p/bullet/issues/detail?id=174 +Patch0: suffix.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake, libGL-devel, libGLU-devel, freeglut-devel, libICE-devel @@ -34,6 +37,8 @@ Development headers and libraries for %{name}. %prep %setup -q +%patch0 + # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h chmod 644 src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp @@ -122,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 29 2010 Thomas Kowaliczek - 2.77-2 +- Added LibSuffix patch + * Wed Sep 29 2010 Thomas Kowaliczek - 2.77-1 - Updatet to version 2.77 - Droped all patches because they are all in upstream From e584c92282494092b4f2f3d399ad08ee37178c2c Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 01:10:40 +0200 Subject: [PATCH 17/81] added an ptach for the new bullet libs for the libsuffix problem --- suffix.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 suffix.patch diff --git a/suffix.patch b/suffix.patch new file mode 100644 index 0000000..8c5c4db --- /dev/null +++ b/suffix.patch @@ -0,0 +1,24 @@ +diff -Naur bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 1bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt +--- bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 ++++ 1bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-09-29 00:57:58.526399758 +0200 +@@ -84,7 +84,7 @@ + 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 -Naur bullet-2.77/src/MiniCL/CMakeLists.txt 1bullet-2.77/src/MiniCL/CMakeLists.txt +--- bullet-2.77/src/MiniCL/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 ++++ 1bullet-2.77/src/MiniCL/CMakeLists.txt 2010-09-29 00:58:20.786294661 +0200 +@@ -32,7 +32,7 @@ + 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) From 51f6fe15cd862dfb34f3c3a5e6c821e89c1a79c6 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 01:17:17 +0200 Subject: [PATCH 18/81] fixed the patch --- suffix.patch | 1 - 1 file changed, 1 deletion(-) diff --git a/suffix.patch b/suffix.patch index 8c5c4db..810ac11 100644 --- a/suffix.patch +++ b/suffix.patch @@ -1,4 +1,3 @@ -diff -Naur bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 1bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt --- bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 +++ 1bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-09-29 00:57:58.526399758 +0200 @@ -84,7 +84,7 @@ From a1e4605e14e7a58f39d485a3d9f23f1fc4c7c313 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 01:26:10 +0200 Subject: [PATCH 19/81] fixed the patch again --- suffix.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/suffix.patch b/suffix.patch index 810ac11..20477d1 100644 --- a/suffix.patch +++ b/suffix.patch @@ -1,5 +1,5 @@ ---- bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 -+++ 1bullet-2.77/src/BulletMultiThreaded/CMakeLists.txt 2010-09-29 00:57:58.526399758 +0200 +--- src/BulletMultiThreaded/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 ++++ src/BulletMultiThreaded/CMakeLists.txt 2010-09-29 00:57:58.526399758 +0200 @@ -84,7 +84,7 @@ IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS BulletMultiThreaded DESTINATION .) @@ -9,9 +9,8 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) -diff -Naur bullet-2.77/src/MiniCL/CMakeLists.txt 1bullet-2.77/src/MiniCL/CMakeLists.txt ---- bullet-2.77/src/MiniCL/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 -+++ 1bullet-2.77/src/MiniCL/CMakeLists.txt 2010-09-29 00:58:20.786294661 +0200 +--- src/MiniCL/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 ++++ src/MiniCL/CMakeLists.txt 2010-09-29 00:58:20.786294661 +0200 @@ -32,7 +32,7 @@ IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) INSTALL(TARGETS MiniCL DESTINATION .) From 4cc35c03fd45551b49b577af055394f2ac8e550c Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 01:37:59 +0200 Subject: [PATCH 20/81] update master --- bullet.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/bullet.spec b/bullet.spec index 09fa451..faf65a3 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,11 +1,6 @@ Name: bullet -<<<<<<< HEAD -Version: 2.75 -Release: 4%{?dist} -======= Version: 2.77 Release: 2%{?dist} ->>>>>>> f14 Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -132,8 +127,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -<<<<<<< HEAD -======= * Wed Sep 29 2010 Thomas Kowaliczek - 2.77-2 - Added LibSuffix patch @@ -141,7 +134,6 @@ rm -rf $RPM_BUILD_ROOT - Updatet to version 2.77 - Droped all patches because they are all in upstream ->>>>>>> f14 * Sat Aug 21 2010 Thomas Kowaliczek - 2.75-4 - Hope fix (#599495) From 060e3c288cd8511065d92d11d68c2fe7a1c1f1a2 Mon Sep 17 00:00:00 2001 From: LinuxDonald Date: Wed, 29 Sep 2010 01:38:18 +0200 Subject: [PATCH 21/81] update master --- suffix.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 suffix.patch diff --git a/suffix.patch b/suffix.patch new file mode 100644 index 0000000..20477d1 --- /dev/null +++ b/suffix.patch @@ -0,0 +1,22 @@ +--- src/BulletMultiThreaded/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 ++++ src/BulletMultiThreaded/CMakeLists.txt 2010-09-29 00:57:58.526399758 +0200 +@@ -84,7 +84,7 @@ + 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) +--- src/MiniCL/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 ++++ src/MiniCL/CMakeLists.txt 2010-09-29 00:58:20.786294661 +0200 +@@ -32,7 +32,7 @@ + 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) From f7576b9ed6420f932c3b76b301df6f1a42d12d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 14 Oct 2010 21:58:36 +0200 Subject: [PATCH 22/81] package additional libs - strip only problematic sources from original source archive - add extras/extras-devel subpackage with ConvexDecomposition and GLUI libraries - install headers into /usr/include/bullet, pkgconfig returns the right path when asked for CFLAGS - don't list dirs and files with headers, use whole dir instead --- bullet-2.77-extras-version.patch | 36 +++++++ suffix.patch => bullet-2.77-lib.patch | 14 +-- bullet.spec | 133 ++++++++++++++++---------- generate-tarball.sh | 8 +- sources | 3 +- 5 files changed, 134 insertions(+), 60 deletions(-) create mode 100644 bullet-2.77-extras-version.patch rename suffix.patch => bullet-2.77-lib.patch (58%) mode change 100755 => 100644 generate-tarball.sh diff --git a/bullet-2.77-extras-version.patch b/bullet-2.77-extras-version.patch new file mode 100644 index 0000000..6086640 --- /dev/null +++ b/bullet-2.77-extras-version.patch @@ -0,0 +1,36 @@ +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 -up bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt +--- bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version 2010-07-26 12:10:36.000000000 +0200 ++++ bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2010-07-26 12:10:57.000000000 +0200 +@@ -16,6 +16,8 @@ btBulletFile.cpp + btBulletFile.h + ) + ++SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) +diff -up bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt +--- bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version 2010-07-26 12:11:08.000000000 +0200 ++++ bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2010-07-26 12:11:26.000000000 +0200 +@@ -9,6 +9,8 @@ btBulletWorldImporter.cpp + btBulletWorldImporter.h + ) + ++SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) ++SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) + IF (BUILD_SHARED_LIBS) + TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) + ENDIF (BUILD_SHARED_LIBS) diff --git a/suffix.patch b/bullet-2.77-lib.patch similarity index 58% rename from suffix.patch rename to bullet-2.77-lib.patch index 20477d1..9575add 100644 --- a/suffix.patch +++ b/bullet-2.77-lib.patch @@ -1,6 +1,7 @@ ---- src/BulletMultiThreaded/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 -+++ src/BulletMultiThreaded/CMakeLists.txt 2010-09-29 00:57:58.526399758 +0200 -@@ -84,7 +84,7 @@ +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) @@ -9,9 +10,10 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${INCLUDE_INSTALL_DIR} FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE PATTERN "CMakeFiles" EXCLUDE) ---- src/MiniCL/CMakeLists.txt 2010-09-22 01:14:10.000000000 +0200 -+++ src/MiniCL/CMakeLists.txt 2010-09-29 00:58:20.786294661 +0200 -@@ -32,7 +32,7 @@ +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) diff --git a/bullet.spec b/bullet.spec index faf65a3..9396cb6 100644 --- a/bullet.spec +++ b/bullet.spec @@ -14,17 +14,21 @@ Source0: %{name}-%{version}-free.tar.gz # ./generate-tarball.sh 2.77 Source1: generate-tarball.sh -# See http://code.google.com/p/bullet/issues/detail?id=174 -Patch0: suffix.patch +Patch1: %{name}-2.77-extras-version.patch +Patch2: %{name}-2.77-lib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: cmake, libGL-devel, libGLU-devel, freeglut-devel, libICE-devel +BuildRequires: cmake +BuildRequires: freeglut-devel +BuildRequires: libICE-devel + %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games and animation. + %package devel Summary: Development files for %{name} Group: Development/Libraries @@ -34,10 +38,31 @@ Requires: %{name} = %{version}-%{release} Development headers and libraries for %{name}. +%package extras +Summary: Extra libraries for %{name} +Group: Development/Libraries +License: zlib and LGPLv2+ + +%description extras +Extra libraries for %{name}. + + +%package extras-devel +Summary: Development files for %{name} extras +Group: Development/Libraries +License: zlib and LGPLv2+ +Requires: %{name}-extras = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} + +%description extras-devel +Development headers and libraries for %{name} extra libraries. + + %prep %setup -q - -%patch0 +#%patch0 -p1 -b .version +%patch1 -p1 -b .extras-version +%patch2 -p1 -b .lib # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -47,13 +72,28 @@ chmod 644 src/BulletDynamics/ConstraintSolver/btSliderConstraint.h iconv -f ISO-8859-1 -t UTF-8 -o ChangeLog.utf8 ChangeLog mv ChangeLog.utf8 ChangeLog + %build -%cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=OFF -DCMAKE_BUILD_TYPE=NONE . +mkdir build +pushd build +%cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=ON -DCMAKE_BUILD_TYPE=NONE -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet .. make %{?_smp_mflags} +popd + %install rm -rf $RPM_BUILD_ROOT -make install/fast DESTDIR=$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 pushd $RPM_BUILD_ROOT%{_libdir} for f in lib*.so.*.* @@ -62,69 +102,60 @@ 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 +%post extras -p /sbin/ldconfig + +%postun extras -p /sbin/ldconfig + %files %defattr(-,root,root,-) -%doc README AUTHORS LICENSE NEWS ChangeLog Bullet_User_Manual.pdf +%doc README AUTHORS LICENSE NEWS ChangeLog %{_libdir}/*.so.* +%exclude %{_libdir}/libConvexDecomposition.so.* +%exclude %{_libdir}/libGLUI.so.* %files devel %defattr(-,root,root,-) %doc Bullet_User_Manual.pdf -%dir %{_includedir}/BulletCollision -%dir %{_includedir}/BulletCollision/BroadphaseCollision -%dir %{_includedir}/BulletCollision/CollisionDispatch -%dir %{_includedir}/BulletCollision/CollisionShapes -%dir %{_includedir}/BulletCollision/Gimpact -%dir %{_includedir}/BulletCollision/NarrowPhaseCollision -%dir %{_includedir}/LinearMath -%dir %{_includedir}/BulletDynamics -%dir %{_includedir}/BulletDynamics/Character -%dir %{_includedir}/BulletDynamics/ConstraintSolver -%dir %{_includedir}/BulletDynamics/Dynamics -%dir %{_includedir}/BulletDynamics/Vehicle -%dir %{_includedir}/BulletSoftBody -%dir %{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/CPU/ -%dir %{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/DX11/ -%dir %{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/ -%dir %{_includedir}/BulletMultiThreaded/ -%dir %{_includedir}/MiniCL/MiniCLTask/ -%dir %{_includedir}/MiniCL/ -%dir %{_includedir}/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/ -%dir %{_includedir}/BulletMultiThreaded/SpuSampleTask/ -%{_includedir}/*.h -%{_includedir}/BulletCollision/BroadphaseCollision/*.h -%{_includedir}/BulletCollision/CollisionDispatch/*.h -%{_includedir}/BulletCollision/CollisionShapes/*.h -%{_includedir}/BulletCollision/Gimpact/*.h -%{_includedir}/BulletCollision/NarrowPhaseCollision/*.h -%{_includedir}/BulletCollision/*.h -%{_includedir}/BulletDynamics/Character/*.h -%{_includedir}/BulletDynamics/ConstraintSolver/*.h -%{_includedir}/BulletDynamics/Dynamics/*.h -%{_includedir}/BulletDynamics/Vehicle/*.h -%{_includedir}/BulletDynamics/*.h -%{_includedir}/BulletSoftBody/*.h -%{_includedir}/LinearMath/*.h -%{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/CPU/*.h -%{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/DX11/*.h -%{_includedir}/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/*.h -%{_includedir}/BulletMultiThreaded/*.h -%{_includedir}/MiniCL/MiniCLTask/*.h -%{_includedir}/MiniCL/*.h -%{_includedir}/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/*.h -%{_includedir}/BulletMultiThreaded/SpuSampleTask/*.h +%{_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 %{_libdir}/pkgconfig/bullet.pc +%files extras +%defattr(-,root,root,-) +%{_libdir}/libConvexDecomposition.so.* +%{_libdir}/libGLUI.so.* + +%files extras-devel +%defattr(-,root,root,-) +%doc Extras/glui/readme.txt +%{_includedir}/bullet/Convex*.h +%{_includedir}/bullet/vlookup.h +%{_includedir}/bullet/GL +%{_libdir}/libConvexDecomposition.so +%{_libdir}/libGLUI.so + %changelog * Wed Sep 29 2010 Thomas Kowaliczek - 2.77-2 diff --git a/generate-tarball.sh b/generate-tarball.sh old mode 100755 new mode 100644 index c9755c3..9e0fb41 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -1,11 +1,17 @@ #!/bin/sh +if [ $# -ne 1 ]; then + echo "Usage: $0 " + exit 1 +fi + VERSION=$1 NAME=bullet tar -xzvf $NAME-$VERSION.tgz +rm -f $NAME-$VERSION/*.{DLL,dll} rm -rf $NAME-$VERSION/Demos -rm -rf $NAME-$VERSION/Extras +rm -rf $NAME-$VERSION/Extras/{CUDA,khx2dae,software_cache,sph} rm -rf $NAME-$VERSION/Glut tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION diff --git a/sources b/sources index 5504d2f..a8fd72a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ac92978bb8d808ac5e5f9cbd246fe334 bullet-2.75-free.tar.gz -36dc0ef7f0905925bc33e14abfa60f86 bullet-2.77-free.tar.gz +23d34bea3049a8419977fda81c7d00e4 bullet-2.77-free.tar.gz From 0857f9c41c792fa0824ee0ed34b32cc7730e9022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Wed, 20 Oct 2010 10:12:03 +0200 Subject: [PATCH 23/81] - add extras subpackage with additional libs - install headers into /usr/include/bullet --- bullet.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 9396cb6..c6a1003 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.77 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -158,6 +158,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 20 2010 Dan Horák - 2.77-3 +- add extras subpackage with additional libs +- install headers into /usr/include/bullet + * Wed Sep 29 2010 Thomas Kowaliczek - 2.77-2 - Added LibSuffix patch From f610892fcb95739c860fe17f19163c1551958105 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 00:01:45 -0600 Subject: [PATCH 24/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index c6a1003..d2d2741 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.77 -Release: 3%{?dist} +Release: 4%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -158,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.77-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Oct 20 2010 Dan Horák - 2.77-3 - add extras subpackage with additional libs - install headers into /usr/include/bullet From a4c19577bc031ccda4eee777cafefb119b3fef19 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 19 Feb 2011 21:55:12 -0500 Subject: [PATCH 25/81] - Fix gcc 4.6 build error --- bullet-2.77-zero_initialize.patch | 23 +++++++++++++++++++++++ bullet.spec | 5 +++++ 2 files changed, 28 insertions(+) create mode 100644 bullet-2.77-zero_initialize.patch diff --git a/bullet-2.77-zero_initialize.patch b/bullet-2.77-zero_initialize.patch new file mode 100644 index 0000000..c9db2fb --- /dev/null +++ b/bullet-2.77-zero_initialize.patch @@ -0,0 +1,23 @@ +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 d2d2741..f6b9c0c 100644 --- a/bullet.spec +++ b/bullet.spec @@ -16,6 +16,7 @@ Source1: generate-tarball.sh Patch1: %{name}-2.77-extras-version.patch Patch2: %{name}-2.77-lib.patch +Patch3: %{name}-2.77-zero_initialize.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,6 +64,7 @@ Development headers and libraries for %{name} extra libraries. #%patch0 -p1 -b .version %patch1 -p1 -b .extras-version %patch2 -p1 -b .lib +%patch3 -p0 # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -158,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 19 2011 Rich Mattes - 2.77-4 +- Fix gcc 4.6 build error + * Tue Feb 08 2011 Fedora Release Engineering - 2.77-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From db3c0636317cd7b0357e064edd8d9506fe69f82f Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Wed, 11 May 2011 21:50:38 -0400 Subject: [PATCH 26/81] Update to version 2.78 Remove upstreamed patches --- .gitignore | 1 + bullet.spec | 19 +++++++++---------- generate-tarball.sh | 2 +- sources | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 64b1499..c0f0342 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ bullet-2.75-free.tar.gz /bullet-2.77-free.tar.gz +/bullet-2.78-free.tar.gz diff --git a/bullet.spec b/bullet.spec index f6b9c0c..96512b4 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet -Version: 2.77 -Release: 4%{?dist} +Version: 2.78 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -14,9 +14,7 @@ Source0: %{name}-%{version}-free.tar.gz # ./generate-tarball.sh 2.77 Source1: generate-tarball.sh -Patch1: %{name}-2.77-extras-version.patch -Patch2: %{name}-2.77-lib.patch -Patch3: %{name}-2.77-zero_initialize.patch +Patch0: %{name}-2.77-extras-version.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -61,10 +59,7 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -#%patch0 -p1 -b .version -%patch1 -p1 -b .extras-version -%patch2 -p1 -b .lib -%patch3 -p0 +%patch0 -p1 -b .extras-version # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -78,7 +73,7 @@ mv ChangeLog.utf8 ChangeLog %build mkdir build pushd build -%cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=ON -DCMAKE_BUILD_TYPE=NONE -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet .. +%cmake -DBUILD_DEMOS=OFF -DBUILD_EXTRAS=ON -DCMAKE_BUILD_TYPE=NONE -DCMAKE_SKIP_BUILD_RPATH=ON -DINCLUDE_INSTALL_DIR=%{_includedir}/bullet .. make %{?_smp_mflags} popd @@ -160,6 +155,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 11 2011 Rich Mattes - 2.78-1 +- Update to version 2.78 +- Remove upstreamed patches + * Sat Feb 19 2011 Rich Mattes - 2.77-4 - Fix gcc 4.6 build error diff --git a/generate-tarball.sh b/generate-tarball.sh index 9e0fb41..f8640cb 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -11,7 +11,7 @@ NAME=bullet 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} +rm -rf $NAME-$VERSION/Extras/{CUDA,khx2dae,software_cache,sph,CDTestFramework} rm -rf $NAME-$VERSION/Glut tar -czvf $NAME-$VERSION-free.tar.gz $NAME-$VERSION diff --git a/sources b/sources index a8fd72a..305b96b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23d34bea3049a8419977fda81c7d00e4 bullet-2.77-free.tar.gz +ecf5b94150dde90bd7e666c4b27e2302 bullet-2.78-free.tar.gz From 58d14a0377a81ead179196bd331b9b723b8983c9 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sun, 18 Dec 2011 21:09:12 -0500 Subject: [PATCH 27/81] Update to version 2.79 --- .gitignore | 1 + bullet.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c0f0342..3f7b6f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ bullet-2.75-free.tar.gz /bullet-2.77-free.tar.gz /bullet-2.78-free.tar.gz +/bullet-2.79-free.tar.gz diff --git a/bullet.spec b/bullet.spec index 96512b4..294490d 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,5 +1,5 @@ Name: bullet -Version: 2.78 +Version: 2.79 Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries @@ -122,7 +122,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README AUTHORS LICENSE NEWS ChangeLog +%doc README AUTHORS COPYING NEWS ChangeLog %{_libdir}/*.so.* %exclude %{_libdir}/libConvexDecomposition.so.* %exclude %{_libdir}/libGLUI.so.* @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Dec 18 2011 Rich Mattes - 2.79-1 +- Update to version 2.79 + * Wed May 11 2011 Rich Mattes - 2.78-1 - Update to version 2.78 - Remove upstreamed patches diff --git a/sources b/sources index 305b96b..79962c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecf5b94150dde90bd7e666c4b27e2302 bullet-2.78-free.tar.gz +836834d6bbf3dab1f0989dc8aad546ac bullet-2.79-free.tar.gz From a3a0ded9778a4382fdc79ca7982f4dc48ac38428 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 16:53:28 -0600 Subject: [PATCH 28/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 294490d..48261cf 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.79 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 2.79-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sun Dec 18 2011 Rich Mattes - 2.79-1 - Update to version 2.79 From dc7e425729b3c35391ba405256f273da778201b3 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Fri, 25 May 2012 20:17:17 -0400 Subject: [PATCH 29/81] Update to version 2.80 --- .gitignore | 1 + bullet-2.77-extras-version.patch | 24 ------------------------ bullet.spec | 11 +++++++---- sources | 2 +- 4 files changed, 9 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index 3f7b6f2..03645a3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ bullet-2.75-free.tar.gz /bullet-2.77-free.tar.gz /bullet-2.78-free.tar.gz /bullet-2.79-free.tar.gz +/bullet-2.80-rev2531-free.tar.gz diff --git a/bullet-2.77-extras-version.patch b/bullet-2.77-extras-version.patch index 6086640..bc7769a 100644 --- a/bullet-2.77-extras-version.patch +++ b/bullet-2.77-extras-version.patch @@ -10,27 +10,3 @@ diff -up bullet-2.77/Extras/glui/CMakeLists.txt.extras-version bullet-2.77/Extra IF (BUILD_SHARED_LIBS) TARGET_LINK_LIBRARIES(GLUI ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}) ENDIF (BUILD_SHARED_LIBS) -diff -up bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt ---- bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt.extras-version 2010-07-26 12:10:36.000000000 +0200 -+++ bullet-2.77/Extras/Serialize/BulletFileLoader/CMakeLists.txt 2010-07-26 12:10:57.000000000 +0200 -@@ -16,6 +16,8 @@ btBulletFile.cpp - btBulletFile.h - ) - -+SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES VERSION ${BULLET_VERSION}) -+SET_TARGET_PROPERTIES(BulletFileLoader PROPERTIES SOVERSION ${BULLET_VERSION}) - IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletFileLoader LinearMath) - ENDIF (BUILD_SHARED_LIBS) -diff -up bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt ---- bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt.extras-version 2010-07-26 12:11:08.000000000 +0200 -+++ bullet-2.77/Extras/Serialize/BulletWorldImporter/CMakeLists.txt 2010-07-26 12:11:26.000000000 +0200 -@@ -9,6 +9,8 @@ btBulletWorldImporter.cpp - btBulletWorldImporter.h - ) - -+SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES VERSION ${BULLET_VERSION}) -+SET_TARGET_PROPERTIES(BulletWorldImporter PROPERTIES SOVERSION ${BULLET_VERSION}) - IF (BUILD_SHARED_LIBS) - TARGET_LINK_LIBRARIES(BulletWorldImporter BulletDynamics BulletCollision BulletFileLoader LinearMath) - ENDIF (BUILD_SHARED_LIBS) diff --git a/bullet.spec b/bullet.spec index 48261cf..cbc51b3 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,12 +1,12 @@ Name: bullet -Version: 2.79 -Release: 2%{?dist} +Version: 2.80 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD URL: http://www.bulletphysics.com -Source0: %{name}-%{version}-free.tar.gz +Source0: %{name}-%{version}-rev2531-free.tar.gz # 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 @@ -58,7 +58,7 @@ Development headers and libraries for %{name} extra libraries. %prep -%setup -q +%setup -q -n %{name}-%{version}-rev2531 %patch0 -p1 -b .extras-version # Set these files to right permission @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri May 25 2012 Rich Mattes - 2.80-1 +- Update to version 2.80 + * Thu Jan 12 2012 Fedora Release Engineering - 2.79-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 79962c4..d65f642 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -836834d6bbf3dab1f0989dc8aad546ac bullet-2.79-free.tar.gz +3e12ddcd4973ad90f1423457db2956c0 bullet-2.80-rev2531-free.tar.gz From 8803f0ccc5a5b7d76b268867693fea6a8c8a9fef Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 13:23:11 -0500 Subject: [PATCH 30/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index cbc51b3..5ad7807 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,6 +1,6 @@ Name: bullet Version: 2.80 -Release: 1%{?dist} +Release: 2%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -155,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 2.80-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri May 25 2012 Rich Mattes - 2.80-1 - Update to version 2.80 From 7bcd11fe3f5fd50e25dbc2ab41ef74ac4e8d43bc Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sat, 13 Oct 2012 14:54:08 -0400 Subject: [PATCH 31/81] Update to version 2.81 --- .gitignore | 1 + bullet.spec | 15 ++++++++++----- generate-tarball.sh | 1 + sources | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 03645a3..ba2af6a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ bullet-2.75-free.tar.gz /bullet-2.78-free.tar.gz /bullet-2.79-free.tar.gz /bullet-2.80-rev2531-free.tar.gz +/bullet-2.81-rev2613-free.tar.gz diff --git a/bullet.spec b/bullet.spec index 5ad7807..93b807e 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,17 +1,19 @@ +%global svnrev 2613 + Name: bullet -Version: 2.80 -Release: 2%{?dist} +Version: 2.81 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD URL: http://www.bulletphysics.com -Source0: %{name}-%{version}-rev2531-free.tar.gz +Source0: %{name}-%{version}-rev%{svnrev}-free.tar.gz # 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.77 +# ./generate-tarball.sh 2.81-rev2613 Source1: generate-tarball.sh Patch0: %{name}-2.77-extras-version.patch @@ -58,7 +60,7 @@ Development headers and libraries for %{name} extra libraries. %prep -%setup -q -n %{name}-%{version}-rev2531 +%setup -q -n %{name}-%{version}-rev%{svnrev} %patch0 -p1 -b .extras-version # Set these files to right permission @@ -155,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Oct 13 2012 Rich Mattes - 2.81-1 +- Update to version 2.81 + * Wed Jul 18 2012 Fedora Release Engineering - 2.80-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/generate-tarball.sh b/generate-tarball.sh index f8640cb..3d35919 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -13,6 +13,7 @@ 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 diff --git a/sources b/sources index d65f642..f9d86fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e12ddcd4973ad90f1423457db2956c0 bullet-2.80-rev2531-free.tar.gz +45994417b55b07e62999e74972f8bdec bullet-2.81-rev2613-free.tar.gz From 8419c8261019ca96797a4d1e826e70895a16912f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 12:05:44 -0600 Subject: [PATCH 32/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 93b807e..028cc06 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.81 -Release: 1%{?dist} +Release: 2%{?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 %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.81-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Oct 13 2012 Rich Mattes - 2.81-1 - Update to version 2.81 From f70c27e499eff97644a35fefbe98ec26ad384808 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 23:04:51 -0500 Subject: [PATCH 33/81] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- bullet.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bullet.spec b/bullet.spec index 028cc06..c588e52 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 @@ -157,6 +157,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.81-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 2.81-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 1d4ac665442493709b1e326062e3c6493ef44668 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Sun, 9 Feb 2014 14:31:59 -0500 Subject: [PATCH 34/81] Update to version 2.82 --- .gitignore | 1 + bullet.spec | 35 ++++++++++++++++------------------- generate-tarball.sh | 4 ++++ sources | 2 +- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index ba2af6a..690cfda 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ bullet-2.75-free.tar.gz /bullet-2.79-free.tar.gz /bullet-2.80-rev2531-free.tar.gz /bullet-2.81-rev2613-free.tar.gz +/bullet-2.82-r2704-free.tar.gz diff --git a/bullet.spec b/bullet.spec index c588e52..d35f4f2 100644 --- a/bullet.spec +++ b/bullet.spec @@ -1,19 +1,19 @@ -%global svnrev 2613 +%global svnrev 2704 Name: bullet -Version: 2.81 -Release: 3%{?dist} +Version: 2.82 +Release: 1%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD URL: http://www.bulletphysics.com -Source0: %{name}-%{version}-rev%{svnrev}-free.tar.gz +Source0: %{name}-%{version}-r%{svnrev}-free.tar.gz # 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.81-rev2613 +# ./generate-tarball.sh 2.82-r2704 Source1: generate-tarball.sh Patch0: %{name}-2.77-extras-version.patch @@ -33,8 +33,8 @@ and animation. %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: cmake %description devel Development headers and libraries for %{name}. @@ -52,15 +52,15 @@ Extra libraries for %{name}. Summary: Development files for %{name} extras Group: Development/Libraries License: zlib and LGPLv2+ -Requires: %{name}-extras = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-extras%{?_isa} = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} %description extras-devel Development headers and libraries for %{name} extra libraries. %prep -%setup -q -n %{name}-%{version}-rev%{svnrev} +%setup -q -n %{name}-%{version}-r%{svnrev} %patch0 -p1 -b .extras-version # Set these files to right permission @@ -70,7 +70,8 @@ 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/* %build mkdir build @@ -89,7 +90,6 @@ 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 @@ -105,7 +105,6 @@ popd 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 @@ -135,28 +134,26 @@ rm -rf $RPM_BUILD_ROOT %{_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 %{_libdir}/pkgconfig/bullet.pc +%{_libdir}/cmake/%{name} %files extras %defattr(-,root,root,-) %{_libdir}/libConvexDecomposition.so.* -%{_libdir}/libGLUI.so.* %files extras-devel %defattr(-,root,root,-) -%doc Extras/glui/readme.txt %{_includedir}/bullet/Convex*.h %{_includedir}/bullet/vlookup.h -%{_includedir}/bullet/GL %{_libdir}/libConvexDecomposition.so -%{_libdir}/libGLUI.so %changelog +* Sun Feb 09 2014 Rich Mattes - 2.82-1 +- Update to version 2.82 + * Sat Aug 03 2013 Fedora Release Engineering - 2.81-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/generate-tarball.sh b/generate-tarball.sh index 3d35919..0e33b70 100644 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -8,6 +8,10 @@ fi VERSION=$1 NAME=bullet +if [ ! -f $NAME-$VERSION.tgz ]; then + wget "https://bullet.googlecode.com/files/$NAME-$VERSION.tgz" +fi + tar -xzvf $NAME-$VERSION.tgz rm -f $NAME-$VERSION/*.{DLL,dll} rm -rf $NAME-$VERSION/Demos diff --git a/sources b/sources index f9d86fb..157ad3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -45994417b55b07e62999e74972f8bdec bullet-2.81-rev2613-free.tar.gz +0557861c6cc334228e2a8e5ac8bb1732 bullet-2.82-r2704-free.tar.gz From 0e6d018495e95939fab8ae3668e292b144a80578 Mon Sep 17 00:00:00 2001 From: Rich Mattes Date: Fri, 16 May 2014 16:57:31 -0400 Subject: [PATCH 35/81] 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 | 80 +++++++++++++++++-------------- 4 files changed, 45 insertions(+), 94 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 d35f4f2..61c2fe3 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 1%{?dist} +Release: 2%{?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}-r%{svnrev}-free.tar.gz # ./generate-tarball.sh 2.82-r2704 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}-r%{svnrev} -%patch0 -p1 -b .extras-version # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -76,24 +73,24 @@ rm -fr Extras/glui/* %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} -popd - popd +# Create symlinks for .so.X pushd $RPM_BUILD_ROOT%{_libdir} for f in lib*.so.*.* do @@ -101,17 +98,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 -popd - %clean rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -122,35 +112,55 @@ 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 -%{_libdir}/*.so -%exclude %{_libdir}/libConvexDecomposition.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 %{_libdir}/cmake/%{name} %files extras -%defattr(-,root,root,-) %{_libdir}/libConvexDecomposition.so.* +%{_libdir}/libGIMPACTUtils.so.* +%{_libdir}/libHACD.so.* +%{_libdir}/libBulletFileLoader.so.* +%{_libdir}/libBulletWorldImporter.so.* +%{_libdir}/libBulletXmlWorldImporter.so.* %files extras-devel -%defattr(-,root,root,-) -%{_includedir}/bullet/Convex*.h -%{_includedir}/bullet/vlookup.h +%{_includedir}/%{name}/ConvexDecomposition +%{_includedir}/%{name}/GIMPACTUtils +%{_includedir}/%{name}/HACD +%{_includedir}/%{name}/BulletFileLoader +%{_includedir}/%{name}/BulletWorldImporter +%{_includedir}/%{name}/BulletXmlWorldImporter %{_libdir}/libConvexDecomposition.so - +%{_libdir}/libGIMPACTUtils.so +%{_libdir}/libHACD.so +%{_libdir}/libBulletFileLoader.so +%{_libdir}/libBulletWorldImporter.so +%{_libdir}/libBulletXmlWorldImporter.so %changelog +* Fri May 16 2014 Rich Mattes - 2.82-2 +- Install all of the bullet extras (rhbz#1097452) +- Spec file cleanup + * Sun Feb 09 2014 Rich Mattes - 2.82-1 - Update to version 2.82 From 41ac8ccad30278bfd7424b644decd1ec5a25c65b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 22:41:37 -0500 Subject: [PATCH 36/81] - 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 37/81] - 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 38/81] 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 39/81] - 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 40/81] 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 41/81] 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 42/81] 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 43/81] 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 44/81] 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 45/81] - 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 46/81] - 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 47/81] - 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 48/81] - 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 49/81] 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 50/81] 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 51/81] 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 52/81] - 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 53/81] 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 54/81] 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 55/81] - 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 56/81] 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 57/81] 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 58/81] - 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 59/81] - 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 60/81] - 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 61/81] - 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 09611636c4c1af13fb735cea1f5820873048822a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:17:15 +0000 Subject: [PATCH 62/81] - 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 63/81] 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 64/81] - 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 65/81] 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 66/81] - 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 67/81] - 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 68/81] - 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 69/81] 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 70/81] 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 71/81] 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 72/81] 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 73/81] 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 74/81] 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 75/81] 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 76/81] 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 77/81] 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 78/81] 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 79/81] 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 80/81] 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 81/81] 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