Unity System Compositor

Merge lp:unity-system-compositor/0.9 into lp:unity-system-compositor/ubuntu

  1. 0.9
  2. Merge into ubuntu
Proposed by Stephen M. Webb
Status: Needs review
Proposed branch: lp:unity-system-compositor/0.9
Merge into: lp:unity-system-compositor/ubuntu
Diff against target: 518 lines (+312/-24)
16 files modified
debian/changelog (+14/-0)
debian/control (+25/-10)
debian/source_unity-system-compositor.py (+16/-6)
debian/tests/control (+2/-0)
debian/tests/mir (+3/-0)
debian/unity-system-compositor-spinner.1 (+45/-0)
debian/unity-system-compositor-tests.install (+2/-0)
debian/unity-system-compositor.1 (+170/-0)
debian/unity-system-compositor.install (+1/-1)
debian/unity-system-compositor.manpages (+3/-0)
debian/watch (+2/-0)
src/com.canonical.Unity.conf (+0/-7)
tests/include/usc/test/mock_display.h (+5/-0)
tests/integration-tests/CMakeLists.txt (+3/-0)
tests/unit-tests/test_mir_input_configuration.cpp (+10/-0)
tests/unit-tests/test_session_switcher.cpp (+11/-0)
To merge this branch: bzr merge lp:unity-system-compositor/0.9
Reviewer Review Type Date Requested Status
Unity System Compositor Development Team Pending
Review via email: mp+322012@code.launchpad.net

Description of the change

release 0.9.2

To post a comment you must log in.

Unmerged revisions

317. By Stephen M. Webb

debian/changelog: update for 0.9.2

316. By Stephen M. Webb

added autopkgtest (DEP-8) support and some tests

315. By Stephen M. Webb

added manpages for binaries

314. By Stephen M. Webb

added the lightdm log files to the apport dump for error reporting

313. By Stephen M. Webb

fix assorted lintian warnings in Deb packaging

312. By Stephen M. Webb

src/com.canonical.Unity.conf: remove at_console policy stanza

311. By Alan Griffiths

Fix build against lp:mir (and Mir 0.26!).

310. By Stephen M. Webb

