Merge lp:~vicamo/qtmir/build-qtmir-android-arm64 into lp:qtmir

[Vicamo Yang]

Build qtmir-android on arm64 for the need of valid libqpa-mirserver.so for ubuntu phone xenial arm64 porting.

Build qtmir-android on arm64 for the need of valid libqpa-mirserver.so for ubuntu phone xenial arm64 porting.

[Gerry Boland (gerboland)]

Yep, good catch, thank you Vicamo!

review: Approve

[Vicamo Yang (vicamo)]

Hi, any thing I should do here?

[Timo Jyrinki (timo-jyrinki)]

I'm getting during build's tests:

10/13 Test #1: convert-to-gles ..................***Failed 0.38 sec
+ dpkg-parsechangelog --show-field Source
+ [ qtmir = qtmir ]
+ QUILT_EXIT=0
+ export QUILT_PATCHES=debian/gles-patches
+ quilt push -a
Applying patch debian/gles-patches/convert-to-gles.patch
patching file debian/control
Hunk #2 succeeded at 17 with fuzz 1 (offset 1 line).
Hunk #3 succeeded at 38 (offset 1 line).
Hunk #4 succeeded at 52 (offset 1 line).
Hunk #5 succeeded at 63 (offset 1 line).
patching file debian/rules
Hunk #1 FAILED at 3.
1 out of 1 hunk FAILED -- rejects in file debian/rules
Patch debian/gles-patches/convert-to-gles.patch does not apply (enforce with -f)

So this would probably need adjusting of the convert-to-gles.patch too.

[Michał Sawicz (saviq)]

You need to apply this:

https://paste.ubuntu.com/23110948/

[lp:~vicamo/qtmir/build-qtmir-android-arm64]

550. By Vicamo Yang on 2016-08-30

Build qtmir-android on arm64.

[Michał Sawicz (saviq)]

Thanks!

review: Approve

=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-07-25 19:15:58 +0000
+++ debian/gles-patches/convert-to-gles.patch	2016-08-30 09:45:22 +0000
@@ -128,7 +128,7 @@
 -
 -# We only want to build qtmir-android on arches using Qt built with OpenGL ES2.0
 -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
--gles2_architectures = armhf
+-gles2_architectures = armhf arm64
 -
 -USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))
  

=== modified file 'debian/rules'
--- debian/rules	2016-02-17 13:27:50 +0000
+++ debian/rules	2016-08-30 09:45:22 +0000
@@ -12,7 +12,7 @@
 
 # We only want to build qtmir-android on arches using Qt built with OpenGL ES2.0
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-gles2_architectures = armhf
+gles2_architectures = armhf arm64
 
 USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))