diff --git a/remoting/meson.build b/remoting/meson.build index 8b96f122..ed7ff479 100644 --- a/remoting/meson.build +++ b/remoting/meson.build @@ -10,7 +10,7 @@ if get_option('remoting') 'gstreamer-app-1.0', 'gstreamer-video-1.0', 'gobject-2.0', 'glib-2.0' ] - deps_remoting = [ dep_libweston_private ] + deps_remoting = [ dep_libweston_private, dep_libdrm_headers ] foreach depname : depnames dep = dependency(depname, required: false) if not dep.found() diff --git a/remoting/remoting-plugin.c b/remoting/remoting-plugin.c index c05977eb..8b82572a 100644 --- a/remoting/remoting-plugin.c +++ b/remoting/remoting-plugin.c @@ -36,12 +36,12 @@ #include #include #include -#include #include #include #include #include +#include #include "remoting-plugin.h" #include @@ -69,6 +69,8 @@ struct remoted_gstpipe { /* supported gbm format list */ struct remoted_output_support_gbm_format { + /* GBM_FORMAT_* tokens are strictly aliased with DRM_FORMAT_*, so we + * use the latter to avoid a dependency on GBM */ uint32_t gbm_format; const char *gst_format_string; GstVideoFormat gst_video_format; @@ -76,15 +78,15 @@ struct remoted_output_support_gbm_format { static const struct remoted_output_support_gbm_format supported_formats[] = { { - .gbm_format = GBM_FORMAT_XRGB8888, + .gbm_format = DRM_FORMAT_XRGB8888, .gst_format_string = "BGRx", .gst_video_format = GST_VIDEO_FORMAT_BGRx, }, { - .gbm_format = GBM_FORMAT_RGB565, + .gbm_format = DRM_FORMAT_RGB565, .gst_format_string = "RGB16", .gst_video_format = GST_VIDEO_FORMAT_RGB16, }, { - .gbm_format = GBM_FORMAT_XRGB2101010, + .gbm_format = DRM_FORMAT_XRGB2101010, .gst_format_string = "r210", .gst_video_format = GST_VIDEO_FORMAT_r210, }