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

[Michał Sawicz]

Inline -gles packaging.

[lp:~unity-team/qtmir/inline-gles-surfaces]

482. By Michał Sawicz on 2016-04-06

Merge lp:~dandrader/qtmir/surfaceListModel

[Gerry Boland (gerboland)]

LGTM. I've marking approved. Let's try sticking in a silo, and test the GLES packages are ok

review: Approve

=== 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-06 18:14:36 +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-04-06 18:14:36 +0000
+++ debian/control	2016-04-06 18:14:36 +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-06 18:14:36 +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 <[e-mail]>
+@@ -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-15,
+-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-06 18:14:36 +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-06 18:14:36 +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-06 18:14:36 +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