[packages/bullet] - updated to 2.83.6 - updated link patch - added format patch

qboosh qboosh at pld-linux.org
Wed Oct 7 18:19:42 CEST 2015 

commit 986ec531a6184299b1b2f8fed3fe6fc204a4179b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Oct 7 18:20:49 2015 +0200

    - updated to 2.83.6
    - updated link patch
    - added format patch

 bullet-format.patch | 11 +++++++
 bullet-link.patch   | 44 +++++++--------------------
 bullet.spec         | 86 +++++++++++++++++++++++++++++++++--------------------
 3 files changed, 76 insertions(+), 65 deletions(-)
---
diff --git a/bullet.spec b/bullet.spec
index 8eaaafc..4feaa21 100644
--- a/bullet.spec
+++ b/bullet.spec
@@ -1,25 +1,21 @@
-#
-# Conditional build:
-%bcond_with	opencl_amd	# AMD OpenCL
-%bcond_with	opencl_intel	# Intel OpenCL (64-bit)
-%bcond_with	opencl_nvidia	# NVidia OpenCL
-#
 Summary:	Bullet - collision detection and rigid body dynamics library
 Summary(pl.UTF-8):	Bullet - biblioteka wykrywania kolizji oraz dynamiki ciała sztywnego
 Name:		bullet
-Version:	2.82
-Release:	2
+Version:	2.83.6
+Release:	1
 License:	Zlib (BSD-like)
 Group:		Libraries
-#Source0Download: https://code.google.com/p/bullet/downloads/list
-Source0:	http://bullet.googlecode.com/files/%{name}-%{version}-r2704.tgz
-# Source0-md5:	70b3c8d202dee91a0854b4cbc88173e8
+#Source0Download: https://github.com/bulletphysics/bullet3/releases
+Source0:	https://github.com/bulletphysics/bullet3/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	44cb2464336a2082b2c144194c2a2668
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-format.patch
 URL:		http://bulletphysics.org/wordpress/
 BuildRequires:	OpenCL-devel
+BuildRequires:	OpenGL-devel >= 3.0
 BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-glut-devel
-BuildRequires:	cmake >= 2.4.3
+BuildRequires:	cmake >= 2.6
 BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	unzip
@@ -37,6 +33,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek bullet
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	OpenCL-devel
+Requires:	OpenGL-GL-devel >= 3.0
 Requires:	OpenGL-GLU-devel
 Requires:	OpenGL-glut-devel
 
@@ -46,21 +43,31 @@ Header files for bullet libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek bullet.
 
+%package doc
+Summary:	Bullet libraries documentation
+Summary(pl.UTF-8):	Dokumentacja do bibliotek bullet
+Group:		Documentation
+
+%description doc
+Bullet libraries documentation.
+
+%description doc -l pl.UTF-8
+Dokumentacja do bibliotek bullet.
+
 %prep
-%setup -q -n %{name}-%{version}-r2704
+%setup -q -n bullet3-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d pkgbuild
 cd pkgbuild
 %cmake .. \
-	%{!?with_opencl_amd:-DAMD_OPENCL_BASE_DIR:BOOL=OFF} \
-	%{!?with_opencl_intel:-DINTEL_OPENCL_ICD_CFG:BOOL=OFF} \
-	%{!?with_opencl_nvidia:-DNVIDIA_OPENCL_ICD_CFG:BOOL=OFF} \
-	-DBUILD_DEMOS=OFF \
+	-DBUILD_CPU_DEMOS=OFF \
 	-DBUILD_EXTRAS=ON \
-	-DBUILD_MULTITHREADING=ON \
+	-DBUILD_OPENGL3_DEMOS=OFF \
 	-DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
+	-DINSTALL_EXTRA_LIBS=ON
 
 %{__make}
 
