[xonotic] Fix arm build.

Jon Ciesla limb at fedoraproject.org
Wed Feb 20 18:53:02 UTC 2013


commit 7ae778292f729a992c90ba91be3c9d5b6000433c
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Wed Feb 20 12:52:53 2013 -0600

    Fix arm build.

 xonotic-0.6.0-nosse.patch |   13 +++++++++++++
 xonotic.spec              |    9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/xonotic-0.6.0-nosse.patch b/xonotic-0.6.0-nosse.patch
new file mode 100644
index 0000000..031d4d2
--- /dev/null
+++ b/xonotic-0.6.0-nosse.patch
@@ -0,0 +1,13 @@
+--- darkplaces/makefile.inc~	2013-02-20 11:27:29.000000000 -0600
++++ darkplaces/makefile.inc	2013-02-20 11:42:02.328699712 -0600
+@@ -193,8 +193,8 @@
+ CFLAGS_RELEASE_PROFILE=-fbranch-probabilities
+ CFLAGS_SDL=$(SDLCONFIG_CFLAGS)
+ 
+-CFLAGS_SSE=-msse
+-CFLAGS_SSE2=-msse2
++#CFLAGS_SSE=-msse
++#CFLAGS_SSE2=-msse2
+ 
+ OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
+ #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
diff --git a/xonotic.spec b/xonotic.spec
index c43e50a..55af3a2 100644
--- a/xonotic.spec
+++ b/xonotic.spec
@@ -4,7 +4,7 @@
 Summary: Multiplayer, deathmatch oriented first person shooter
 Name: xonotic
 Version: 0.6.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Amusements/Games
 URL: http://www.xonotic.org/
@@ -22,6 +22,7 @@ Source10: darkplaces-quake.sh
 Source11: darkplaces-quake.autodlrc
 Source12: darkplaces-quake.desktop
 Patch0: darkplaces-crypto.patch
+Patch1: xonotic-0.6.0-nosse.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
 BuildRequires: desktop-file-utils
@@ -115,6 +116,9 @@ cd ..
 tar -C darkplaces/ -xzf %{SOURCE2}
 
 %patch0 -p0
+%ifarch %{arm}
+%patch1 -p0
+%endif
 
 %build
 
@@ -237,6 +241,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Wed Feb 20 2013 Jon Ciesla <limburgher at gmail.com> - 0.6.0-6
+- Drop sse flags to allow buildon ARM.
+
 * Wed Feb 20 2013 Jon Ciesla <limburgher at gmail.com> - 0.6.0-5
 - Removed more macros.
 - Enabled parallel build, then re-disabled, unreliable.


More information about the scm-commits mailing list