[SCM] qtbase packaging branch, ubuntu+1, updated. ubuntu/5.5.1+dfsg-16ubuntu11-142-g57003e0

Timo Jyrinki timo at moszumanska.debian.org
Mon May 23 13:47:44 UTC 2016 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=38ac0a7

The following commit has been merged in the ubuntu+1 branch:
commit 38ac0a7fa7709fc9fbbff55cedcf613c570581d8
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon May 23 08:21:51 2016 +0000

    Add arm64 to gles archs.
---
 debian/changelog          |  6 ++++++
 debian/libqt5gui5.symbols | 44 ++++++++++++++++++++++----------------------
 debian/rules              |  2 +-
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce34141..67d47a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtbase-opensource-src (5.5.1+dfsg-17ubuntu2) UNRELEASED; urgency=medium
+
+  * Add arm64 to gles archs.
+
+ -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 23 May 2016 08:21:20 +0000
+
 qtbase-opensource-src (5.5.1+dfsg-17ubuntu1) yakkety; urgency=medium
 
   * Merge with Debian because qtchooser got autosynced from Debian and broke 
diff --git a/debian/libqt5gui5.symbols b/debian/libqt5gui5.symbols
index b11fd74..d3fc09e 100644
--- a/debian/libqt5gui5.symbols
+++ b/debian/libqt5gui5.symbols
@@ -2539,22 +2539,22 @@ libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
  (optional)_ZN20QOpenGLFunctions_3_1D0Ev at Base 5.2.0 2
  (optional)_ZN20QOpenGLFunctions_3_1D1Ev at Base 5.2.0 2
  (optional)_ZN20QOpenGLFunctions_3_1D2Ev at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES214versionProfileEv at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES214versionProfileEv at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2C1Ev at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2C1Ev at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2C2Ev at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2C2Ev at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2D0Ev at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2D0Ev at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2D1Ev at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2D1Ev at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZN20QOpenGLFunctions_ES2D2Ev at Base 5.2.0 3
- (arch=armhf armel)_ZN20QOpenGLFunctions_ES2D2Ev at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES214versionProfileEv at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES214versionProfileEv at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES219isContextCompatibleEP14QOpenGLContext at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES225initializeOpenGLFunctionsEv at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES2C1Ev at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES2C1Ev at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES2C2Ev at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES2C2Ev at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES2D0Ev at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES2D0Ev at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES2D1Ev at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES2D1Ev at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZN20QOpenGLFunctions_ES2D2Ev at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZN20QOpenGLFunctions_ES2D2Ev at Base 5.2.0 2
  _ZN20QOpenGLShaderProgram11qt_metacallEN11QMetaObject4CallEiPPv at Base 5.0.2
  _ZN20QOpenGLShaderProgram11qt_metacastEPKc at Base 5.0.2
  _ZN20QOpenGLShaderProgram12removeShaderEP13QOpenGLShader at Base 5.0.2
@@ -6654,8 +6654,8 @@ libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
  (optional)_ZTI20QOpenGLFunctions_2_1 at Base 5.2.0 2
  (optional)_ZTI20QOpenGLFunctions_3_0 at Base 5.2.0 2
  (optional)_ZTI20QOpenGLFunctions_3_1 at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZTI20QOpenGLFunctions_ES2 at Base 5.2.0 3
- (arch=armhf armel)_ZTI20QOpenGLFunctions_ES2 at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZTI20QOpenGLFunctions_ES2 at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZTI20QOpenGLFunctions_ES2 at Base 5.2.0 2
  _ZTI20QOpenGLShaderProgram at Base 5.0.2
  _ZTI20QPictureFormatPlugin at Base 5.0.2
  _ZTI20QPlatformIntegration at Base 5.0.2 1
@@ -6899,8 +6899,8 @@ libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
  (optional)_ZTS20QOpenGLFunctions_2_1 at Base 5.2.0 2
  (optional)_ZTS20QOpenGLFunctions_3_0 at Base 5.2.0 2
  (optional)_ZTS20QOpenGLFunctions_3_1 at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZTS20QOpenGLFunctions_ES2 at Base 5.2.0 3
- (arch=armhf armel)_ZTS20QOpenGLFunctions_ES2 at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZTS20QOpenGLFunctions_ES2 at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZTS20QOpenGLFunctions_ES2 at Base 5.2.0 2
  _ZTS20QOpenGLShaderProgram at Base 5.0.2
  _ZTS20QPictureFormatPlugin at Base 5.0.2
  _ZTS20QPlatformIntegration at Base 5.0.2 1
@@ -7142,8 +7142,8 @@ libQt5Gui.so.5 libqt5gui5 #MINVER# | libqt5gui5-gles #MINVER#
  (optional)_ZTV20QOpenGLFunctions_2_1 at Base 5.2.0 2
  (optional)_ZTV20QOpenGLFunctions_3_0 at Base 5.2.0 2
  (optional)_ZTV20QOpenGLFunctions_3_1 at Base 5.2.0 2
- (optional|arch=!armhf !armel)_ZTV20QOpenGLFunctions_ES2 at Base 5.2.0 3
- (arch=armhf armel)_ZTV20QOpenGLFunctions_ES2 at Base 5.2.0 2
+ (optional|arch=!armhf !armel !arm64)_ZTV20QOpenGLFunctions_ES2 at Base 5.2.0 3
+ (arch=armhf armel arm64)_ZTV20QOpenGLFunctions_ES2 at Base 5.2.0 2
  _ZTV20QOpenGLShaderProgram at Base 5.0.2
  _ZTV20QPictureFormatPlugin at Base 5.0.2
  _ZTV20QPlatformIntegration at Base 5.0.2 1
diff --git a/debian/rules b/debian/rules
index d2ac68c..0272d4f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(no_pch_architectures)))
 	extra_configure_opts += -no-pch
 endif
 
-gles2_architectures := armel armhf
+gles2_architectures := armel armhf arm64
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	extra_configure_opts += -opengl es2
 else

-- 
qtbase packaging

More information about the pkg-kde-commits mailing list