@@ -78,31 +85,46 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%doc AUTHORS.txt LICENSE.txt README.md
+%attr(755,root,root) %{_libdir}/libBullet2FileLoader.so.*.*
+%attr(755,root,root) %{_libdir}/libBullet3Collision.so.*.*
+%attr(755,root,root) %{_libdir}/libBullet3Common.so.*.*
+%attr(755,root,root) %{_libdir}/libBullet3Dynamics.so.*.*
+%attr(755,root,root) %{_libdir}/libBullet3Geometry.so.*.*
+%attr(755,root,root) %{_libdir}/libBullet3OpenCL_clew.so.*.*
 %attr(755,root,root) %{_libdir}/libBulletCollision.so.*.*
 %attr(755,root,root) %{_libdir}/libBulletDynamics.so.*.*
-%attr(755,root,root) %{_libdir}/libBulletMultiThreaded.so.*.*
+%attr(755,root,root) %{_libdir}/libBulletFileLoader.so.*.*
 %attr(755,root,root) %{_libdir}/libBulletSoftBody.so.*.*
-%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_Mini.so.*.*
-%{?with_opencl_amd:%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_AMD.so.*.*}
-%{?with_opencl_intel:%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_Intel.so.*.*}
-%{?with_opencl_nvidia:%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_NVidia.so.*.*}
+%attr(755,root,root) %{_libdir}/libBulletWorldImporter.so.*.*
+%attr(755,root,root) %{_libdir}/libBulletXmlWorldImporter.so.*.*
+%attr(755,root,root) %{_libdir}/libConvexDecomposition.so.*.*
+%attr(755,root,root) %{_libdir}/libGIMPACTUtils.so.*.*
+%attr(755,root,root) %{_libdir}/libHACD.so.*.*
 %attr(755,root,root) %{_libdir}/libLinearMath.so.*.*
-%attr(755,root,root) %{_libdir}/libMiniCL.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc Bullet_User_Manual.pdf
+%attr(755,root,root) %{_libdir}/libBullet2FileLoader.so
+%attr(755,root,root) %{_libdir}/libBullet3Collision.so
+%attr(755,root,root) %{_libdir}/libBullet3Common.so
+%attr(755,root,root) %{_libdir}/libBullet3Dynamics.so
+%attr(755,root,root) %{_libdir}/libBullet3Geometry.so
+%attr(755,root,root) %{_libdir}/libBullet3OpenCL_clew.so
 %attr(755,root,root) %{_libdir}/libBulletCollision.so
 %attr(755,root,root) %{_libdir}/libBulletDynamics.so
-%attr(755,root,root) %{_libdir}/libBulletMultiThreaded.so
+%attr(755,root,root) %{_libdir}/libBulletFileLoader.so
 %attr(755,root,root) %{_libdir}/libBulletSoftBody.so
-%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_Mini.so
-%{?with_opencl_amd:%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_AMD.so}
-%{?with_opencl_intel:%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_Intel.so}
-%{?with_opencl_nvidia:%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_OpenCL_NVidia.so}
+%attr(755,root,root) %{_libdir}/libBulletWorldImporter.so
+%attr(755,root,root) %{_libdir}/libBulletXmlWorldImporter.so
+%attr(755,root,root) %{_libdir}/libConvexDecomposition.so
+%attr(755,root,root) %{_libdir}/libGIMPACTUtils.so
+%attr(755,root,root) %{_libdir}/libHACD.so
 %attr(755,root,root) %{_libdir}/libLinearMath.so
-%attr(755,root,root) %{_libdir}/libMiniCL.so
 %{_includedir}/bullet
 %{_libdir}/cmake/bullet
 %{_pkgconfigdir}/bullet.pc
