qtubuntu

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

inline-gles-quilt
Merge into trunk

Proposed by Robert Bruce Park on 2016-03-31

Status:	Merged
Approved by:	Michał Sawicz on 2016-04-20
Approved revision:	317
Merged at revision:	315
Proposed branch:	lp:~robru/qtubuntu/inline-gles-quilt
Merge into:	lp:qtubuntu
Diff against target:	200 lines (+169/-1) 4 files modified debian/bileto_convert_to_gles (+28/-0) debian/control (+2/-1) debian/gles-patches/convert-to-gles.patch (+138/-0) debian/gles-patches/series (+1/-0)
To merge this branch:	bzr merge lp:~robru/qtubuntu/inline-gles-quilt
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-04-01
Ubuntu Phablet Team		2016-03-31	Pending
Review via email: mp+290662@code.launchpad.net

Commit message

Inline GLES packaging using a quilt patch.

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

315. By Robert Bruce Park on 2016-03-31: Add quilt build-dep.

Revision history for this message

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

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

review: Approve (continuous-integration)

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

316. By Robert Bruce Park on 2016-03-31: Fix quilt dir name.

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

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

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

review: Approve (continuous-integration)

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

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

Revision history for this message

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

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

review: Approve (continuous-integration)

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

Robert Bruce Park

Ubuntu Phablet 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-04-01 23:20:41 +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/^qtubuntu /qtubuntu-gles /g' debian/changelog
++
++rm --recursive --force ./.pc/
 === modified file 'debian/control'
 --- debian/control	2015-12-07 13:52:12 +0000
 +++ debian/control	2016-04-01 23:20:41 +0000
@@ -17,11 +17,12 @@
                 libxrender-dev,
                 qt5-default,
                 qtbase5-private-dev,
++               quilt,
  # if you don't have have commit access to this branch but would like to upload
  # directly to Ubuntu, don't worry: your changes will be merged back into the
  # upstream branch
  Vcs-Bzr: lp:qtubuntu
--Standards-Version: 3.9.4
++Standards-Version: 3.9.6
  Section: libs
  Package: qtubuntu-android
 === 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-01 23:20:41 +0000
@@ -0,0 +1,138 @@
++Index: qtubuntu/debian/control
++===================================================================
++--- qtubuntu.orig/debian/control
+++++ qtubuntu/debian/control
++@@ -1,4 +1,4 @@
++-Source: qtubuntu
+++Source: qtubuntu-gles
++ Priority: optional
++ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
++ Build-Depends: debhelper (>= 9),
++@@ -11,12 +11,20 @@ Build-Depends: debhelper (>= 9),
++                libinput-dev,
++                libmirclient-dev (>= 0.13.0),
++                libmtdev-dev,
+++               libqt5gui5-gles,
+++               libqt5quick5-gles,
+++               libqt5quickparticles5-gles,
+++               libqt5quicktest5,
+++               libqt5quickwidgets5-gles,
+++               libqt5sensors5-dev,
++                libubuntu-application-api-dev (>= 2.9.0),
++                libudev-dev,
++                libxkbcommon-dev,
++                libxrender-dev,
++                qt5-default,
++-               qtbase5-private-dev,
+++               qtbase5-gles-dev,
+++               qtbase5-private-gles-dev,
+++               qtdeclarative5-dev,
++                quilt,
++ # if you don't have have commit access to this branch but would like to upload
++ # directly to Ubuntu, don't worry: your changes will be merged back into the
++@@ -26,7 +34,7 @@ Standards-Version: 3.9.6
++ Section: libs
++
++ Package: qtubuntu-android
++-Architecture: armhf
+++Architecture: amd64 i386
++ Multi-Arch: same
++ Conflicts: qtubuntu-desktop,
++ Replaces: qthybris (<< 0.37),
++@@ -39,41 +47,12 @@ Provides: qtubuntu,
++ Depends: ubuntu-application-api3-touch,
++          ${misc:Depends},
++          ${shlibs:Depends},
++-Description: Qt plugins for Ubuntu Platform API (mobile)
+++Description: Qt plugins for Ubuntu Platform API (mobile) - OpenGLES
++  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
++  QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
++  legacy QPA plugin based on the compatibility layers. It also provides Qt
++  bindings for Ubuntu Platform API features that are not exposed through the QPA
++  plugins.
++  .
++- This variant of the package is for Android-based phones and tablets.
++-
++-Package: qtubuntu-desktop
++-Architecture: any
++-Multi-Arch: same
++-Conflicts: qtubuntu-android,
++-Replaces: qtubuntu (<< 0.52),
++-          qtubuntu-android,
++-Breaks: qthybris (<< 0.37),
++-        unity8 (<< 7.85),
++-Provides: qtubuntu,
++-Depends: ubuntu-application-api3-desktop,
++-         ${misc:Depends},
++-         ${shlibs:Depends},
++-Description: Qt plugins for Ubuntu Platform API (desktop)
++- QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
++- QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a
++- legacy QPA plugin based on the compatibility layers. It also provides Qt
++- bindings for Ubuntu Platform API features that are not exposed through the QPA
++- plugins.
++- .
++- This variant of the package is for GNU-based desktops.
++-
++-Package: qthybris
++-Depends: qtubuntu-android,
++-         ${misc:Depends},
++-Architecture: any
++-Section: oldlibs
++-Description: transitional dummy package
++- This is a transitional dummy package for the qthybris -> qtubuntu
++- transition.
+++ This variant of the package is for Android-based phones and tablets (built
+++ against the OpenGLES variant of qtbase).
++Index: qtubuntu/debian/rules
++===================================================================
++--- qtubuntu.orig/debian/rules
+++++ qtubuntu/debian/rules
++@@ -4,47 +4,25 @@
++ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
++
++ ANDROID_DIR = build-android
++-DESKTOP_DIR = build-desktop
++ TMP1_DIR = $(CURDIR)/debian/tmp1
++-TMP2_DIR = $(CURDIR)/debian/tmp2
++-
++-# We only want to build qtubuntu-android on arches using Qt built with OpenGL ES2.0
++-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
++-gles2_architectures = armhf
++
++ %:
++ 	dh $@
++
++ override_dh_clean:
++-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
++ 	rm -rf $(TMP1_DIR)
++-endif
++-	rm -rf $(TMP2_DIR)
++ 	dh_clean
++
++ override_dh_auto_configure:
++-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
++ 	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
++-endif
++-	mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
++
++ override_dh_auto_build:
++-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
++ 	dh_auto_build -B$(ANDROID_DIR)
++-endif
++-	dh_auto_build -B$(DESKTOP_DIR)
++
++ override_dh_auto_install:
++ 	rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
++-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
++ 	mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
++ 	cd $(CURDIR)
++-endif
++-	mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
++-	cd $(CURDIR)
++
++ override_dh_install:
++-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
++ 	dh_install --sourcedir=$(TMP1_DIR) -pqtubuntu-android
++-endif
++-	dh_install --sourcedir=$(TMP2_DIR) -pqtubuntu-desktop
 === added file 'debian/gles-patches/series'
 --- debian/gles-patches/series	1970-01-01 00:00:00 +0000
 +++ debian/gles-patches/series	2016-04-01 23:20:41 +0000
@@ -0,0 +1,1 @@
++convert-to-gles.patch

qtubuntu

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

Commit message

Description of the change

Preview Diff

Subscribers