X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bullet.spec;h=6f48f1acfaf068719c4347abec8c40bce7501e95;hb=1080f108e5f88b831ad73051cbc5a8f633298e65;hp=e78d394877c056baa31f93b93a6aaee141f70cea;hpb=10c00b9602b42d8af5889361ac452c610b47ebe9;p=packages%2Fbullet.git

diff --git a/bullet.spec b/bullet.spec
index e78d394..6f48f1a 100644
--- a/bullet.spec
+++ b/bullet.spec
@@ -1,19 +1,26 @@
 #
-# TODO: fix linking
+# Conditional build:
+%bcond_with	opencl_amd	# AMD OpenCL
+%bcond_with	opencl_intel	# Intel OpenCL (64-bit)
+%bcond_with	opencl_nvidia	# NVidia OpenCL
 #
-Summary:	Bullet - vollision detection and rigid body dynamics library
+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.78
-Release:	0.1
-License:	Zlib
-Group:		Applications
-Source0:	http://bullet.googlecode.com/files/%{name}-%{version}.zip
-# Source0-md5:	99d4070864c9f73521481ba9cda25038
+Version:	2.82
+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
 Patch0:		%{name}-link.patch
 URL:		http://bulletphysics.org/wordpress/
+BuildRequires:	OpenCL-devel
+BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-glut-devel
-BuildRequires:	cmake
+BuildRequires:	cmake >= 2.4.3
+BuildRequires:	libstdc++-devel
 BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	unzip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -22,41 +29,45 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Bullet is a collision detection and rigid nody dynamics library.
 
 %description -l pl.UTF-8
-Bullet to biblioteka wykrywania kolizji oraz dynamiki ciała sztywnego
+Bullet to biblioteka wykrywania kolizji oraz dynamiki ciała sztywnego.
 
 %package devel
-Summary:	Header files for bullet library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki bullet
+Summary:	Header files for bullet libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek bullet
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	OpenCL-devel
+Requires:	OpenGL-GLU-devel
+Requires:	OpenGL-glut-devel
 
 %description devel
-Header files for bullet library.
+Header files for bullet libraries.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki bullet.
+Pliki nagłówkowe bibliotek bullet.
 
 %prep
-%setup -q
-%undos src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/NVidia/CMakeLists.txt
-%undos src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/MiniCL/CMakeLists.txt
+%setup -q -n %{name}-%{version}-r2704
 %patch0 -p1
 
 %build
-mkdir build
-cd build
-%cmake \
+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_EXTRAS=ON \
+	-DBUILD_MULTITHREADING=ON \
 	-DINCLUDE_INSTALL_DIR=%{_includedir}/%{name} \
-	..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C build install \
+%{__make} -C pkgbuild install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -67,13 +78,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS COPYING ChangeLog NEWS README
 %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}/libBulletSoftBody.so.*.*
-%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_CPU.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}/libLinearMath.so.*.*
 %attr(755,root,root) %{_libdir}/libMiniCL.so.*.*
 
@@ -84,9 +97,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libBulletDynamics.so
 %attr(755,root,root) %{_libdir}/libBulletMultiThreaded.so
 %attr(755,root,root) %{_libdir}/libBulletSoftBody.so
-%attr(755,root,root) %{_libdir}/libBulletSoftBodySolvers_CPU.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}/libLinearMath.so
 %attr(755,root,root) %{_libdir}/libMiniCL.so
-%{_includedir}/%{name}
-%{_pkgconfigdir}/%{name}.pc
+%{_includedir}/bullet
+%{_libdir}/cmake/bullet
+%{_pkgconfigdir}/bullet.pc