QtMir

Merge lp:~unity-team/qtmir/inline-gles-quilt into lp:qtmir

inline-gles-quilt
Merge into trunk

Proposed by Michał Sawicz on 2016-03-24

Status:	Rejected
Rejected by:	Michał Sawicz on 2016-04-06
Proposed branch:	lp:~unity-team/qtmir/inline-gles-quilt
Merge into:	lp:qtmir
Diff against target:	262 lines (+234/-0) 5 files modified debian/bileto_convert_to_gles (+13/-0) debian/gles-patches/convert-to-gles.patch (+203/-0) debian/gles-patches/series (+1/-0) tests/CMakeLists.txt (+6/-0) tests/convert-to-gles.sh (+11/-0)
To merge this branch:	bzr merge lp:~unity-team/qtmir/inline-gles-quilt
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Robert Bruce Park (community)		2016-03-24	Disapprove on 2016-03-31
Unity8 CI Bot	continuous-integration	2016-03-24	Needs Fixing on 2016-03-30
Gerry Boland	tentative	2016-03-24	Pending
Review via email: mp+290061@code.launchpad.net

This proposal supersedes a proposal from 2016-03-11.

Commit Message

Inline GLES packaging

Description of the Change

Experimenting with having GLES debian/ dir inlined in same trunk, and experimenting with train building gles package for you.

control.gles and rules.gles are copied verbatim from lp:qtmir/gles

=====

I've now employed quilt to do this, and added a test that runs in the non-gles tree.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:453
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robru/qtmir/inline-gles/+merge/288732/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:454
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robru/qtmir/inline-gles/+merge/288732/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-11: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-12: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Gerry Boland (gerboland) wrote on 2016-03-21: Posted in a previous version of this proposal

+sed --in-place 's/qtmir/qtmir-gles/g' debian/copyright debian/changelog
this will edit more than just the package names in the changelog. Example:

- * Depend on same-version qtmir-{desktop,android}
+ * Depend on same-version qtmir-gles-{desktop,android}

- * Migration of qtmir from the legacy Mir API
+ * Migration of qtmir-gles from the legacy Mir API

Could you make the sed replace a bit more strict, to prevent this?

I'm also a giant fan of explaining non-obvious things with a comment or readme - please add a readme to explain the purpose of the *.gles and bileto scripts.

Also, is editing "debian/copyright" necessary? Upstream name always being "qtmir" strikes me as more correct.

Looks fine to me otherwise.

review: Needs Fixing

Robert Bruce Park (robru) wrote on 2016-03-21: Posted in a previous version of this proposal

On Mon, Mar 21, 2016 at 7:55 AM, Gerry Boland
<email address hidden> wrote:
> Could you make the sed replace a bit more strict, to prevent this?

Can do.

> I'm also a giant fan of explaining non-obvious things with a comment or readme - please add a readme to explain the purpose of the *.gles and bileto scripts.

On it.

> Also, is editing "debian/copyright" necessary? Upstream name always being "qtmir" strikes me as more correct.

Well I wrote the script to minimize the diff against the existing
qtmir-gles package, eg, the existing qtmir-gles already defines
"Upstream-Name: qtmir-gles" in its debian/copyright.

Now that you mention it, since the field is called "Upstream" Name, it
does seem more correct to leave it as just qtmir, but that will
introduce a packaging diff when this code goes live.

--
robru

Robert Bruce Park (robru) wrote on 2016-03-21: Posted in a previous version of this proposal

Ok fixed sed, let me know if the comment is clear enough.

This is safe to merge as-is however the train implementation of this isn't in production yet so you have to keep maintaining lp:qtmir/gles for the time being.

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-21: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Gerry Boland (gerboland) wrote on 2016-03-24: Posted in a previous version of this proposal

Tentative approval. Approach is good.

Already the build dependencies here are out of date, so this will need refreshing at land-time.

Would be cool to auto-generate the control.gles file from the control file, as build-dep changes are something easily forgotten in the gles file. But this will as first step.

review: Approve (tentative)

Robert Bruce Park (robru) wrote on 2016-03-24: Posted in a previous version of this proposal

Yeah it's difficult for me to identify which differences are because lp:qtmir/gles is languishing and which are the necessary changes for gles to actually work.

I like saviq's idea to use a patch instead of duplicating the files but i don't have enough knowledge of gles to produce the correct patch. This branch currently is just "merge lp:qtmir/gles into here" and doesn't make any attempt at reducing the delta.

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

