build: fix possible race/error for some backends

There is missing dependency on linux-dmabuf-unstable-v1-server-protocol.h
header file in backend-headless, backend-drm and backend-x11. That files
do not depend on that header, in fact. But by this moment they've had
that implicit dependency due to linux-dmabuf.h header.

With specific set of meson configure options the protocol header is not
generated at the right time, what causes build error in 100% cases using
small amount of building threads (from -j1 to -j8).

Signed-off-by: Ivan Nikolaenko <ivan.nikolaenko@unikie.com>
dev
Ivan Nikolaenko 2 years ago
parent 78933093a1
commit 0d3e438d08
  1. 1
      libweston/backend-drm/state-propose.c
  2. 1
      libweston/compositor.c
  3. 1
      libweston/linux-dmabuf.c
  4. 1
      libweston/linux-dmabuf.h

@ -41,6 +41,7 @@
#include "color.h" #include "color.h"
#include "linux-dmabuf.h" #include "linux-dmabuf.h"
#include "presentation-time-server-protocol.h" #include "presentation-time-server-protocol.h"
#include "linux-dmabuf-unstable-v1-server-protocol.h"
enum drm_output_propose_state_mode { enum drm_output_propose_state_mode {
DRM_OUTPUT_PROPOSE_STATE_MIXED, /**< mix renderer & planes */ DRM_OUTPUT_PROPOSE_STATE_MIXED, /**< mix renderer & planes */

@ -59,6 +59,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include <libweston/weston-log.h> #include <libweston/weston-log.h>
#include "linux-dmabuf.h" #include "linux-dmabuf.h"
#include "linux-dmabuf-unstable-v1-server-protocol.h"
#include "viewporter-server-protocol.h" #include "viewporter-server-protocol.h"
#include "presentation-time-server-protocol.h" #include "presentation-time-server-protocol.h"
#include "xdg-output-unstable-v1-server-protocol.h" #include "xdg-output-unstable-v1-server-protocol.h"

@ -35,6 +35,7 @@
#include <libweston/libweston.h> #include <libweston/libweston.h>
#include "linux-dmabuf.h" #include "linux-dmabuf.h"
#include "linux-dmabuf-unstable-v1-server-protocol.h"
#include "shared/os-compatibility.h" #include "shared/os-compatibility.h"
#include "libweston-internal.h" #include "libweston-internal.h"
#include "shared/weston-drm-fourcc.h" #include "shared/weston-drm-fourcc.h"

@ -27,7 +27,6 @@
#define WESTON_LINUX_DMABUF_H #define WESTON_LINUX_DMABUF_H
#include <stdint.h> #include <stdint.h>
#include "linux-dmabuf-unstable-v1-server-protocol.h"
#define MAX_DMABUF_PLANES 4 #define MAX_DMABUF_PLANES 4

Loading…
Cancel
Save