← Back to branch summary

~alan-griffiths/miral/debug

« back to all changes in this revision

Viewing changes to miral-qt/debian/gles-patches/convert-to-gles.patch

  • Committer: Gerry Boland
  • Date: 2016-06-01 22:06:51 UTC
  • mto: This revision was merged to the branch mainline in revision 178.
  • Revision ID: gerry.boland@canonical.com-20160601220651-ge508tffql4e7u7c
Import QtMir code into miral-qt subdirectory. Disabled by default, use -DMIRAL_ENABLE_QT=1 to build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
miral-qt/debian/gles-patches/convert-to-gles.patch
 
1
Index: inline-gles-quilt/debian/control
 
2
===================================================================
 
3
--- inline-gles-quilt.orig/debian/control
 
4
+++ inline-gles-quilt/debian/control
 
5
@@ -1,4 +1,4 @@
 
6
-Source: qtmir
 
7
+Source: qtmir-gles
 
8
 Section: libs
 
9
 Priority: optional
 
10
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 
11
@@ -16,7 +16,13 @@ Build-Depends: cmake,
 
12
                libmirserver-dev (>= 0.19.0),
 
13
                libmtdev-dev,
 
14
                libprocess-cpp-dev,
 
15
+               libqt5gui5-gles,
 
16
+               libqt5quick5-gles,
 
17
+               libqt5quickparticles5-gles,
 
18
+               libqt5quicktest5,
 
19
+               libqt5quickwidgets5-gles,
 
20
                libqt5sensors5-dev,
 
21
+               libqt5test5,
 
22
                libqtdbusmock1-dev (>= 0.2),
 
23
                libqtdbustest1-dev (>= 0.2),
 
24
                libubuntu-app-launch2-dev,
 
25
@@ -31,8 +37,8 @@ Build-Depends: cmake,
 
26
 # lttng-gen-ts needs python3, but doesn't depend on it itself: bug 1359147
 
27
                python3:any,
 
28
                qt5-default,
 
29
-               qtbase5-dev,
 
30
-               qtbase5-private-dev,
 
31
+               qtbase5-gles-dev,
 
32
+               qtbase5-private-gles-dev,
 
33
                qtdeclarative5-dev,
 
34
                qtdeclarative5-private-dev,
 
35
                quilt,
 
36
@@ -45,7 +51,7 @@ Vcs-Bzr: lp:qtmir
 
37
 Vcs-Browser: http://bazaar.launchpad.net/~mir-team/qtmir/trunk/files
 
38
 
 
39
 Package: qtmir-android
 
40
-Architecture: armhf
 
41
+Architecture: amd64 i386
 
42
 Multi-Arch: same
 
43
 Conflicts: libqtmir,
 
44
            qtmir-desktop,
 
45
@@ -56,65 +62,10 @@ Replaces: libqtmir,
 
46
 Provides: qtmir,
 
47
 Depends: ${misc:Depends},
 
48
          ${shlibs:Depends},
 
49
-Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile)
 
50
+Description: Qt platform abstraction (QPA) plugin for a Mir server (mobile) - OpenGLES
 
51
  QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
 
52
  It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
 
53
  a Mir server. It also exposes some internal Mir functionality.
 
54
  .
 
55
- This variant of the package is for Android-based phones and tablets.
 
56
-
 
57
-Package: qtmir-desktop
 
58
-Architecture: any
 
59
-Multi-Arch: same
 
60
-Conflicts: qtmir-android,
 
61
-           qtubuntu-android,
 
62
-Replaces: libqtmir,
 
63
-          qtmir-android,
 
64
-          qtubuntu-android,
 
65
-Provides: qtmir,
 
66
-Depends: ${misc:Depends},
 
67
-         ${shlibs:Depends},
 
68
-Description: Qt platform abstraction (QPA) plugin for a Mir server (desktop)
 
69
- QtMir is a set of Qt5 components to enable one to write a Mir server with Qt.
 
70
- It contains a QPA (Qt Platform Abstraction) plugin which creates and manages
 
71
- a Mir server. It also exposes some internal Mir functionality.
 
72
- .
 
73
- This variant of the package is for GNU-based desktops.
 
74
-
 
75
-Package: qtdeclarative5-qtmir-plugin
 
76
-Architecture: any
 
77
-Multi-Arch: same
 
78
-Pre-Depends: ${misc:Pre-Depends},
 
79
-Depends: qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
 