+
+%files doc
+%defattr(644,root,root,755)
+%doc docs/{BulletQuickstart,Bullet_User_Manual,GPU_rigidbody_using_OpenCL}.pdf
diff --git a/bullet-format.patch b/bullet-format.patch
new file mode 100644
index 0000000..806dfcd
--- /dev/null
+++ b/bullet-format.patch
@@ -0,0 +1,11 @@
+--- bullet3-2.83.6/examples/Importers/ImportURDFDemo/ImportURDFSetup.cpp.orig	2015-08-11 18:17:42.000000000 +0200
++++ bullet3-2.83.6/examples/Importers/ImportURDFDemo/ImportURDFSetup.cpp	2015-10-06 21:19:15.195329529 +0200
+@@ -140,7 +140,7 @@
+ 		{
+ 			count=0;
+ 		}
+-		sprintf(m_fileName,gFileNameArray[count++].c_str());
++		strcpy(m_fileName,gFileNameArray[count++].c_str());
+ 	}
+ }
+ 
diff --git a/bullet-link.patch b/bullet-link.patch
index 00185bc..90c8894 100644
--- a/bullet-link.patch
+++ b/bullet-link.patch
@@ -1,33 +1,11 @@
---- bullet-2.82-r2704/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt.orig	2013-10-22 20:34:17.000000000 +0200
-+++ bullet-2.82-r2704/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/AMD/CMakeLists.txt	2013-12-01 18:29:37.030268534 +0100
-@@ -39,7 +39,7 @@
- SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_AMD PROPERTIES VERSION ${BULLET_VERSION})
- SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_AMD PROPERTIES SOVERSION ${BULLET_VERSION})
- IF (BUILD_SHARED_LIBS)
--	TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_AMD BulletSoftBody)
-+	TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_AMD BulletSoftBody OpenCL)
- ENDIF (BUILD_SHARED_LIBS)
- 
- 
---- bullet-2.82-r2704/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt.orig	2013-10-22 20:34:17.000000000 +0200
-+++ bullet-2.82-r2704/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/Intel/CMakeLists.txt	2013-12-01 18:30:22.136933307 +0100
-@@ -59,7 +59,7 @@
- SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Intel PROPERTIES VERSION ${BULLET_VERSION})
- SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_Intel PROPERTIES SOVERSION ${BULLET_VERSION})
- IF (BUILD_SHARED_LIBS)
--	TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_Intel BulletSoftBody)
-+	TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_Intel BulletSoftBody ${INTEL_OPENCL_LIBRARIES})
- ENDIF (BUILD_SHARED_LIBS)
- 
- 
---- bullet-2.82-r2704/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt.orig	2013-12-01 18:19:49.676959847 +0100
-+++ bullet-2.82-r2704/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt	2013-12-01 18:21:30.216955629 +0100
-@@ -58,7 +58,7 @@
- SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_NVidia PROPERTIES VERSION ${BULLET_VERSION})
- SET_TARGET_PROPERTIES(BulletSoftBodySolvers_OpenCL_NVidia PROPERTIES SOVERSION ${BULLET_VERSION})
- IF (BUILD_SHARED_LIBS)
--	TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_NVidia BulletSoftBody BulletDynamics)
-+	TARGET_LINK_LIBRARIES(BulletSoftBodySolvers_OpenCL_NVidia BulletSoftBody BulletDynamics ${NVIDIA_OPENCL_LIBRARIES})
- ENDIF (BUILD_SHARED_LIBS)
- 
- 
+--- bullet3-2.83.6/src/Bullet3OpenCL/CMakeLists.txt.orig	2015-08-11 18:17:42.000000000 +0200
++++ bullet3-2.83.6/src/Bullet3OpenCL/CMakeLists.txt	2015-10-06 21:41:45.761939521 +0200
+@@ -45,7 +45,7 @@
+ SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES VERSION ${BULLET_VERSION})
+ SET_TARGET_PROPERTIES(Bullet3OpenCL_clew PROPERTIES SOVERSION ${BULLET_VERSION})
+ IF (BUILD_SHARED_LIBS)
+-  TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics)
++  TARGET_LINK_LIBRARIES(Bullet3OpenCL_clew LinearMath Bullet3Dynamics dl)
+ ENDIF (BUILD_SHARED_LIBS)
+ 
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/bullet.git/commitdiff/986ec531a6184299b1b2f8fed3fe6fc204a4179b

More information about the pld-cvs-commit mailing list