[opencv] 25/26: Added again OpenGL support test

Leopold Palomo-Avellaneda leo at alaxarxa.net
Thu Sep 7 12:48:19 UTC 2017


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

lepalom-guest pushed a commit to branch debian-robotics
in repository opencv.

commit 93c4aba4b1d3cb04427fd91993c620ea35ab24d7
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Thu Sep 7 13:13:07 2017 +0200

    Added again OpenGL support test
---
 debian/rules | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/debian/rules b/debian/rules
index 7da79b3..7516084 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,17 @@ 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
+else
+	CMAKE_ARCH_FLAGS += -DWITH_OPENGL=ON
+endif
+
 # For Java
 export JAVA_HOME=/usr/lib/jvm/default-java
 

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



More information about the debian-science-commits mailing list