1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
Index: cross-build-support/debian/control
===================================================================
--- cross-build-support.orig/debian/control
+++ cross-build-support/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,11 +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,
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
@@ -25,7 +34,7 @@ Standards-Version: 3.9.6
Section: libs
Package: qtubuntu-android
-Architecture: arm64 armhf
+Architecture: amd64 i386
Multi-Arch: same
Conflicts: qtubuntu-desktop,
Replaces: qtubuntu (<< 0.52),
@@ -36,31 +45,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: 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.
+ This variant of the package is for Android-based phones and tablets (built
+ against the OpenGLES variant of qtbase).
Index: cross-build-support/debian/rules
===================================================================
--- cross-build-support.orig/debian/rules
+++ cross-build-support/debian/rules
@@ -5,60 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
export QT_SELECT=5
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)
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
-gles2_architectures = arm64 armhf
-
%:
dh $@
override_dh_clean:
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
- rm -rf $(TMP1_DIR) $(DESKTOP_DIR)
-endif
- rm -rf $(TMP2_DIR) $(ANDROID_DIR)
+ rm -rf $(TMP1_DIR) $(ANDROID_DIR)
dh_clean
override_dh_auto_configure:
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
mkdir -p $(ANDROID_DIR)
ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
cd $(ANDROID_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
else
dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
endif
-endif
- mkdir -p $(DESKTOP_DIR)
-ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
- cd $(DESKTOP_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
-else
- dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
-endif
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
-endif
- mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
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
|