Drop vcs-bzr/vcs-browser, when this branch lands everything will be unified under qtmir.

Also the sed is wrong, needs a space after qtmir-gles (my fault though)

Why do you drop --fail-missing? High chance of building empty packages there.

review: Needs Fixing

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

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/qtmir/inline-gles-quilt updated on 2016-03-30

463. By Michał Sawicz on 2016-03-30: Fix sed line and drop gles-specific Vcs headers

Michał Sawicz (saviq) wrote on 2016-03-30:

> Why do you drop --fail-missing? High chance of building empty packages there.

Because we're still installing the whole thing and only packaging a small part of it. With --fail-missing dpkg will complain that we're not packaging all the installed files.

Michał Sawicz (saviq) wrote on 2016-03-30:

Oh and fixed the other bits, thanks!

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

Wouldn't it then be more correct to delete the unnecessary files and keep --fail-missing?

Dropping --fail-missing terrifies me, I've seen to many packages be built empty and nobody noticed until it's too late.

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

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

review: Needs Fixing (continuous-integration)

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

Hmmm, tried running this in the staging train, not sure what happened to quilt here:

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

+ su citrain-VwZ4uOHZ9KZ7SMLl6Fm6vGYN --command ./debian/bileto_convert_to_gles
+ QUILT_PATCHES=debian/gles-patches
+ quilt push -a
No series file found

I guess you need to export QUILT_PATCHES.

review: Needs Fixing

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

Also it's not entirely clear to me that your test makes sense, because if "quilt push -a" fails, that means bileto_convert_to_gles will fail before the package is even uploaded to the PPA, which means the packages won't build (even the nongles will be prevented from uploading to the PPA).

Unless you're intending that test to be run locally by devs before it goes into a silo.

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

Ok, I've started iterating on this in the ci train staging instance which has the new GLES magic live, see here:

https://code.launchpad.net/~robru/qtmir/inline-gles-quilt/+merge/290646

review: Disapprove

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mir development team

Unity Team

 === 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-03-30 22:58:26 +0000
@@ -0,0 +1,13 @@
++#!/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 -eux
++
++QUILT_PATCHES=debian/gles-patches
++quilt push -a
++
++sed --in-place 's/^qtmir /qtmir-gles /g' debian/changelog
 === 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-03-30 22:58:26 +0000
@@ -0,0 +1,203 @@
++Index: qtmir/debian/control
++===================================================================
++--- qtmir.orig/debian/control
+++++ qtmir/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,
++ Standards-Version: 3.9.5
++@@ -45,7 +51,7 @@ Vcs-Browser: http://bazaar.launchpad.net
++ Xs-Testsuite: autopkgtest
++
++ 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-13,
++-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: qtmir/debian/qtdeclarative5-qtmir-plugin.install
++===================================================================
++--- qtmir.orig/debian/qtdeclarative5-qtmir-plugin.install
+++++ /dev/null
++@@ -1,2 +0,0 @@
++-usr/lib/*/qt5/qml/*
++-usr/share/glib-2.0/schemas
++Index: qtmir/debian/qtmir-desktop.install
++===================================================================
++--- qtmir.orig/debian/qtmir-desktop.install
+++++ /dev/null
++@@ -1 +0,0 @@
++-usr/lib/*/qt5/plugins/platforms/*
++Index: qtmir/debian/qtmir-tests.install
++===================================================================
++--- qtmir.orig/debian/qtmir-tests.install
+++++ /dev/null
++@@ -1,6 +0,0 @@
++-usr/bin/qtmir-demo-client
++-usr/bin/qtmir-demo-shell
++-usr/share/applications/qtmir-demo-client.desktop
++-usr/share/qtmir/benchmarks/*
++-usr/share/qtmir/qtmir-demo-client/*
++-usr/share/qtmir/qtmir-demo-shell/
++Index: qtmir/debian/rules
++===================================================================
++--- qtmir.orig/debian/rules
+++++ qtmir/debian/rules
++@@ -3,60 +3,27 @@
++
++ 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
+++	dh $@ --parallel
++
++ 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))
++ 	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-03-30 22:58:26 +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-03-30 22:58:26 +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-03-30 22:58:26 +0000
@@ -0,0 +1,11 @@
++#!/bin/sh
++
++set -eux
++
++QUILT_EXIT=0
++QUILT_PATCHES=debian/gles-patches
++
++quilt push -a || QUILT_EXIT=$?
++quilt pop -a
++
++exit $QUILT_EXIT