80
-         ${misc:Depends},
 
81
-         ${shlibs:Depends},
 
82
-Replaces: libqtmir,
 
83
-          libunity-mir1,
 
84
-Conflicts: libqtmir,
 
85
-           libunity-mir1,
 
86
-Provides: unity-application-impl,
 
87
-          unity-application-impl-16,
 
88
-Description: Qt plugin for Unity specific Mir APIs
 
89
- QtMir provides Qt/QML bindings for Mir features that are exposed through the
 
90
- qtmir-desktop or qtmir-android QPA plugin such as Application management
 
91
- (start/stop/suspend/resume) and surface management.
 
92
-
 
93
-Package: qtmir-tests
 
94
-Architecture: any
 
95
-Multi-Arch: same
 
96
-Pre-Depends: ${misc:Pre-Depends},
 
97
-Depends: autopilot-qt5,
 
98
-         littler,
 
99
-         lttng-tools,
 
100
-         mir-test-tools,
 
101
-         python3-autopilot,
 
102
-         python3-babeltrace,
 
103
-         python3-evdev,
 
104
-         python3-mir-perf-framework,
 
105
-         qtdeclarative5-qtmir-plugin,
 
106
-         qtmir-desktop (= ${source:Version}) | qtmir-android (= ${source:Version}),
 
107
-         ${misc:Depends},
 
108
-         ${shlibs:Depends},
 
109
-Description: QtMir tests and demos
 
110
- This package provides benchmark tests and a simple shell and client using the
 
111
- QtMir QPA.
 
112
+ This variant of the package is for Android-based phones and tablets (built
 
113
+ against the OpenGLES variant of qtbase).
 
114
Index: inline-gles-quilt/debian/rules
 
115
===================================================================
 
116
--- inline-gles-quilt.orig/debian/rules
 
117
+++ inline-gles-quilt/debian/rules
 
118
@@ -3,60 +3,28 @@
 
119
 
 
120
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
121
 
 
122
-include /usr/share/dpkg/default.mk
 
123
-
 
124
 ANDROID_DIR = build-android
 
125
-DESKTOP_DIR = build-desktop
 
126
 TMP1_DIR = $(CURDIR)/debian/tmp1
 
127
-TMP2_DIR = $(CURDIR)/debian/tmp2
 
128
-
 
129
-# We only want to build qtmir-android on arches using Qt built with OpenGL ES2.0
 
130
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
131
-gles2_architectures = armhf
 
132
-
 
133
-USES_GLES2 = $(findstring $(DEB_HOST_ARCH), $(gles2_architectures))
 
134
 
 
135
 %:
 
136
        dh $@ --parallel --fail-missing
 
137
 
 
138
 override_dh_clean:
 
139
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 
140
        rm -rf $(TMP1_DIR)
 
141
-endif
 
142
-       rm -rf $(TMP2_DIR)
 
143
        dh_clean
 
144
 
 
145
 override_dh_auto_configure:
 
146
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 
147
        mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
 
148
-# See comment in CMakeLists.txt
 
149
-       mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGL_BUT_LINK_AGAINST_OPENGLES=1
 
150
-else
 
151
-       mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- $(FLAGS) $(CURDIR) -DUSE_OPENGLES=1
 
152
-endif
 
153
 
 
154
 override_dh_auto_build:
 
155
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 
156
        dh_auto_build -B$(ANDROID_DIR)
 
157
-endif
 
158
-       dh_auto_build -B$(DESKTOP_DIR)
 
159
 
 
160
 override_dh_auto_test:
 
161
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 
162
        dh_auto_test -B$(ANDROID_DIR)
 
163
-endif
 
164
-       dh_auto_test -B$(DESKTOP_DIR)
 
165
 
 
166
 override_dh_auto_install:
 
167
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 
168
        dh_auto_install -B$(ANDROID_DIR) --destdir=$(TMP1_DIR)
 
169
-endif
 
170
-       dh_auto_install -B$(DESKTOP_DIR) --destdir=$(TMP2_DIR)
 
171
 
 
172
 override_dh_install:
 
173
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
 
174
+       cat $(CURDIR)/debian/qtmir-tests.install $(CURDIR)/debian/qtdeclarative5-qtmir-plugin.install | xargs -I% sh -c "rm -rf $(TMP1_DIR)/%"
 
175
        dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
 
176
-endif
 
177
-       dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop
 
178
-       dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin
 
179
-       dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests