[luminance-hdr] - fix build on non-x86 arches

Dan Horák sharkcz at fedoraproject.org
Fri Sep 20 08:35:12 UTC 2013


commit a57818998f9d3b8b9b915fa407245b5b4cfadb79
Author: Dan Horák <dan at danny.cz>
Date:   Fri Sep 20 10:34:59 2013 +0200

    - fix build on non-x86 arches

 luminance-hdr-2.2.1-non-x86.patch |   15 ---------------
 luminance-hdr-2.3.1-non-x86.patch |   10 ++++++++++
 luminance-hdr.spec                |   10 +++++++++-
 3 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/luminance-hdr-2.3.1-non-x86.patch b/luminance-hdr-2.3.1-non-x86.patch
new file mode 100644
index 0000000..0a14ee8
--- /dev/null
+++ b/luminance-hdr-2.3.1-non-x86.patch
@@ -0,0 +1,10 @@
+diff -up luminance-hdr-2.3.1/cmake/CompilerSettings.cmake.non-x86 luminance-hdr-2.3.1/cmake/CompilerSettings.cmake
+--- luminance-hdr-2.3.1/cmake/CompilerSettings.cmake.non-x86	2013-09-20 10:19:51.000000000 +0200
++++ luminance-hdr-2.3.1/cmake/CompilerSettings.cmake	2013-09-20 10:19:55.000000000 +0200
+@@ -1,6 +1,5 @@
+ IF(UNIX)
+ ADD_DEFINITIONS(-Wall -Wno-unknown-pragmas)
+-ADD_DEFINITIONS(-ffast-math -msse2 -msse)
+ 
+ IF(APPLE)
+ # optimize for 64-bit core 2 architecture on Apple
diff --git a/luminance-hdr.spec b/luminance-hdr.spec
index bad9199..7e6b8b1 100644
--- a/luminance-hdr.spec
+++ b/luminance-hdr.spec
@@ -1,6 +1,6 @@
 Name: luminance-hdr
 Version: 2.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A graphical tool for creating and tone-mapping HDR images
 
 Group: Applications/Productivity
@@ -8,6 +8,8 @@ License: GPLv2+
 URL: http://qtpfsgui.sourceforge.net/
 Source0: http://downloads.sourceforge.net/qtpfsgui/%{name}-%{version}.tar.bz2
 Patch0: luminance-hdr-2.3.1-fix-cli.patch
+# fix build on non-x86 arches
+Patch1: luminance-hdr-2.3.1-non-x86.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt4-devel
@@ -38,6 +40,9 @@ operators for creating low dynamic range versions of HDR images.
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch0 -p1
+%ifnarch %{ix86} x86_64
+%patch1 -p1
+%endif
 
 # fix inconsistant newlines
 %{__sed} -i 's/\r//' Changelog
@@ -94,6 +99,9 @@ fi
 
 
 %changelog
+* Fri Sep 20 2013 Dan Horák <dan[at]danny.cz> - 2.3.1-2
+- fix build on non-x86 arches
+
 * Fri Sep 13 2013 Franco Comida <francocomida at googlemail.com> - 2.3.1-1
 - Updated to Luminance HDR 2.3.1
 


More information about the scm-commits mailing list