← Back to branch summary

~dandrader/qtubuntu/content-hub-clipboard

« back to all changes in this revision

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

  • Committer: Bileto Bot
  • Author(s): Nick Dedekind
  • Date: 2016-06-14 08:33:37 UTC
  • mfrom: (310.2.3 cross-build-support)
  • Revision ID: ci-train-bot@canonical.com-20160614083337-1ub6y6bubbka4sqy
Support for cross building

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/gles-patches/convert-to-gles.patch
1
 
Index: arm64/debian/control
 
1
Index: cross-build-support/debian/control
2
2
===================================================================
3
 
--- arm64.orig/debian/control
4
 
+++ arm64/debian/control
 
3
--- cross-build-support.orig/debian/control
 
4
+++ cross-build-support/debian/control
5
5
@@ -1,4 +1,4 @@
6
6
-Source: qtubuntu
7
7
+Source: qtubuntu-gles
8
8
 Priority: optional
9
9
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10
10
 Build-Depends: debhelper (>= 9),
11
 
@@ -11,12 +11,20 @@ Build-Depends: debhelper (>= 9),
 
11
@@ -11,11 +11,20 @@ Build-Depends: debhelper (>= 9),
12
12
                libinput-dev,
13
13
                libmirclient-dev (>= 0.13.0),
14
14
                libmtdev-dev,
22
22
                libudev-dev,
23
23
                libxkbcommon-dev,
24
24
                libxrender-dev,
25
 
                qt5-default,
26
 
-               qtbase5-private-dev,
 
25
                qtbase5-private-dev,
27
26
+               qtbase5-gles-dev,
28
27
+               qtbase5-private-gles-dev,
29
28
+               qtdeclarative5-dev,
30
29
                quilt,
31
30
 # if you don't have have commit access to this branch but would like to upload
32
31
 # directly to Ubuntu, don't worry: your changes will be merged back into the
33
 
@@ -26,7 +34,7 @@ Standards-Version: 3.9.6
 
32
@@ -25,7 +34,7 @@ Standards-Version: 3.9.6
34
33
 Section: libs
35
34
 
36
35
 Package: qtubuntu-android
39
38
 Multi-Arch: same
40
39
 Conflicts: qtubuntu-desktop,
41
40
 Replaces: qtubuntu (<< 0.52),
42
 
@@ -37,31 +45,12 @@ Provides: qtubuntu,
 
41
@@ -36,31 +45,12 @@ Provides: qtubuntu,
43
42
 Depends: ubuntu-application-api3-touch,
44
43
          ${misc:Depends},
45
44
          ${shlibs:Depends},
74
73
- This variant of the package is for GNU-based desktops.
75
74
+ This variant of the package is for Android-based phones and tablets (built
76
75
+ against the OpenGLES variant of qtbase).
77
 
Index: arm64/debian/rules
 
76
Index: cross-build-support/debian/rules
78
77
===================================================================
79
 
--- arm64.orig/debian/rules
80
 
+++ arm64/debian/rules
81
 
@@ -4,47 +4,25 @@
82
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
78
--- cross-build-support.orig/debian/rules
 
79
+++ cross-build-support/debian/rules
 
80
@@ -5,60 +5,35 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
81
 export QT_SELECT=5
83
82
 
84
83
 ANDROID_DIR = build-android
85
84
-DESKTOP_DIR = build-desktop
86
85
 TMP1_DIR = $(CURDIR)/debian/tmp1
87
86
-TMP2_DIR = $(CURDIR)/debian/tmp2
88
 
-
 
87
 
89
88
-# We only want to build qtubuntu-android on arches using Qt built with OpenGL ES2.0
90
 
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
89
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
90
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
91
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
92
 
 
93
 export PKG_CONFIG_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig
 
94
 
91
95
-gles2_architectures = arm64 armhf
92
 
 
 
96
-
93
97
 %:
94
98
        dh $@
95
99
 
96
100
 override_dh_clean:
97
101
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
98
 
        rm -rf $(TMP1_DIR)
 
102
-       rm -rf $(TMP1_DIR) $(DESKTOP_DIR)
99
103
-endif
100
 
-       rm -rf $(TMP2_DIR)
 
104
-       rm -rf $(TMP2_DIR) $(ANDROID_DIR)
 
105
+       rm -rf $(TMP1_DIR) $(ANDROID_DIR)
101
106
        dh_clean
102
107
 
103
108
 override_dh_auto_configure:
104
109
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
105
 
        mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
106
 
-endif
107
 
-       mkdir -p $(DESKTOP_DIR) && dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
 
110
        mkdir -p $(ANDROID_DIR)
 
111
   ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
 
112
        cd $(ANDROID_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
 
113
   else
 
114
        dh_auto_configure -B$(ANDROID_DIR) -- "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
 
115
   endif
 
116
-endif
 
117
-       mkdir -p $(DESKTOP_DIR)
 
118
-ifneq "$(DEB_HOST_ARCH)" "$(DEB_BUILD_ARCH)"
 
119
-       cd $(DESKTOP_DIR) && qt5-qmake-$(DEB_HOST_MULTIARCH) "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
 
120
-else
 
121
-       dh_auto_configure -B$(DESKTOP_DIR) -- "QMAKE_CXXFLAGS=-DQTUBUNTU_USE_OPENGL" $(CURDIR)
 
122
-endif
108
123
 
109
124
 override_dh_auto_build:
110
125
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
116
131
        rm -f debian/*/usr/lib/*/qt5/examples/qtubuntu/qmlscene-ubuntu
117
132
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
118
133
        mkdir -p $(TMP1_DIR) && cd $(ANDROID_DIR) && INSTALL_ROOT=$(TMP1_DIR) make install
119
 
        cd $(CURDIR)
120
134
-endif
121
135
-       mkdir -p $(TMP2_DIR) && cd $(DESKTOP_DIR) && INSTALL_ROOT=$(TMP2_DIR) make install
122
 
-       cd $(CURDIR)
123
136
 
124
137
 override_dh_install:
125
138
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))