Hello community, here is the log from the commit of package libbullet for openSUSE:Factory checked in at 2019-06-19 21:02:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libbullet (Old) and /work/SRC/openSUSE:Factory/.libbullet.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libbullet" Wed Jun 19 21:02:17 2019 rev:7 rq:706536 version:2.88 Changes: -------- --- /work/SRC/openSUSE:Factory/libbullet/libbullet.changes 2017-09-09 20:26:35.009678175 +0200 +++ /work/SRC/openSUSE:Factory/.libbullet.new.4811/libbullet.changes 2019-06-19 21:02:35.574198845 +0200 @@ -1,0 +2,7 @@ +Thu May 23 02:31:05 UTC 2019 - Max Mitschke <maxmitsc...@fastmail.com> + +- Update to release 2.88 +- Add patch: use-system-libs.patch +- Cleaned up specfile + +------------------------------------------------------------------- Old: ---- bullet3-2.86.1.tar.gz New: ---- bullet3-2.88.tar.gz use-system-libs.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libbullet.spec ++++++ --- /var/tmp/diff_new_pack.ShsLyr/_old 2019-06-19 21:02:37.446200469 +0200 +++ /var/tmp/diff_new_pack.ShsLyr/_new 2019-06-19 21:02:37.450200473 +0200 @@ -1,7 +1,7 @@ # # spec file for package libbullet # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,29 +12,32 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define sover 2_86 +%define sover 2_88 %define lname libbullet%{sover} -%define pdesc Bullet is a Collision Detection and Rigid Body Dynamics \ -Library. +%define pdesc Bullet is a Collision Detection and Rigid Body Dynamics Library. Name: libbullet -Version: 2.86.1 +Version: 2.88 Release: 0 Summary: Bullet Continuous Collision Detection and Physics Library License: Zlib Group: Development/Libraries/C and C++ -Url: http://bulletphysics.org/ +URL: https://pybullet.org/wordpress/ Source: https://github.com/bulletphysics/bullet3/archive/%{version}/bullet3-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix-pkgconfig-cflags.patch gh#bulletphysics/bullet3#626 Patch1: fix-pkgconfig-cflags.patch +Patch2: use-system-libs.patch BuildRequires: cmake +BuildRequires: dos2unix BuildRequires: fdupes -BuildRequires: freeglut-devel BuildRequires: gcc-c++ BuildRequires: pkgconfig +BuildRequires: pkgconfig(freeglut) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(tinyxml2) %description %{pdesc} @@ -115,55 +118,66 @@ %prep %setup -q -n bullet3-%{version} -sed -i 's/\r//' README.md %patch1 -p1 +%patch2 -p1 + +# Take from Fedora specfile +rm -rf build3/*.{bat,exe} +rm -rf build3/xcode* +rm -rf build3/*osx* +rm -rf build3/premake* +rm -rf data +rm -rf examples + +# Taken from Fedora specfile +# 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 any file permissions and formats +dos2unix -c ascii README.md %build -tmpflags="%{optflags} -fno-strict-aliasing" -%ifarch %{ix86} -%if 0%{?suse_version} == 1320 -tmpflags="${tmpflags} -fno-stack-protector" -%endif -%endif %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_C_FLAGS="${tmpflags}" \ - -DCMAKE_CXX_FLAGS="${tmpflags}" \ + -DCMAKE_C_FLAGS="%{optflags} -fno-strict-aliasing" \ + -DCMAKE_CXX_FLAGS="%{optflags} -fno-strict-aliasing" \ -DINCLUDE_INSTALL_DIR="%{_includedir}/bullet" \ - -DBUILD_SHARED_LIBS=ON \ + -DBUILD_BULLET2_DEMOS=OFF \ + -DBUILD_CPU_DEMOS=OFF \ -DBUILD_EXTRAS=ON \ + -DBUILD_OPENGL3_DEMOS=OFF \ + -DBUILD_SHARED_LIBS=ON \ -DBUILD_UNIT_TESTS=off \ - -DBUILD_CPU_DEMOS=OFF \ - -DINSTALL_LIBS=ON \ -DINSTALL_EXTRA_LIBS=ON \ - -DBUILD_BULLET2_DEMOS=OFF \ - -DBUILD_OPENGL3_DEMOS=OFF + -DINSTALL_LIBS=ON make VERBOSE=1 %{?_smp_mflags} %install %cmake_install -%fdupes %{buildroot}/%{_includedir} +%fdupes -s %{buildroot}/%{_includedir} %post -n %{lname} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig %post -n libBulletFileLoader%{sover} -p /sbin/ldconfig -%postun -n libBulletFileLoader%{sover} -p /sbin/ldconfig %post -n libBulletInverseDynamicsUtils%{sover} -p /sbin/ldconfig -%postun -n libBulletInverseDynamicsUtils%{sover} -p /sbin/ldconfig %post -n libBulletWorldImporter%{sover} -p /sbin/ldconfig -%postun -n libBulletWorldImporter%{sover} -p /sbin/ldconfig %post -n libBulletXmlWorldImporter%{sover} -p /sbin/ldconfig -%postun -n libBulletXmlWorldImporter%{sover} -p /sbin/ldconfig %post -n libConvexDecomposition%{sover} -p /sbin/ldconfig -%postun -n libConvexDecomposition%{sover} -p /sbin/ldconfig %post -n libGIMPACTUtils%{sover} -p /sbin/ldconfig -%postun -n libGIMPACTUtils%{sover} -p /sbin/ldconfig %post -n libHACD%{sover} -p /sbin/ldconfig +%postun -n %{lname} -p /sbin/ldconfig +%postun -n libBulletFileLoader%{sover} -p /sbin/ldconfig +%postun -n libBulletInverseDynamicsUtils%{sover} -p /sbin/ldconfig +%postun -n libBulletWorldImporter%{sover} -p /sbin/ldconfig +%postun -n libBulletXmlWorldImporter%{sover} -p /sbin/ldconfig +%postun -n libConvexDecomposition%{sover} -p /sbin/ldconfig +%postun -n libGIMPACTUtils%{sover} -p /sbin/ldconfig %postun -n libHACD%{sover} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc README.md LICENSE.txt AUTHORS.txt +%doc README.md AUTHORS.txt +%license LICENSE.txt %{_libdir}/libB*.so.* %{_libdir}/libLinearMath*.so.* %exclude %{_libdir}/libBulletFileLoader.so.* @@ -172,38 +186,30 @@ %exclude %{_libdir}/libBulletXmlWorldImporter.so.* %files -n libBulletFileLoader%{sover} -%defattr(-,root,root) %{_libdir}/libBulletFileLoader.so.* %files -n libBulletInverseDynamicsUtils%{sover} -%defattr(-,root,root) %{_libdir}/libBulletInverseDynamicsUtils.so.* %files -n libBulletWorldImporter%{sover} -%defattr(-,root,root) %{_libdir}/libBulletWorldImporter.so.* %files -n libBulletXmlWorldImporter%{sover} -%defattr(-,root,root) %{_libdir}/libBulletXmlWorldImporter.so.* %files -n libConvexDecomposition%{sover} -%defattr(-,root,root) %{_libdir}/libConvexDecomposition.so.* %files -n libGIMPACTUtils%{sover} -%defattr(-,root,root) %{_libdir}/libGIMPACTUtils.so.* %files -n libHACD%{sover} -%defattr(-,root,root) %{_libdir}/libHACD.so.* %files devel -%defattr(-,root,root) %{_includedir}/bullet/ -%{_libdir}/pkgconfig/bullet.pc -%{_libdir}/lib*.so %{_libdir}/cmake/bullet +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/bullet.pc %changelog ++++++ bullet3-2.86.1.tar.gz -> bullet3-2.88.tar.gz ++++++ /work/SRC/openSUSE:Factory/libbullet/bullet3-2.86.1.tar.gz /work/SRC/openSUSE:Factory/.libbullet.new.4811/bullet3-2.88.tar.gz differ: char 13, line 1 ++++++ use-system-libs.patch ++++++ From: Max Mitschke <max.mitsc...@msufcu.org> Date: 2019-05-22 22:10:34 -0400 References: Upstream: never Subject: Use system-provided tinyxml2 library instead of bundled library --- diff -Naur a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt 2018-12-31 15:42:41.000000000 -0500 +++ b/CMakeLists.txt 2019-05-22 21:00:13.301474451 -0400 @@ -328,6 +328,8 @@ 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 -Naur a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt --- a/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt 2018-12-31 15:42:41.000000000 -0500 +++ b/Extras/Serialize/BulletXmlWorldImporter/CMakeLists.txt 2019-05-22 21:14:35.432401242 -0400 @@ -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 @@ 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)
