[opencv] 03/11: Disable OPENGL in Ubuntu/armhf (from mapreri)

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch for-3.1.0
in repository opencv.

commit ed8c7c1bb5e0007319f7019b6c07e735b1eabf50
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Fri Jul 8 17:44:39 2016 +0200

    Disable OPENGL in Ubuntu/armhf (from mapreri)
---
 debian/rules | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index ca6a856..1649775 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,16 @@ else
 CMAKE_ARCH_FLAGS += -DWITH_1394=OFF -DWITH_V4L=OFF
 endif
 
+# No GL on armhf in Ubuntu
+ifeq ($(shell dpkg-vendor --is ubuntu && echo true),true)
+ifneq ($(DEB_HOST_ARCH),armhf)
+CMAKE_ARCH_FLAGS += -DWITH_OPENGL=ON
+else
+CMAKE_ARCH_FLAGS += -DWITH_OPENGL=OFF
+endif
+CMAKE_ARCH_FLAGS += -DWITH_OPENGL=ON
+endif
+
 # For Java
 export JAVA_HOME=/usr/lib/jvm/default-java
 
@@ -60,7 +70,6 @@ CMAKE_FLAGS = \
 	-DWITH_FFMPEG=ON	\
 	-DWITH_GSTREAMER=OFF	\
 	-DWITH_GTK=ON	\
-	-DWITH_OPENGL=ON	\
 	-DWITH_JASPER=ON	\
 	-DWITH_JPEG=ON	\
 	-DWITH_PNG=ON	\

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git