synch with lp:unity-systems-compositor/ubuntu

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2017-02-16 16:37:33 +0000
+++ debian/changelog 2017-04-05 15:09:16 +0000
@@ -1,3 +1,17 @@
1unity-system-compositor (0.9.2-0ubuntu1) UNRELEASED; urgency=medium
2
3 [ Alan Griffiths ]
4 * changes for Mir 0.26
5
6 [ Stephen M. Webb ]
7 * removed at_console stanza from D-Bus policy (lp: #1677743)
8 * fixed assorted lintian warnings in Deb package (lp: #1677734)
9 * added additional log files to apport dump (lp: #1676931)
10 * added manpages for binaries (lp: #1677721)
11 * added autopkgtest (DEP-8) support and some tests (lp: #1678202)
12
13 -- Stephen M. Webb <stephen.webb@canonical.com> Wed, 05 Apr 2017 10:52:04 -0400
14
1unity-system-compositor (0.9.1+17.04.20170216-0ubuntu1) zesty; urgency=medium15unity-system-compositor (0.9.1+17.04.20170216-0ubuntu1) zesty; urgency=medium
216
3 [ Alexandros Frantzis ]17 [ Alexandros Frantzis ]
418
=== modified file 'debian/control'
--- debian/control 2017-01-17 21:10:21 +0000
+++ debian/control 2017-04-05 15:09:16 +0000
@@ -13,30 +13,30 @@
13 libboost-system-dev,13 libboost-system-dev,
14 libdbus-1-dev,14 libdbus-1-dev,
15 libgdk-pixbuf2.0-dev,15 libgdk-pixbuf2.0-dev,
16 libgles2-mesa-dev,
16 libglib2.0-dev,17 libglib2.0-dev,
17 libgles2-mesa-dev,
18 libglm-dev,18 libglm-dev,
19 libmirclient-dev (>= 0.26.0),19 libmirclient-dev (>= 0.26.0),
20 libmirserver-dev (>= 0.26.0),20 libmirserver-dev (>= 0.26.0),
21 pkg-config,21 pkg-config,
22 python3,22 python3,
23 python3-pil:native,
23 python3-setuptools,24 python3-setuptools,
24 python3-pil:native,25Standards-Version: 3.9.8
25Standards-Version: 3.9.7
26Homepage: https://launchpad.net/unity-system-compositor26Homepage: https://launchpad.net/unity-system-compositor
27# if you don't have have commit access to this branch but would like to upload27# if you don't have have commit access to this branch but would like to upload
28# directly to Ubuntu, don't worry: your changes will be merged back into the28# directly to Ubuntu, don't worry: your changes will be merged back into the
29# upstream branch29# upstream branch
30Vcs-Bzr: lp:unity-system-compositor30Vcs-Bzr: https://bazaar.launchpad.net/+branch/unity-system-compositor/
3131
32Package: unity-system-compositor32Package: unity-system-compositor
33Architecture: any33Architecture: any
34Depends: ${misc:Depends},34Depends: ubuntu-wallpapers,
35 ${misc:Depends},
35 ${shlibs:Depends},36 ${shlibs:Depends},
36 ubuntu-wallpapers,
37Suggests: repowerd,37Suggests: repowerd,
38Description: System compositor for Ubuntu38Description: Mir System Compositor
39 System compositor used by the Mir display server in Ubuntu. If the Unity39 This is the system compositor using the Mir display server. If the Unity
40 System Compositor can't start, LightDM will fallback to plain Xorg display40 System Compositor can't start, LightDM will fallback to plain Xorg display
41 server.41 server.
4242
@@ -46,5 +46,20 @@
46 unity-system-compositor (>= ${source:Version}),46 unity-system-compositor (>= ${source:Version}),
47 ${misc:Depends},47 ${misc:Depends},
48 ${python3:Depends},48 ${python3:Depends},
49Description: Test package for Unity System Compositor49Description: Mir System Compositor autopilot integration tests
50 Autopilots tests for Unity System Compositor50 This is the system compositor using the Mir display server.
51 .
52 This package contains the Autopilots integration tests for the Unity System
53 Compositor.
54
55Package: unity-system-compositor-tests
56Architecture: any
57Depends: unity-system-compositor (>= ${source:Version}),
58 ${misc:Depends},
59 ${shlibs:Depends},
60Description: Mir System Compositor unit tests
61 This is the system compositor using the Mir display server.
62 .
63 General tests for Unity System Compositor targeted at autopkgtest runs when a
64 dependency has changed.
65
5166
=== modified file 'debian/source_unity-system-compositor.py'
--- debian/source_unity-system-compositor.py 2013-09-06 03:07:18 +0000
+++ debian/source_unity-system-compositor.py 2017-04-05 15:09:16 +0000
@@ -1,3 +1,6 @@
1#!/usr/bin/python3
2
3import os
1from apport.hookutils import *4from apport.hookutils import *
25
3def attach_graphic_card_pci_info(report, ui=None):6def attach_graphic_card_pci_info(report, ui=None):
@@ -26,10 +29,18 @@
2629
27def add_info(report, ui=None):30def add_info(report, ui=None):
28 attach_file_if_exists(report, '/var/log/boot.log', 'BootLog')31 attach_file_if_exists(report, '/var/log/boot.log', 'BootLog')
29 attach_root_command_outputs(report, { 'LightDMLog': 'cat /var/log/lightdm/lightdm.log',32
30 'LightDMLogOld': 'cat /var/log/lightdm/lightdm.log.old',33 display_manager_files = {}
31 'UnitySystemCompositorLog': 'cat /var/log/lightdm/unity-system-compositor.log',34 if os.path.lexists('/var/log/lightdm'):
32 'UnitySystemCompositorLogOld': 'cat /var/log/lightdm/unity-system-compositor.log.old' })35 display_manager_files['LightDMLog'] = \
36 'test -f /var/log/lightdm/lightdm.log && cat /var/log/lightdm/lightdm.log'
37 display_manager_files['LightDMLogOld'] = \
38 'test -f /var/log/lightdm/lightdm.log.1.gz && zcat /var/log/lightdm/lightdm.log.1.gz'
39 display_manager_files['USCLog'] = \
40 'test -f /var/log/lightdm/unity-system-compositor.log && cat /var/log/lightdm/unity-system-compositor.log'
41 display_manager_files['USCLogOld'] = \
42 'test -f /var/log/lightdm/unity-system-compositor.log.1.gz && zcat /var/log/lightdm/unity-system-compositor.log.1.gz'
43 attach_root_command_outputs(report, display_manager_files)
3344
34 report['version.libdrm'] = package_versions('libdrm2')45 report['version.libdrm'] = package_versions('libdrm2')
35 report['version.lightdm'] = package_versions('lightdm')46 report['version.lightdm'] = package_versions('lightdm')
@@ -45,7 +56,6 @@
45 if not add_info(report, None):56 if not add_info(report, None):
46 print("Unreportable")57 print("Unreportable")
47 sys.exit(1)58 sys.exit(1)
48 keys = report.keys()59 keys = sorted(report.keys())
49 keys.sort()
50 for key in keys:60 for key in keys:
51 print("[%s]\n%s\n" %(key, report[key]))61 print("[%s]\n%s\n" %(key, report[key]))
5262
=== added directory 'debian/tests'
=== added file 'debian/tests/control'
--- debian/tests/control 1970-01-01 00:00:00 +0000
+++ debian/tests/control 2017-04-05 15:09:16 +0000
@@ -0,0 +1,2 @@
1Tests: mir
2Depends: unity-system-compositor-tests
03
=== added file 'debian/tests/mir'
--- debian/tests/mir 1970-01-01 00:00:00 +0000
+++ debian/tests/mir 2017-04-05 15:09:16 +0000
@@ -0,0 +1,3 @@
1#!/bin/sh -e
2/usr/bin/usc_integration_tests
3exit 0
04
=== added file 'debian/unity-system-compositor-spinner.1'
--- debian/unity-system-compositor-spinner.1 1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor-spinner.1 2017-04-05 15:09:16 +0000
@@ -0,0 +1,45 @@
1.TH unity-system-compositor-spinner 1 "March 2017" unity-system-compositor-spinner "User Commands"
2
3.SH NAME
4unity-system-compositor-spinner \- animate the Ubuntu logo at boot
5
6.SH SYNOPSIS
7.B unity-system-compositor-spinner
8[
9.I <options>
10]
11
12.SH DESCRIPTION
13
14Animates the spinning Ubuntu logo. Provides a soothing and relaxing visual
15experience during the boot sequence of a Ubuntu device between initial kernel
16loading and the presentation of a greeter screen.
17
18.SH OPTIONS
19.TP
20.BI -b " opacity"
21Set the background opacity (0.0 \- 1.0).
22.TP
23.B -h
24Output a usage message and exit.
25.TP
26.BI -o " id"
27Force placement on output monitor
28.IR id .
29.TP
30.B -n
31Don't sync to vblank.
32.TP
33.BI -m " socket"
34Set Mir server socket.
35.TP
36.BI "-s " WIDTH x HEIGHT
37Force surface size to
38.I WIDTH
39x
40.I HEIGHT.
41.TP
42.B -q
43Quiet mode (no messages output).
44No surfaces are created.
45
046
=== added file 'debian/unity-system-compositor-tests.install'
--- debian/unity-system-compositor-tests.install 1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor-tests.install 2017-04-05 15:09:16 +0000
@@ -0,0 +1,2 @@
1usr/bin/usc_integration_tests
2usr/bin/usc_test_helper_wait_for_signal
03
=== added file 'debian/unity-system-compositor.1'
--- debian/unity-system-compositor.1 1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor.1 2017-04-05 15:09:16 +0000
@@ -0,0 +1,170 @@
1'\" t
2.TH unity-system-compositor 1 "March 2017" "unity-system-compositor" "User Commands"
3
4.SH NAME
5unity-system-compositor \- a systemwide compositing display manager built on Mir
6
7.SH SYNOPSIS
8.B unity-system-compositor [
9.B options
10.B ]
11
12.SH DESCRIPTION
13.B unity-system-compositor
14is the compositing display manager run on a single seat to provide a graphical
15environment in the Unity desktop envirionment.
16
17.SH OPTIONS
18.PP
19The following options are supported.
20.TP
21.BI --host-socket " path"
22Specifies the host socket path.
23.TP
24.BI "-f, --file" " path"
25Specifies the client socket path. The default is
26.IR $XDG_RUNTIME_DIR /mir_socket
27or /tmp/mir_socket.
28.TP
29.B --no-file
30Do not provide a socket filename for client connections.
31.TP
32.B --arw-file
33Makes socket filename globally readable and writable (equivalent to chmod a=rw).
34.TP
35.B -p, --prompt-file
36Provides a "..._trusted" filename for prompt helper connections.
37.TP
38.BI --platform-graphics-lib " path"
39Specifies the library to use for platform graphics support (default: autodetect).
40.TP
41.BI --platform-input-lib " filepath"
42Specifies the library to use for platform input support (default: input-stub.so).
43.TP
44.BI --platform-path " directory"
45Specifies the directory to look for platform libraries
46(default: /usr/lib/x86_64-linux-gnu/mir/server-platform).
47.TP
48.BI "-i, --enable-input" " bool"
49Enables input.
50.TP
51.BI --compositor-report " {log|lttng|off}"
52Specifies the compositor report log setting.
53.TP
54.BI --connector-report " {log|lttng|off}"
55Specifies the connector report log setting.
56.TP
57.BI --display-report " {log|lttng|off}"
58Specifies the display report log setting.
59.TP
60.BI --input-report " {log|lttng|off}"
61Specifies the input report log setting.
62.TP
63.BI --legacy-input-report " {log|off}"
64Specifies the legacy Input report log setting.
65.TP
66.BI --seat-report " {log|off}"
67Specifies the seat report log setting.
68.TP
69.BI --session-mediator-report " {log|lttng|off}"
70Specifies the session Mediator report log setting.
71.TP
72.BI --msg-processor-report " {log|lttng|off}"
73Specifies the message processor report log setting.
74.TP
75.BI --scene-report " {log|lttng|off}"
76Specifies the scene report log setting.
77.TP
78.BI --shared-library-prober-report " {log|lttng|off}"
79Specifies the shared library prober report log setting.
80.TP
81.BI --shell-report " {log|off}"
82Specifies the shell report log setting.
83.TP
84.BI --composite-delay " milliseconds"
85Tells the compositor how long to wait for new frames from clients before compositing.
86Higher values result in lower latency but risk causing frame skipping.
87A negative value indicates the value should be decided automatically.
88Default: decide automatically.
89.TP
90.BI --name " string"
91The name Mir uses when registering with the host as a nested server.
92.TP
93.BI --nested-passthrough " arg"
94Attempt to pass a client's graphics content directly to the host to avoid a
95composition pass as a nested server.
96.TP
97.B --enable-touchspots
98Enables the visualization of touchspots (e.g. for screencasting).
99.TP
100.BI --enable-key-repeat " arg"
101Enables server\-generated key repeat.
102.TP
103.B --on-fatal-error-except
104Throws an exception on "fatal error" conditions (e.g. drivers behaving in unexpected ways)
105instead of a dumping core.
106.TP
107.B --debug
108Enables extra development debugging. This is only interesting for people doing Mir server or client development.
109.TP
110.BI --x11-displays " WIDTHxHEIGHT"
111[mir-on-X specific] Sets the size of the "display" window.
112.TP
113.BI --from-dm-fd " fd"
114Passes the file descriptor for the read end of the pipe from display manager.
115.TP
116.BI --to-dm-fd " fd"
117Passes the file descriptor for the write end of the pipe to display manager.
118.TP
119.B --debug-without-dm
120Run without a display manager (only useful when debugging).
121.TP
122.BI --debug-active-session-name " arg"
123Expected connection when run without a display manager (only useful when
124debugging).
125.TP
126.BI --blacklist " arg"
127Indicates the video blacklist regex to use.
128.TP
129.B --version
130Outputs the version information and exits.
131.TP
132.BI --spinner " filepath"
133Sets the path of the spinner executable.
134.TP
135.BI --public-socket " bool"
136Makes the socket file publicly writable.
137.TP
138.BI --enable-hardware-cursor " arg"
139Enables the hardware cursor (disabled by default).
140.TP
141.BI --display-config " {clone|sidebyside|single}"
142Sets the display configuration.
143.TP
144.B -h, --help
145Outputs the usage message and exits.
146
147.SH ENVIRONMENT
148.PP
149The following environment variable can control the diagnostics reported.
150See the equivalent
151.IR xxx \-report
152option above.
153.PP
154.B Table 1: Component Report Environment Variables
155.TS
156tab(;);
157l ; l .
158Environment Variable ; Values
159=
160MIR_SERVER_CONNECTION_REPORT ; log,lttng
161MIR_SERVER_COMPOSITOR_REPORT ; log,lttng
162MIR_SERVER_DISPLAY_REPORT ; log,lttng
163MIR_SERVER_INPUT_REPORT ; log,lttng
164MIR_SERVER_LEGACY_INPUT_REPORT ; log
165MIR_SERVER_SEAT_REPORT ; log
166MIR_SERVER_MSG_PROCESSOR_REPORT ; log,lttng
167MIR_SERVER_SESSION_MEDIATOR_REPORT ; log,lttng
168MIR_SERVER_SCENE_REPORT ; log,lttng
169MIR_SERVER_SHARED_LIBRARY_PROBER_REPORT ; log,lttng
170.TE
0171
=== modified file 'debian/unity-system-compositor.install'
--- debian/unity-system-compositor.install 2016-05-24 13:56:28 +0000
+++ debian/unity-system-compositor.install 2017-04-05 15:09:16 +0000
@@ -3,7 +3,7 @@
3etc/dbus-1/system.d/com.canonical.Unity.conf3etc/dbus-1/system.d/com.canonical.Unity.conf
4usr/bin/unity-system-compositor-spinner4usr/bin/unity-system-compositor-spinner
5usr/sbin/unity-system-compositor5usr/sbin/unity-system-compositor
6usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
7usr/share/dbus-1/interfaces/com.canonical.Unity.Display.xml6usr/share/dbus-1/interfaces/com.canonical.Unity.Display.xml
8usr/share/dbus-1/interfaces/com.canonical.Unity.Input.xml7usr/share/dbus-1/interfaces/com.canonical.Unity.Input.xml
8usr/share/dbus-1/interfaces/com.canonical.Unity.PowerButton.xml
9usr/share/dbus-1/interfaces/com.canonical.Unity.UserActivity.xml9usr/share/dbus-1/interfaces/com.canonical.Unity.UserActivity.xml
1010
=== added file 'debian/unity-system-compositor.manpages'
--- debian/unity-system-compositor.manpages 1970-01-01 00:00:00 +0000
+++ debian/unity-system-compositor.manpages 2017-04-05 15:09:16 +0000
@@ -0,0 +1,3 @@
1debian/unity-system-compositor.1
2debian/unity-system-compositor-spinner.1
3
04
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2017-04-05 15:09:16 +0000
@@ -0,0 +1,2 @@
1version=3
2https://launchpad.net/unity-system-compositor/+download .*/unity-system-compositor[-_]([0-9.]+)\.tar\.xz
03
=== modified file 'src/com.canonical.Unity.conf'
--- src/com.canonical.Unity.conf 2016-05-24 13:56:28 +0000
+++ src/com.canonical.Unity.conf 2017-04-05 15:09:16 +0000
@@ -30,11 +30,4 @@
30 send_interface="org.freedesktop.DBus.Introspectable"/>30 send_interface="org.freedesktop.DBus.Introspectable"/>
31 </policy>31 </policy>
3232
33 <policy at_console="true">
34 <allow send_destination="com.canonical.Unity.Display"/>
35 <allow send_destination="com.canonical.Unity.Input"/>
36 <allow send_destination="com.canonical.Unity.PowerButton"/>
37 <allow send_destination="com.canonical.Unity.UserActivity"/>
38 </policy>
39
40</busconfig>33</busconfig>
4134
=== modified file 'tests/include/usc/test/mock_display.h'
--- tests/include/usc/test/mock_display.h 2016-11-09 18:13:05 +0000
+++ tests/include/usc/test/mock_display.h 2017-04-05 15:09:16 +0000
@@ -21,6 +21,7 @@
2121
22#include <mir/graphics/display.h>22#include <mir/graphics/display.h>
23#include <mir/graphics/virtual_output.h>23#include <mir/graphics/virtual_output.h>
24#include <mir/version.h>
24#include <gmock/gmock.h>25#include <gmock/gmock.h>
2526
26namespace usc27namespace usc
@@ -53,11 +54,15 @@
5354
54 void resume() override {};55 void resume() override {};
5556
57#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 27, 0)
56 std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(58 std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor(
57 std::shared_ptr<mir::graphics::CursorImage> const&) override59 std::shared_ptr<mir::graphics::CursorImage> const&) override
58 {60 {
59 return {};61 return {};
60 };62 };
63#else
64 std::shared_ptr<mir::graphics::Cursor> create_hardware_cursor() override { return {}; }
65#endif
6166
62 std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override67 std::unique_ptr<mir::graphics::VirtualOutput> create_virtual_output(int, int) override
63 { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }68 { return std::unique_ptr<mir::graphics::VirtualOutput>{}; }
6469
=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt 2016-04-18 14:58:36 +0000
+++ tests/integration-tests/CMakeLists.txt 2017-04-05 15:09:16 +0000
@@ -57,3 +57,6 @@
5757
58add_dependencies(usc_integration_tests GMock)58add_dependencies(usc_integration_tests GMock)
59add_dependencies(usc_integration_tests usc_test_helper_wait_for_signal)59add_dependencies(usc_integration_tests usc_test_helper_wait_for_signal)
60
61install(TARGETS usc_integration_tests usc_test_helper_wait_for_signal
62 RUNTIME DESTINATION bin)
6063
=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
--- tests/unit-tests/test_mir_input_configuration.cpp 2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_mir_input_configuration.cpp 2017-04-05 15:09:16 +0000
@@ -25,6 +25,11 @@
25#include "mir/input/mir_keyboard_config.h"25#include "mir/input/mir_keyboard_config.h"
26#include "mir/input/mir_pointer_config.h"26#include "mir/input/mir_pointer_config.h"
27#include "mir/input/mir_touchpad_config.h"27#include "mir/input/mir_touchpad_config.h"
28#include <mir/version.h>
29
30#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
31#include <mir/input/mir_touchscreen_config.h>
32#endif
2833
29#include <gtest/gtest.h>34#include <gtest/gtest.h>
30#include <gmock/gmock.h>35#include <gmock/gmock.h>
@@ -54,6 +59,11 @@
54 ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));59 ON_CALL(*this, capabilities()).WillByDefault(Return(this->caps));
55 }60 }
5661
62#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
63 mir::optional_value<MirTouchscreenConfig> touchscreen_configuration() const { return {}; }
64 void apply_touchscreen_configuration(MirTouchscreenConfig const&) {}
65#endif
66
57 mi::DeviceCapabilities caps;67 mi::DeviceCapabilities caps;
58};68};
5969
6070
=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp 2017-01-19 19:49:44 +0000
+++ tests/unit-tests/test_session_switcher.cpp 2017-04-05 15:09:16 +0000
@@ -20,6 +20,7 @@
20#include "src/spinner.h"20#include "src/spinner.h"
2121
22#include "mir/frontend/session.h"22#include "mir/frontend/session.h"
23#include <mir/version.h>
2324
24#include <gtest/gtest.h>25#include <gtest/gtest.h>
25#include <gmock/gmock.h>26#include <gmock/gmock.h>
@@ -105,6 +106,16 @@
105 {106 {
106 return {};107 return {};
107 }108 }
109#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
110 mir::graphics::BufferID create_buffer(mir::geometry::Size, MirPixelFormat) override
111 {
112 return {};
113 }
114 mir::graphics::BufferID create_buffer(mir::geometry::Size, uint32_t, uint32_t) override
115 {
116 return {};
117 }
118#endif
108 void destroy_buffer(mir::graphics::BufferID) override119 void destroy_buffer(mir::graphics::BufferID) override
109 {120 {
110 }121 }

Subscribers

People subscribed via source and target branches