Hello community, here is the log from the commit of package libbullet for openSUSE:Factory checked in at 2016-05-08 10:45:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libbullet (Old) and /work/SRC/openSUSE:Factory/.libbullet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libbullet" Changes: -------- --- /work/SRC/openSUSE:Factory/libbullet/libbullet.changes 2014-08-05 13:00:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libbullet.new/libbullet.changes 2016-05-08 10:46:09.000000000 +0200 @@ -1,0 +2,17 @@ +Tue May 3 14:52:47 UTC 2016 - rpm@fthiessen.de + +- Update to new release 2.83.7: + * Import of URDF files, universal robot description files. + A URDF file can be imported as rigid bodies (btRigidBody) or + as multi body (btMultiBody). See the example browser under + importers. + * Improved support for btMultiBody with multi-degree of freedom + mobilizers, thanks to Jakub Stepien. + * New btGeneric6DofSpring2Constraint, replacing the old one. + Thanks to Gabor PUHR and Tamas Umenhoffer. + * OpenCL demo integrated in the ExampleBrowser. The demo is + disabled by default. + * Implicit integration of gyroscopic forces. +- Add fix-gtest.patch to fix unit tests + +------------------------------------------------------------------- Old: ---- bullet-2.82-r2704.tar.xz New: ---- bullet3-2.83.7.tar.gz fix-gtest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbullet.spec ++++++ --- /var/tmp/diff_new_pack.6rQnst/_old 2016-05-08 10:46:10.000000000 +0200 +++ /var/tmp/diff_new_pack.6rQnst/_new 2016-05-08 10:46:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libbullet # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +16,22 @@ # +%define lname libbullet2_83 Name: libbullet -%define lname libbullet2_82 -%define rev 2704 -Version: 2.82 +Version: 2.83.7 Release: 0 Summary: Bullet Continuous Collision Detection and Physics Library License: Zlib Group: Development/Libraries/C and C++ Url: http://bulletphysics.org/ +Source: https://github.com/bulletphysics/bullet3/archive/%{version}/bullet3-%{version}.tar.gz +Patch0: fix-gtest.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: libxml2-devel BuildRequires: pkgconfig -Source: bullet-%{version}-r%{rev}.tar.xz -# NOTICE Please purge Extras and Glut dirs from a vanilla tarball: -# https://bullet.googlecode.com/files/bullet-{version}-r{rev}.tgz -# See more at https://bugzilla.novell.com/show_bug.cgi?id=889897 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,13 +40,13 @@ license. This means you can use it in commercial games, even on next-generation consoles like Sony Playstation 3. -%package -n %lname +%package -n %{lname} Summary: Bullet Continuous Collision Detection and Physics Library Group: System/Libraries Obsoletes: libbullet < %{version}-%{release} Provides: libbullet = %{version}-%{release} -%description -n %lname +%description -n %{lname} Bullet is a Collision Detection and Rigid Body Dynamics Library. The Library is Open Source and free for commercial use, under the ZLib license. This means you can use it in commercial games, even on @@ -65,31 +62,29 @@ appliancation with the Bullet library. %prep -%setup -q -n bullet-%{version}-r%{rev} +%setup -q -n bullet3-%{version} +%patch0 -p1 +sed -i 's/\r//' README.md %build LIB_DIR=%{_lib} -cmake . -DMAKE_SKIP_RPATH=ON \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DLIB_SUFFIX=${LIB_DIR#lib} \ - -DBUILD_EXTRAS=OFF \ - -DBUILD_DEMOS=OFF +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DINCLUDE_INSTALL_DIR="%{_includedir}/bullet" \ + -DBUILD_BULLET2_DEMOS=OFF \ + -DBUILD_OPENGL3_DEMOS=OFF make VERBOSE=1 %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} +%cmake_install %fdupes %{buildroot}/%{_includedir} -%post -n %lname -p /sbin/ldconfig +%post -n %{lname} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig - -%files -n %lname +%files -n %{lname} %defattr(-,root,root) -%doc ChangeLog README COPYING +%doc README.md LICENSE.txt AUTHORS.txt %{_libdir}/libB*.so.* %{_libdir}/libLinearMath*.so.* ++++++ fix-gtest.patch ++++++ diff -Nur bullet3-2.83.7/src/Bullet3OpenCL/CMakeLists.txt new/src/Bullet3OpenCL/CMakeLists.txt --- bullet3-2.83.7/src/Bullet3OpenCL/CMakeLists.txt 2016-01-08 23:36:41.000000000 +0100 +++ new/src/Bullet3OpenCL/CMakeLists.txt 2016-05-03 16:17:40.532893852 +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) diff -Nur bullet3-2.83.7/test/gtest-1.7.0/CMakeLists.txt new/test/gtest-1.7.0/CMakeLists.txt --- bullet3-2.83.7/test/gtest-1.7.0/CMakeLists.txt 2016-01-08 23:36:41.000000000 +0100 +++ new/test/gtest-1.7.0/CMakeLists.txt 2016-05-03 16:06:00.880114315 +0200 @@ -8,9 +8,13 @@ src/gtest-all.cc ) +FIND_PACKAGE(Threads) + #ADD_DEFINITIONS(-DGTEST_HAS_PTHREAD=1) ADD_DEFINITIONS(-D_VARIADIC_MAX=10) FILE(GLOB_RECURSE gtest-1.7.0_HDRS "*.h") ADD_LIBRARY(gtest ${gtest-1.7.0_SRCS} ${gtest-1.7.0_HDRS}) + +TARGET_LINK_LIBRARIES(gtest dl ${CMAKE_THREAD_LIBS_INIT})