[vtk6] 01/03: Use Qt4 on armel armhf instead of Qt5. (Closes: #763763)

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository vtk6.

commit 463aa5a9c43882704fd33a8d7810e2f20ceef37d
Author: Anton Gladky <gladk at debian.org>
Date:   Thu Oct 2 22:13:52 2014 +0200

    Use Qt4 on armel armhf instead of Qt5. (Closes: #763763)
    
    It is the simliar problem with Qt5 like it was with the
    ovito-package. Qt5 is built with a flag "-opengl es2" which
    causes problems. See [1] for details.
    
    [1] https://lists.debian.org/debian-qt-kde/2014/05/msg00302.html
---
 debian/control | 11 +++++++----
 debian/rules   |  8 +++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index af0d124..1cb9cf4 100644
--- a/debian/control
+++ b/debian/control
@@ -38,10 +38,13 @@ Build-Depends:
  libosmesa6-dev,
  libpng-dev,
  libpq-dev,
- qtbase5-dev,
- libqt5webkit5-dev,
- libqt5opengl5-dev,
- qttools5-private-dev,
+ qtbase5-dev [!armel !armhf],
+ libqt5webkit5-dev [!armel !armhf],
+ libqt5opengl5-dev [!armel !armhf],
+ qttools5-private-dev [!armel !armhf],
+ libqt4-dev [armel armhf],
+ libqt4-opengl-dev [armel armhf],
+ libqtwebkit-dev [armel armhf],
  libsqlite3-dev,
  libswscale-dev,
  libtheora-dev,
diff --git a/debian/rules b/debian/rules
index d84ab44..8785fcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ extra_flags +=  \
 	-DVTK_Group_Qt=ON \
 	-DVTK_Group_Tk=ON \
 	-DVTK_Group_Views=ON \
-	-DVTK_QT_VERSION=5 \
 	-DVTK_BUILD_ALL_MODULES=ON \
 	-DMPI_CXX_INCLUDE_PATH="/usr/include/mpi" \
 	-DVTK_INSTALL_LIBRARY_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
@@ -46,8 +45,11 @@ extra_flags +=  \
 	-DCMAKE_BUILD_TYPE=None \
 	-DVTK_USE_GCC_VISIBILITY=ON \
 
-#	-DModule_vtkmrmpi=ON \
-
+qt4_archs = armel armhf
+ifeq (,$(filter $(DEB_HOST_ARCH),$(qt4_archs)))
+	extra_flags += -DVTK_QT_VERSION=5
+else
+	extra_flags += -DVTK_QT_VERSION=4
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)

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