summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorFathi Boudra <fabo@debian.org>2011-06-10 10:18:51 +0300
committerFathi Boudra <fabo@debian.org>2011-06-10 10:18:51 +0300
commit290508beb1b09df83a1f9bcae2a9d9b71a21b332 (patch)
tree65b6e5b022d5403a79b59584d2e2352545a5a37a /debian
parent41ccba84d0982c33a7793ac8bc0269052a57eb21 (diff)
downloadqt4-x11-290508beb1b09df83a1f9bcae2a9d9b71a21b332.tar.gz
Build Qt with GL ES 2 on armel and armhf architectures.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/control5
-rwxr-xr-xdebian/rules9
3 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 56f0af6..36245f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qt4-x11 (4:4.7.3-2) UNRELEASED; urgency=low
* Add patch cherry-picked upstream:
- Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
+ * Build Qt with GL ES 2 on armel and armhf architectures:
+ - debian/control: add libgles2-mesa-dev | libgles2-dev build-dependencies.
+ - debian/rules: pass -opengl es2 configure option.
-- Fathi Boudra <fabo@debian.org> Fri, 10 Jun 2011 09:21:12 +0300
diff --git a/debian/control b/debian/control
index 07aaac5..15a4449 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,10 @@ Build-Depends: debhelper (>= 7.4.13), pkg-kde-tools (>= 0.6.4), flex,
freetds-dev, g++ (>= 4:4.5) [s390], g++-4.6 (>= 4.6.0-7~) [armel],
libasound2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
libaudio-dev, libcups2-dev, libdbus-1-dev, libfreetype6-dev,
- libgl1-mesa-dev | libgl-dev, libglib2.0-dev, libglu1-mesa-dev | libglu-dev,
+ libgl1-mesa-dev | libgl-dev [!armel !armhf],
+ libglib2.0-dev,
+ libglu1-mesa-dev | libglu-dev [!armel !armhf],
+ libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
libgstreamer0.10-dev, libgstreamer-plugins-base0.10-dev, libgtk2.0-dev,
libice-dev, unixodbc-dev, libjpeg-dev, libmng-dev, libmysqlclient-dev,
# libopenvg1-mesa-dev,
diff --git a/debian/rules b/debian/rules
index 986ac81..82cfe17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,13 @@ ifeq ($(DEB_HOST_ARCH),armhf)
extra_configure_opts += -arch armv6
endif
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armel armhf))
+ extra_configure_opts += -opengl es2
+else
+ extra_configure_opts += -opengl desktop
+ extra_configure_opts += -no-egl
+endif
+
ifeq ($(DEB_HOST_ARCH_OS),linux)
ifeq ($(DEB_HOST_ARCH),amd64)
platform_arg = linux-g++-64
@@ -125,8 +132,6 @@ endif
-gtkstyle \
-system-nas-sound \
-no-openvg \
- -opengl desktop \
- -no-egl \
-lfontconfig \
-I/usr/include/freetype2 \
-qvfb \