Merge pull request #3115 from MirServer/add-extra-depends

Packaging: Add new -dev dependencies to the relevant packages
canonical · Nov 9, 2023 · 5b5e9a9 · 5b5e9a9
2 parents 11aa635 + cb7df47
commit 5b5e9a9
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 2 deletions.
diff --git a/debian/control b/debian/control
@@ -128,6 +128,7 @@ Depends: libmirplatform27 (= ${binary:Version}),
          libmircommon-dev (= ${binary:Version}),
          libboost-program-options-dev,
          ${misc:Depends},
+         libgbm-dev,
 Breaks: libmirplatform (<< 0.6)
 Replaces: libmirplatform (<< 0.6)
 Description: Display server for Ubuntu - development headers
@@ -596,7 +597,8 @@ Pre-Depends: ${misc:Pre-Depends}
 Depends: libmirwayland4 (= ${binary:Version}),
          libmircore-dev (= ${binary:Version}),
          ${misc:Depends},
-         libmirwayland-bin (= ${binary:Version})
+         libmirwayland-bin (= ${binary:Version}),
+         libwayland-dev,
 Description: Display server for Ubuntu - generated wrappers for Wayland
  protocol extensions.
  .

diff --git a/include/platform/mir/graphics/platform.h b/include/platform/mir/graphics/platform.h
@@ -25,7 +25,6 @@
 #include "mir/graphics/drm_formats.h"
 #include "mir/module_properties.h"
 #include "mir/module_deleter.h"
-#include "mir/udev/wrapper.h"
 #include "mir/renderer/sw/pixel_source.h"
 
 #include <EGL/egl.h>
@@ -49,6 +48,12 @@ namespace renderer::software
 class WriteMappableBuffer;
 }
 
+namespace udev
+{
+class Context;
+class Device;
+}
+
 /// Graphics subsystem. Mediates interaction between core system and
 /// the graphics environment.
 namespace graphics

diff --git a/src/platforms/renderer-generic-egl/platform_symbols.cpp b/src/platforms/renderer-generic-egl/platform_symbols.cpp
@@ -22,6 +22,7 @@
 #include "mir/module_deleter.h"
 #include "mir/assert_module_entry_point.h"
 #include "mir/libname.h"
+#include "mir/udev/wrapper.h"
 #include "mir/graphics/platform.h"
 #include "mir/graphics/egl_error.h"
 #include "mir/graphics/gl_config.h"

diff --git a/src/platforms/virtual/graphics.cpp b/src/platforms/virtual/graphics.cpp
@@ -22,6 +22,7 @@
 #include <mir/assert_module_entry_point.h>
 #include <mir/libname.h>
 #include <mir/options/program_option.h>
+#include <mir/udev/wrapper.h>
 
 namespace mg = mir::graphics;
 namespace mo = mir::options;

diff --git a/src/platforms/wayland/platform_symbols.cpp b/src/platforms/wayland/platform_symbols.cpp
@@ -23,6 +23,7 @@
 #include <mir/assert_module_entry_point.h>
 #include <mir/libname.h>
 #include <mir/options/program_option.h>
+#include <mir/udev/wrapper.h>
 
 namespace mg = mir::graphics;
 namespace mo = mir::options;

diff --git a/src/platforms/x11/graphics/graphics.cpp b/src/platforms/x11/graphics/graphics.cpp
@@ -23,6 +23,7 @@
 #include "mir/module_deleter.h"
 #include "mir/assert_module_entry_point.h"
 #include "mir/libname.h"
+#include "mir/udev/wrapper.h"
 #include "mir/graphics/egl_error.h"
 #include "mir/graphics/egl_logger.h"
 

diff --git a/src/server/graphics/default_configuration.cpp b/src/server/graphics/default_configuration.cpp
@@ -37,6 +37,7 @@
 #include "mir/log.h"
 #include "mir/report_exception.h"
 #include "mir/main_loop.h"
+#include "mir/udev/wrapper.h"
 
 #include <boost/throw_exception.hpp>
 

diff --git a/src/server/graphics/platform_probe.cpp b/src/server/graphics/platform_probe.cpp
@@ -17,6 +17,7 @@
 #include "mir/log.h"
 #include "mir/graphics/platform.h"
 #include "mir/shared_library.h"
+#include "mir/udev/wrapper.h"
 #include "platform_probe.h"
 
 #include <boost/throw_exception.hpp>

diff --git a/tests/mir_test_framework/platform_graphics_dummy.cpp b/tests/mir_test_framework/platform_graphics_dummy.cpp
@@ -17,6 +17,7 @@
 #include "mir/libname.h"
 #include "mir/graphics/platform.h"
 #include "mir/assert_module_entry_point.h"
+#include "mir/udev/wrapper.h"
 
 namespace mg = mir::graphics;
 

diff --git a/tests/mir_test_framework/platform_graphics_throw.cpp b/tests/mir_test_framework/platform_graphics_throw.cpp
@@ -20,6 +20,7 @@
 #include "mir/assert_module_entry_point.h"
 #include "mir/libname.h"
 #include "mir/options/program_option.h"
+#include "mir/udev/wrapper.h"
 
 #include <boost/throw_exception.hpp>
 #include <stdlib.h>

diff --git a/tests/platform_test_harness/graphics_platform_test_harness.cpp b/tests/platform_test_harness/graphics_platform_test_harness.cpp
@@ -27,6 +27,7 @@
 #include "mir/renderer/renderer.h"
 #include "mir/main_loop.h"
 #include "mir/renderer/gl/gl_surface.h"
+#include "mir/udev/wrapper.h"
 
 #include "../../src/include/platform/mir/graphics/pixel_format_utils.h"
 #include "mir/default_server_configuration.h"

diff --git a/tests/unit-tests/graphics/test_platform_prober.cpp b/tests/unit-tests/graphics/test_platform_prober.cpp
@@ -21,6 +21,7 @@
 #include "mir/graphics/platform.h"
 #include "src/server/graphics/platform_probe.h"
 #include "mir/options/program_option.h"
+#include "mir/udev/wrapper.h"
 
 #include "mir/raii.h"
 

diff --git a/tests/unit-tests/platforms/x11/test_platform.cpp b/tests/unit-tests/platforms/x11/test_platform.cpp
@@ -22,6 +22,7 @@
 #include "src/platforms/x11/graphics/platform.h"
 #include "src/platforms/x11/x11_resources.h"
 #include "src/server/report/null/display_report.h"
+#include "mir/udev/wrapper.h"
 
 #include "mir/test/doubles/mock_x11_resources.h"
 #include "mir/test/doubles/mock_x11.h"