[analitza] disable opengl (plotter3d) support on arm
Rex Dieter
rdieter at fedoraproject.org
Thu Mar 7 03:53:23 UTC 2013
commit dadf6dbed242b97a5ae2b06ec4741beb9d373fe7
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Wed Mar 6 21:53:05 2013 -0600
disable opengl (plotter3d) support on arm
analitza-4.10.1-opengl_optional.patch | 17 +++++++++++++++++
analitza.spec | 23 +++++++++++++++++++++--
2 files changed, 38 insertions(+), 2 deletions(-)
---
diff --git a/analitza-4.10.1-opengl_optional.patch b/analitza-4.10.1-opengl_optional.patch
new file mode 100644
index 0000000..30f3bea
--- /dev/null
+++ b/analitza-4.10.1-opengl_optional.patch
@@ -0,0 +1,17 @@
+diff -up analitza-4.10.1/CMakeLists.txt.opengl_optional analitza-4.10.1/CMakeLists.txt
+--- analitza-4.10.1/CMakeLists.txt.opengl_optional 2013-03-01 00:39:17.251723086 -0600
++++ analitza-4.10.1/CMakeLists.txt 2013-03-06 21:48:38.705252164 -0600
+@@ -13,8 +13,11 @@ macro_bool_to_01(READLINE_FOUND HAVE_REA
+ macro_log_feature(READLINE_FOUND "GNU Readline" "Allows KAlgebra to provide a console interface." "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html" FALSE "" "")
+
+ macro_optional_find_package(OpenGL)
+-macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
+-macro_log_feature(OPENGL_FOUND "OpenGL" "Support for 3D graphs in Analitza" "http://opengl.org" FALSE "" "")
++option(SHOULD_BUILD_OPENGL "Build OpenGL support" ON)
++if(SHOULD_BUILD_OPENGL)
++ macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
++endif(SHOULD_BUILD_OPENGL)
++macro_log_feature(HAVE_OPENGL "OpenGL" "Support for 3D graphs in Analitza" "http://opengl.org" FALSE "" "")
+
+ include_directories(.)
+ add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
diff --git a/analitza.spec b/analitza.spec
index 8949d58..30b6075 100644
--- a/analitza.spec
+++ b/analitza.spec
@@ -1,7 +1,12 @@
+
+%ifnarch %{arm}
+%global opengl 1
+%endif
+
Name: analitza
Summary: Library of mathematical features
Version: 4.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: https://projects.kde.org/projects/kde/kdeedu/analitza
@@ -13,7 +18,14 @@ URL: https://projects.kde.org/projects/kde/kdeedu/analitza
%endif
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
+# add SHOULD_BUILD_OPENGL option, to be able to disable support
+# on arm because plotter3d assumes qreal=double all over the place
+Patch1: analitza-4.10.1-opengl_optional.patch
+
BuildRequires: kdelibs4-devel >= %{version}
+%if 0%{?opengl:1}
+BuildRequires: pkgconfig(QtOpenGL)
+%endif
BuildRequires: readline-devel
Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
@@ -37,11 +49,15 @@ Requires: kdelibs4-devel
%prep
%setup -q
+%patch1 -p1 -b .opengl_optional
+
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+ %{!?opengl:-DSHOULD_BUILD_OPENGL:BOOL=OFF} \
+ ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -73,6 +89,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%changelog
+* Wed Mar 06 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.1-2
+- disable opengl (plotter3d) support on arm
+
* Sat Mar 02 2013 Rex Dieter <rdieter at fedoraproject.org> - 4.10.1-1
- 4.10.1
More information about the scm-commits
mailing list