[openlierox] Drop always_inline macro it is not used anywhere and is causing compilation issues with recent boost
Hans de Goede
jwrdegoede at fedoraproject.org
Thu Jan 19 08:35:23 UTC 2012
commit 689af5b16fe71f4d1f46ebfc3b47164f25f36485
Author: Hans de Goede <hdegoede at redhat.com>
Date: Thu Jan 19 09:36:37 2012 +0100
Drop always_inline macro it is not used anywhere and is causing compilation
issues with recent boost versions (also see rhbz#781859)
OpenLieroX-0.59-always_inline.patch | 16 ++++++++++++++++
openlierox.spec | 8 +++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/OpenLieroX-0.59-always_inline.patch b/OpenLieroX-0.59-always_inline.patch
new file mode 100644
index 0000000..6ea40f0
--- /dev/null
+++ b/OpenLieroX-0.59-always_inline.patch
@@ -0,0 +1,16 @@
+diff -up OpenLieroX/src/gusanos/blitters/mmx.h~ OpenLieroX/src/gusanos/blitters/mmx.h
+--- OpenLieroX/src/gusanos/blitters/mmx.h~ 2010-02-17 17:59:26.000000000 +0100
++++ OpenLieroX/src/gusanos/blitters/mmx.h 2012-01-19 09:29:47.666306814 +0100
+@@ -207,12 +207,4 @@ union mmx_reg
+ #error "MMX capability only available on GCC!"
+ #endif
+
+-#ifndef always_inline
+-#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ > 0)
+-# define always_inline __attribute__((always_inline)) inline
+-#else
+-# define always_inline inline
+-#endif
+-#endif
+-
+ #endif //MMX_H
diff --git a/openlierox.spec b/openlierox.spec
index 3c13fb6..5856459 100644
--- a/openlierox.spec
+++ b/openlierox.spec
@@ -2,7 +2,7 @@
Name: openlierox
Version: 0.59
-Release: 0.1.%{prever}%{?dist}
+Release: 0.2.%{prever}%{?dist}
Summary: Addictive realtime multiplayer 2D shoot-em-up
Group: Amusements/Games
License: LGPLv2+
@@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/%{name}/OpenLieroX_%{version}_%
Source1: %{name}.desktop
Source2: README.fedora
Patch0: OpenLieroX-0.59-gcc47.patch
+Patch1: OpenLieroX-0.59-always_inline.patch
BuildRequires: SDL_mixer-devel SDL_image-devel SDL_gfx-devel gd-devel
BuildRequires: libxml2-devel hawknl-devel zlib-devel desktop-file-utils
BuildRequires: libzip-devel curl-devel freealut-devel libvorbis-devel
@@ -28,6 +29,7 @@ to provide endless gaming pleasure.
%prep
%setup -q -n OpenLieroX
%patch0 -p1
+%patch1 -p1
sed -i 's/\r//g' doc/original_lx_docs/*.*
cp -a %{SOURCE2} .
# Remove bundled libs to ensure they are not used
@@ -88,6 +90,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Thu Jan 19 2012 Hans de Goede <hdegoede at redhat.com> - 0.59-0.2.beta9
+- Drop always_inline macro it is not used anywhere and is causing compilation
+ issues with recent boost versions (also see rhbz#781859)
+
* Sun Jan 15 2012 Hans de Goede <hdegoede at redhat.com> - 0.59-0.1.beta9
- New upstream release 0.59-beta9
- Fix building with gcc-4.7
More information about the scm-commits
mailing list