diff --git a/src/wayland/meta-drm-timeline.c b/src/common/meta-drm-timeline.c similarity index 99% rename from src/wayland/meta-drm-timeline.c rename to src/common/meta-drm-timeline.c index 6d86fd19f..c5ec1a2de 100644 --- a/src/wayland/meta-drm-timeline.c +++ b/src/common/meta-drm-timeline.c @@ -37,8 +37,8 @@ #include #endif +#include "common/meta-drm-timeline.h" #include "meta/util.h" -#include "wayland/meta-drm-timeline.h" enum { diff --git a/src/wayland/meta-drm-timeline.h b/src/common/meta-drm-timeline.h similarity index 100% rename from src/wayland/meta-drm-timeline.h rename to src/common/meta-drm-timeline.h diff --git a/src/meson.build b/src/meson.build index 0fe778442..f86f0ba34 100644 --- a/src/meson.build +++ b/src/meson.build @@ -585,8 +585,6 @@ if have_wayland 'core/meta-service-channel.h', 'wayland/meta-cursor-sprite-wayland.c', 'wayland/meta-cursor-sprite-wayland.h', - 'wayland/meta-drm-timeline.c', - 'wayland/meta-drm-timeline.h', 'wayland/meta-pointer-confinement-wayland.c', 'wayland/meta-pointer-confinement-wayland.h', 'wayland/meta-pointer-lock-wayland.c', @@ -894,6 +892,8 @@ if have_wayland or have_native_backend 'common/meta-cogl-drm-formats.h', 'common/meta-drm-format-helpers.c', 'common/meta-drm-format-helpers.h', + 'common/meta-drm-timeline.c', + 'common/meta-drm-timeline.h', ] endif diff --git a/src/wayland/meta-wayland-buffer.c b/src/wayland/meta-wayland-buffer.c index d21d4bef2..6f62aa2b4 100644 --- a/src/wayland/meta-wayland-buffer.c +++ b/src/wayland/meta-wayland-buffer.c @@ -58,8 +58,8 @@ #include "wayland/meta-wayland-private.h" #include "common/meta-cogl-drm-formats.h" #include "common/meta-drm-format-helpers.h" +#include "common/meta-drm-timeline.h" #include "compositor/meta-multi-texture-format-private.h" -#include "wayland/meta-drm-timeline.h" #include "wayland/meta-wayland-linux-drm-syncobj.h" #ifdef HAVE_NATIVE_BACKEND diff --git a/src/wayland/meta-wayland-linux-drm-syncobj.h b/src/wayland/meta-wayland-linux-drm-syncobj.h index cfe361b7c..dffad99c3 100644 --- a/src/wayland/meta-wayland-linux-drm-syncobj.h +++ b/src/wayland/meta-wayland-linux-drm-syncobj.h @@ -22,8 +22,8 @@ #include +#include "common/meta-drm-timeline.h" #include "wayland/meta-wayland-types.h" -#include "wayland/meta-drm-timeline.h" #include "linux-drm-syncobj-v1-server-protocol.h"