diff --git a/bullet-compile-warning.patch b/bullet-compile-warning.patch new file mode 100644 index 0000000..9c9338a --- /dev/null +++ b/bullet-compile-warning.patch @@ -0,0 +1,42 @@ +From 886650a038f610081d9fe420f64d23d89b9a139c Mon Sep 17 00:00:00 2001 +From: "erwin.coumans@gmail.com" + +Date: Sun, 17 Nov 2013 20:13:50 +0000 +Subject: [PATCH] fix 'unused' warning. Fixes Issue 770 + +--- + src/LinearMath/btScalar.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h +index 37c6dec191..225d49f3ff 100644 +--- a/src/LinearMath/btScalar.h ++++ b/src/LinearMath/btScalar.h +@@ -284,6 +284,10 @@ static int btNanMask = 0x7F800001; + #ifndef BT_INFINITY + static int btInfinityMask = 0x7F800000; + #define BT_INFINITY (*(float*)&btInfinityMask) ++inline int btGetInfinityMask()//suppress stupid compiler warning ++{ ++ return btInfinityMask; ++} + #endif + + //use this, in case there are clashes (such as xnamath.h) +@@ -336,6 +340,10 @@ inline __m128 operator * (const __m128 A, const __m128 B) + #ifndef BT_INFINITY + static int btInfinityMask = 0x7F800000; + #define BT_INFINITY (*(float*)&btInfinityMask) ++ inline int btGetInfinityMask()//suppress stupid compiler warning ++ { ++ return btInfinityMask; ++ } + #endif + #endif//BT_USE_NEON + +@@ -728,4 +736,5 @@ template T* btAlignPointer(T* unalignedPtr, size_t alignment) + return converter.ptr; + } + ++ + #endif //BT_SCALAR_H diff --git a/bullet.spec b/bullet.spec index 61c2fe3..cb12272 100644 --- a/bullet.spec +++ b/bullet.spec @@ -2,7 +2,7 @@ Name: bullet Version: 2.82 -Release: 2%{?dist} +Release: 3%{?dist} Summary: 3D Collision Detection and Rigid Body Dynamics Library Group: Development/Libraries License: zlib and MIT and BSD @@ -22,6 +22,10 @@ BuildRequires: cmake BuildRequires: freeglut-devel BuildRequires: libICE-devel +# Patch to silence some compiler warnings. +# Backport of upstream 886650a03 +# rhbz#1856910 +Patch0: bullet-compile-warning.patch %description Bullet is a 3D Collision Detection and Rigid Body Dynamics Library for games @@ -59,6 +63,7 @@ Development headers and libraries for %{name} extra libraries. %prep %setup -q -n %{name}-%{version}-r%{svnrev} +%patch0 -p1 # Set these files to right permission chmod 644 src/LinearMath/btPoolAllocator.h @@ -157,15 +162,19 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libBulletXmlWorldImporter.so %changelog -* Fri May 16 2014 Rich Mattes - 2.82-2 +* Wed Jul 29 2020 Rich Mattes - 2.82-3 +- Apply upstream patch for compiler warnings (rhbz#1856910) + +* Sun Sep 07 2014 Rich Mattes - 2.82-2 - Install all of the bullet extras (rhbz#1097452) - Spec file cleanup -* Sun Feb 09 2014 Rich Mattes - 2.82-1 +* Wed May 28 2014 Rich Mattes - 2.82-1 - Update to version 2.82 -* Sat Aug 03 2013 Fedora Release Engineering - 2.81-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild +* Sun May 18 2014 Rich Mattes - 2.81-3 +- Fix installation of bullet extras (rhbz#1097452) +- Spec file cleanup * Wed Feb 13 2013 Fedora Release Engineering - 2.81-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild