[fawkes] disable openni on arm

rmattes rmattes at fedoraproject.org
Sun Sep 29 19:32:51 UTC 2013


commit fa659cfeac59ac9a5da9c8ea86f8414155ab502e
Author: Rich Mattes <richmattes at gmail.com>
Date:   Sun Sep 29 15:31:56 2013 -0400

    disable openni on arm

 fawkes.spec |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/fawkes.spec b/fawkes.spec
index 5cd5e08..47be042 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -61,8 +61,10 @@ Requires:       %{name}-core %{name}-firevision %{name}-firevision-tools %{name}
 Requires:       %{name}-plugin-amcl %{name}-plugin-bblogger %{name}-plugin-bbsync
 Requires:       %{name}-plugin-festival %{name}-plugin-flite
 Requires:       %{name}-plugin-joystick %{name}-plugin-luaagent
-Requires:       %{name}-plugin-map-lasergen %{name}-plugin-openni
-Requires:       %{name}-plugin-openni-data %{name}-plugin-rrd
+%ifnarch %arm
+Requires:       %{name}-plugin-openni-data %{name}-plugin-openni
+%endif
+Requires:       %{name}-plugin-map-lasergen %{name}-plugin-rrd
 Requires:       %{name}-plugin-rrdweb %{name}-plugin-roomba
 Requires:       %{name}-plugin-skiller %{name}-plugin-static-transforms
 Requires:       %{name}-plugin-tabletop-objects %{name}-plugin-ttmainloop
@@ -309,7 +311,7 @@ Group:          Applications/System
 %description    plugin-openni
 This package contains a Fawkes plugin integrates OpenNI and provides
 access to the framework.
-
+%ifnarch %{arm}
 %package        plugin-openni-data
 Summary:        Fawkes plugin for data acquisition using OpenNI
 Group:          Applications/System
@@ -346,7 +348,7 @@ This package contains a Fawkes plugin uses OpenNI to detect and track
 humans in front of a sensor like the Kinect.
 Note that this plugin requires the proprietary OpenNI tracking software
 or equivalent to be installed and working with OpenNI.
-
+%endif
 %package        plugin-pantilt
 Summary:        Fawkes plugin to control pan-tilt units
 Group:          Applications/System
@@ -463,7 +465,11 @@ functionality.
 %patch2 -p1 -b .lua-52
 
 %build
+%ifnarch %{arm}
 %define feature_flags HAVE_ROS=0 HAVE_OPENRAVE=0
+%else
+%define feature_flags HAVE_ROS=0 HAVE_OPENRAVE=0 HAVE_OPENNI=0
+%endif
 make uncolored-switch-buildtype-sysinstall
 make uncolored-all uncolored-gui %{?_smp_mflags} CFLAGS_EXT="%{optflags}" PREFIX=%{_prefix} \
      %{feature_flags}
@@ -717,6 +723,10 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/map-lasergen.so
 
+%ifarch %{arm}
+%files plugin-openni
+%{_libdir}/libfawkesopenni_client_utils.so.*
+%else
 %files plugin-openni
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/openni.so
@@ -739,6 +749,7 @@ rm -rf %{buildroot}
 %files plugin-openni-usertracker
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plugins/openni-usertracker.so
+%endif
 
 %files plugin-pantilt
 %defattr(-,root,root,-)


More information about the scm-commits mailing list