[opencv] 01/02: d/rules: drop conditional enabling of OpenGL, it can't be enabled with GTK+3 anyway
Mattia Rizzolo
mattia at debian.org
Mon Jul 31 09:56:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository opencv.
commit 5d182cdfe6077aa65794ebe730cf015c38c7c0c2
Author: Mattia Rizzolo <mattia at debian.org>
Date: Mon Jul 31 10:50:06 2017 +0200
d/rules: drop conditional enabling of OpenGL, it can't be enabled with GTK+3 anyway
Closes: #869975
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
debian/rules | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/debian/rules b/debian/rules
index 4e05e24..54d3df7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,16 +28,6 @@ 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
--
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