Merge into trunk : inline-gles-quilt : Code : QtMir

Status:	Merged
Approved by:	Michał Sawicz on 2016-04-20
Approved revision:	481
Merged at revision:	476
Proposed branch:	lp:~robru/qtmir/inline-gles-quilt
Merge into:	lp:qtmir
Diff against target:	268 lines (+229/-0) 6 files modified debian/bileto_convert_to_gles (+28/-0) debian/control (+1/-0) debian/gles-patches/convert-to-gles.patch (+179/-0) debian/gles-patches/series (+1/-0) tests/CMakeLists.txt (+6/-0) tests/convert-to-gles.sh (+14/-0)
To merge this branch:	bzr merge lp:~robru/qtmir/inline-gles-quilt
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-04-02
Robert Bruce Park (community)			Approve on 2016-04-02
Michał Sawicz		2016-03-31	Pending
Review via email: mp+290646@code.launchpad.net

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-31:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/155/rebuild

review: Needs Fixing (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-03-31

465. By Robert Bruce Park on 2016-03-31: Refresh patch.

Robert Bruce Park (robru) wrote on 2016-03-31:

#

Ugh, the patch doesn't apply in the train:

https://ci-train.staging.ubuntu.com/job/ubuntu-landing-003-1-build/4/console

+ su citrain-TPamrRgmvbWXGVwyKn9VdCbM --command ./debian/bileto_convert_to_gles
+ export QUILT_PATCHES=debian/gles-patches
+ quilt push -a
Applying patch convert-to-gles.patch
patching file debian/control
Hunk #5 FAILED at 62.
1 out of 5 hunks FAILED -- rejects in file debian/control
patching file debian/qtdeclarative5-qtmir-plugin.install
patching file debian/qtmir-desktop.install
patching file debian/qtmir-tests.install
patching file debian/rules
Patch convert-to-gles.patch does not apply (enforce with -f)

Can't reproduce this locally. Not sure how to proceed.

review: Needs Fixing

Robert Bruce Park (robru) wrote on 2016-03-31:

#

Ah, trunk updated debian/control, that's why.

lp:~robru/qtmir/inline-gles-quilt updated on 2016-03-31

466. By Robert Bruce Park on 2016-03-31: Refresh patch again.
467. By Robert Bruce Park on 2016-03-31: Merge trunk.
468. By Robert Bruce Park on 2016-03-31: Refresh patch for real.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-31:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/156/rebuild

review: Needs Fixing (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-03-31

469. By Robert Bruce Park on 2016-03-31: Clean up after quilt.

Robert Bruce Park (robru) wrote on 2016-03-31:

#

Ok, this is beginning to approximate a sensible result:

https://ci-train.staging.ubuntu.com/job/ubuntu-landing-003-1-build/8/console

Note one MP built all four packages:

https://launchpad.net/~ci-train-staging-area/+archive/ubuntu/landing-003/

Of course the test is failing, excellent.

review: Needs Fixing

Robert Bruce Park (robru) wrote on 2016-03-31:

#

Saviq, if you could review this silo diff:

https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_363fe1b4bfe34b0295bc243be24dfbf1/bileto-1166/2016-03-31_19:34:29/vivid/qtmir-gles/packaging_changes.diff

Ignore the changelog noise, that's expected because we're clobbering the sync changelog with the source qtmir changelog, just confirm that the changes I'm seeing in debian/control and debian/rules are correct, as I don't know enough to say.

Vivid depwaits are ok, that's just because staging overlay PPA doesn't have the same contents as production overlay PPA.

lp:~robru/qtmir/inline-gles-quilt updated on 2016-03-31

470. By Robert Bruce Park on 2016-03-31: Add build-dep on quilt.
471. By Robert Bruce Park on 2016-03-31: Refresh patch again.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-31:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/157/rebuild

review: Needs Fixing (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-03-31

472. By Robert Bruce Park on 2016-03-31: Export QUILT_PATCHES.

Robert Bruce Park (robru) wrote on 2016-03-31:

#

I wonder if it might make more sense to just use a regular patch instead of quilt, quilt is a bit cumbersome.

Robert Bruce Park (robru) wrote on 2016-03-31:

#

Ok, builds succeeding in xenial! Yay!

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-31:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/158/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-31:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/159/rebuild

review: Approve (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-03-31

473. By Robert Bruce Park on 2016-03-31: Bring back --fail-missing.

Robert Bruce Park (robru) wrote on 2016-03-31:

#

The test fails in qtmir-gles because the patch is already applied -- quilt complains the patch can be reverse applied. Need to either check for that and consider it a success, or disable the test under -gles.

review: Needs Fixing

lp:~robru/qtmir/inline-gles-quilt updated on 2016-03-31

474. By Robert Bruce Park on 2016-03-31: Experiment: stop deleting .install files.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-31:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/160/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-01:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/161/rebuild

review: Approve (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-04-01

475. By Robert Bruce Park on 2016-04-01: Initial fix for -gles test.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-01:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/162/rebuild

review: Approve (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-04-01

476. By Robert Bruce Park on 2016-04-01: Documentation tweaks.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-01:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/167/rebuild

review: Approve (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-04-02

477. By Robert Bruce Park on 2016-04-02: Merge trunk.
478. By Robert Bruce Park on 2016-04-02: Skip tests in qtmir-gles.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-02:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/168/rebuild

review: Approve (continuous-integration)

Robert Bruce Park (robru) wrote on 2016-04-02:

#

Ok test should be skipped in -gles now.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-02:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/169/rebuild

review: Approve (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-04-02

479. By Robert Bruce Park on 2016-04-02: Delete unneeded files.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-02:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/170/rebuild

review: Approve (continuous-integration)

lp:~robru/qtmir/inline-gles-quilt updated on 2016-04-02

480. By Robert Bruce Park on 2016-04-02: Iterate on deleting unnecessary files.
481. By Robert Bruce Park on 2016-04-02: Iterate.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-02:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/171/rebuild

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-04-02:

#

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/172/rebuild

review: Approve (continuous-integration)

QtMir

Merge lp:~robru/qtmir/inline-gles-quilt into lp:qtmir

Commit Message

Description of the Change

Preview Diff

Subscribers

 === added file 'debian/bileto_convert_to_gles'
 --- debian/bileto_convert_to_gles	1970-01-01 00:00:00 +0000
 +++ debian/bileto_convert_to_gles	2016-04-02 03:34:50 +0000
@@ -0,0 +1,28 @@
++#!/bin/sh
++
++# This script converts the debian/ packaging into an alternate source package
++# which builds with GLES. You should copy the source tree into a new directory
++# before running this script (so you have one copy for GLES and one copy for
++# regular GL).
++
++set -eu
++
++# Steps to start a new quilt patch:
++#     quilt new convert-to-gles.patch
++#     quilt add debian/*
++#     # apply changes
++
++# Steps to refresh this quilt patch when nongles changes:
++#     quilt push -af
++#     # fix up
++
++# When finished, save quilt patch with:
++#     quilt refresh
++#     quilt pop -a
++
++export QUILT_PATCHES=debian/gles-patches
++quilt push -a
++
++sed --in-place 's/^qtmir /qtmir-gles /g' debian/changelog
++
++rm --recursive --force ./.pc/
 === modified file 'debian/control'
 --- debian/control	2016-03-30 13:52:38 +0000
 +++ debian/control	2016-04-02 03:34:50 +0000
@@ -35,6 +35,7 @@
                 qtbase5-private-dev,
                 qtdeclarative5-dev,
                 qtdeclarative5-private-dev,
++               quilt,
  Standards-Version: 3.9.5
  Homepage: https://launchpad.net/qtmir
  # if you don't have have commit access to this branch but would like to upload
 === added directory 'debian/gles-patches'
 === added file 'debian/gles-patches/convert-to-gles.patch'
 --- debian/gles-patches/convert-to-gles.patch	1970-01-01 00:00:00 +0000
 +++ debian/gles-patches/convert-to-gles.patch	2016-04-02 03:34:50 +0000
@@ -0,0 +1,179 @@
++Index: inline-gles-quilt/debian/control
++===================================================================
++--- inline-gles-quilt.orig/debian/control
+++++ inline-gles-quilt/debian/control
++@@ -1,4 +1,4 @@
++-Source: qtmir
+++Source: qtmir-gles
++ Section: libs
++ Priority: optional
++ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
++@@ -16,7 +16,13 @@ Build-Depends: cmake,
++                libmirserver-dev (>= 0.19.0),
++                libmtdev-dev,
++                libprocess-cpp-dev,
+++               libqt5gui5-gles,
+++               libqt5quick5-gles,
+++               libqt5quickparticles5-gles,
+++               libqt5quicktest5,
+++               libqt5quickwidgets5-gles,
++                libqt5sensors5-dev,
+++               libqt5test5,
++                libqtdbusmock1-dev (>= 0.2),
++                libqtdbustest1-dev (>= 0.2),
++                libubuntu-app-launch2-dev,
++@@ -31,8 +37,8 @@ Build-Depends: cmake,
++ # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
++                python3:any,
++                qt5-default,
++-               qtbase5-dev,
++-               qtbase5-private-dev,
+++               qtbase5-gles-dev,
+++               qtbase5-private-gles-dev,
++                qtdeclarative5-dev,
++                qtdeclarative5-private-dev,
++                quilt,
++@@ -45,7 +51,7 @@ Vcs-Bzr: lp:qtmir
++ Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/trunk/files
++
++ Package: qtmir-android
++-Architecture: armhf
+++Architecture: amd64 i386
++ Multi-Arch: same
++ Conflicts: libqtmir,
++            qtmir-desktop,
++@@ -56,65 +62,10 @@ Replaces: libqtmir,
++ Provides: qtmir,
++ Depends: ${misc:Depends},
++          ${shlibs:Depends},
++-Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile)
+++Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile) - OpenGLES
++  QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
++  It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
++  a Mir server. It also exposes some internal Mir functionality.
++  .
++- This variant of the package is for Android-based phones and tablets.
++-
++-Package: qtmir-desktop
++-Architecture: any
++-Multi-Arch: same
++-Conflicts: qtmir-android,
++-           qtubuntu-android,
++-Replaces: libqtmir,
++-          qtmir-android,
++-          qtubuntu-android,
++-Provides: qtmir,
++-Depends: ${misc:Depends},
++-         ${shlibs:Depends},
++-Description: Qt platform abstraction (QPA) plugin for a Mir server (desktop)
++- QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
++- It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
++- a Mir server. It also exposes some internal Mir functionality.
++- .
++- This variant of the package is for GNU-based desktops.
++-
++-Package: qtdeclarative5-qtmir-plugin
++-Architecture: any
++-Multi-Arch: same
++-Pre-Depends: ${misc:Pre-Depends},
++-Depends: qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
++-         ${misc:Depends},
++-         ${shlibs:Depends},
++-Replaces: libqtmir,
++-          libunity-mir1,
++-Conflicts: libqtmir,
++-           libunity-mir1,
++-Provides: unity-application-impl,
++-          unity-application-impl-14,
++-Description: Qt plugin for Unity specific Mir APIs
++- QtMir provides Qt/QML bindings for Mir features that are exposed through the
++- qtmir-desktop or qtmir-android QPA plugin such as Application management
++- (start/stop/suspend/resume) and surface management.
++-
++-Package: qtmir-tests
++-Architecture: any
++-Multi-Arch: same
++-Pre-Depends: ${misc:Pre-Depends},
++-Depends: autopilot-qt5,
++-         littler,
++-         lttng-tools,
++-         mir-test-tools,
++-         python3-autopilot,
++-         python3-babeltrace,
++-         python3-evdev,
++-         python3-mir-perf-framework,
++-         qtdeclarative5-qtmir-plugin,
++-         qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
++-         ${misc:Depends},
++-         ${shlibs:Depends},
++-Description: QtMir tests and demos
++- This package provides benchmark tests and a simple shell and client using the
++- QtMir QPA.
+++ This variant of the package is for Android-based phones and tablets (built
+++ against the OpenGLES variant of qtbase).
++Index: inline-gles-quilt/debian/rules
++===================================================================
++--- inline-gles-quilt.orig/debian/rules
+++++ inline-gles-quilt/debian/rules
++@@ -3,60 +3,28 @@
++
++ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
++
++-include /usr/share/dpkg/default.mk
++-
++ ANDROID_DIR = build-android
++-DESKTOP_DIR = build-desktop
++ TMP1_DIR = $(CURDIR)/debian/tmp1
++-TMP2_DIR = $(CURDIR)/debian/tmp2
++-
++-# 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
++-
++-USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))
++
++ %:
++ 	dh $@ --parallel --fail-missing
++
++ override_dh_clean:
++-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
++ 	rm -rf $(TMP1_DIR)
++-endif
++-	rm -rf $(TMP2_DIR)
++ 	dh_clean
++
++ override_dh_auto_configure:
++-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
++ 	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
++-# See comment in CMakeLists.txt
++-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
++-else
++-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
++-endif
++
++ override_dh_auto_build:
++-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
++ 	dh_auto_build -B$(ANDROID_DIR)
++-endif
++-	dh_auto_build -B$(DESKTOP_DIR)
++
++ override_dh_auto_test:
++-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
++ 	dh_auto_test -B$(ANDROID_DIR)
++-endif
++-	dh_auto_test -B$(DESKTOP_DIR)
++
++ override_dh_auto_install:
++-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
++ 	dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR)
++-endif
++-	dh_auto_install -B$(DESKTOP_DIR) --destdir=$(TMP2_DIR)
++
++ override_dh_install:
++-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
+++	cat $(CURDIR)/debian/qtmir-tests.install $(CURDIR)/debian/qtdeclarative5-qtmir-plugin.install | xargs -I% sh -c "rm -rf $(TMP1_DIR)/%"
++ 	dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
++-endif
++-	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop
++-	dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin
++-	dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests
 === added file 'debian/gles-patches/series'
 --- debian/gles-patches/series	1970-01-01 00:00:00 +0000
 +++ debian/gles-patches/series	2016-04-02 03:34:50 +0000
@@ -0,0 +1,1 @@
++convert-to-gles.patch
 === modified file 'tests/CMakeLists.txt'
 --- tests/CMakeLists.txt	2015-09-30 15:45:17 +0000
 +++ tests/CMakeLists.txt	2016-04-02 03:34:50 +0000
@@ -3,3 +3,9 @@
  add_subdirectory(framework)
  add_subdirectory(mirserver)
  add_subdirectory(modules)
++
++add_test(
++    NAME convert-to-gles
++    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/convert-to-gles.sh
++    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
++)
 === added file 'tests/convert-to-gles.sh'
 --- tests/convert-to-gles.sh	1970-01-01 00:00:00 +0000
 +++ tests/convert-to-gles.sh	2016-04-02 03:34:50 +0000
@@ -0,0 +1,14 @@
++#!/bin/sh
++
++set -eux
++
++# Skip this test inside qtmir-gles package as the patch is already applied.
++[ "$(dpkg-parsechangelog --show-field Source)" = "qtmir" ] || exit 0
++
++QUILT_EXIT=0
++export QUILT_PATCHES=debian/gles-patches
++
++quilt push -a || QUILT_EXIT=$?
++quilt pop -a
++
++exit $QUILT_EXIT