[opencv] 02/07: Disable opengl when building in armhf (in Ubuntu only)

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository opencv.

commit cd855cef500e7967f5f6e425f78c940e353811cb
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Jun 26 15:16:25 2016 +0000

    Disable opengl when building in armhf (in Ubuntu only)
---
 debian/changelog |  1 +
 debian/rules     | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a533cb2..148bff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ opencv (2.4.9.1+dfsg-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Use HTTPS in Vcs-* fields.
+  * Disable opengl when building in armhf (in Ubuntu only)
 
  -- Mattia Rizzolo <mattia at debian.org>  Sun, 26 Jun 2016 15:12:33 +0000
 
diff --git a/debian/rules b/debian/rules
index 76e6b34..7f9c6d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,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
 
@@ -45,7 +55,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