Changes - SailfishOS Open Build Service

Changes of Revision 5

[-] [+]	Changed	_service:gitpkg:libbullet.changes
@@ -1,3 +1,6 @@ +* Tue Feb 25 2014 David Greaves <david@dgreaves.com> - 2.82-4 +- Don't install vectormath/ includes which are no longer shipped + * Tue Feb 25 2014 David Greaves <david@dgreaves.com> - 2.82-3 - Restore missing Bullet-C-Api.h
[-] [+]	Changed	_service:gitpkg:libbullet.spec ^
@@ -5,7 +5,7 @@ Name: libbullet %define lname libbullet2_82 Version: 2.82 -Release: 3 +Release: 4 Summary: Bullet Continuous Collision Detection and Physics Library License: Zlib Group: Development/Libraries/C and C++ @@ -17,6 +17,7 @@ Source: libbullet-%{version}.tar.gz Patch1: 0001-Add-missing-UseBullet.cmake.patch Patch2: 0002-Restore-missing-Bullet-C-Api.h.patch +Patch3: 0003-Don-t-install-vectormath-includes-which-are-no-longe.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,18 +51,17 @@ %setup -q -n src %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build LIB_DIR=%{_lib} -cmake . -DMAKE_SKIP_RPATH=ON \ +cmake . \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DLIB_SUFFIX=${LIB_DIR#lib} \ - -DBUILD_EXTRAS=OFF \ -DBUILD_DEMOS=OFF \ - -DUSE_GLUT=OFF \ - -DUSE_NEON=ON + -DUSE_GLUT=OFF make VERBOSE=1 %{?_smp_mflags} @@ -80,6 +80,7 @@ %files devel %defattr(-,root,root) %{_includedir}/bullet/ +%{_libdir}/cmake/bullet/cmake %{_libdir}/pkgconfig/bullet.pc %{_libdir}/libB.so %{_libdir}/libLinearMath*.so
[-] [+]	Added	_service:gitpkg:0003-Don-t-install-vectormath-includes-which-are-no-longe.patch ^
@@ -0,0 +1,41 @@ +From befc1b67b2ba96089d362e719d26a9a60a036797 Mon Sep 17 00:00:00 2001 +From: David Greaves <david@dgreaves.com> +Date: Tue, 25 Feb 2014 01:02:10 +0000 +Subject: [PATCH] Don't install vectormath/ includes which are no longer + shipped + +Signed-off-by: David Greaves <david@dgreaves.com> +--- + src/CMakeLists.txt \| 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 3a736b4..86f40ac 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -11,22 +11,6 @@ IF(INSTALL_LIBS) + # Don't actually need to install any common files, the frameworks include everything + ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + INSTALL(FILES btBulletCollisionCommon.h btBulletDynamicsCommon.h Bullet-C-Api.h DESTINATION ${INCLUDE_INSTALL_DIR}) +- INSTALL(FILES vectormath/vmInclude.h DESTINATION ${INCLUDE_INSTALL_DIR}/vectormath) +- INSTALL(FILES vectormath/scalar/boolInVec.h +- vectormath/scalar/floatInVec.h +- vectormath/scalar/mat_aos.h +- vectormath/scalar/quat_aos.h +- vectormath/scalar/vec_aos.h +- vectormath/scalar/vectormath_aos.h +- DESTINATION ${INCLUDE_INSTALL_DIR}/vectormath/scalar) +- INSTALL(FILES vectormath/sse/boolInVec.h +- vectormath/sse/floatInVec.h +- vectormath/sse/mat_aos.h +- vectormath/sse/quat_aos.h +- vectormath/sse/vec_aos.h +- vectormath/sse/vecidx_aos.h +- vectormath/sse/vectormath_aos.h +- DESTINATION ${INCLUDE_INSTALL_DIR}/vectormath/sse) + ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK) + ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5) + ENDIF(INSTALL_LIBS) +-- +1.8.2 +
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <services> <service name="gitpkg"> <param name="repo">lbt/bullet3</param> - <param name="tag">a54c3797554d36c6efee374ec614527702116fa4</param> + <param name="tag">0fad7894e4bbcaf1760dc956076c58fb2cfbf7b3</param> <param name="service">github</param> </service> </services>
[-] [+]	Changed	_service:gitpkg:_src ^
@@ -1 +1 @@ -git:libbullet-2.82.tar.gz:mer-2.82-1:mer-2.82-3 +git:libbullet-2.82.tar.gz:mer-2.82-1:mer-2.82-4