isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 08:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Fix build without X11

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2354>
This commit is contained in:
Christian Rauch 2022-04-05 15:01:29 +02:00 committed by Bilal Elmoussaoui
parent a81b2a49ed
commit 9ba510646c
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cogl/cogl/cogl-driver.h
View File

@ -36,6 +36,7 @@
#include "cogl-framebuffer-private.h" #include "cogl-framebuffer-private.h"
#include "cogl-attribute-private.h" #include "cogl-attribute-private.h"
#include "cogl-sampler-cache-private.h" #include "cogl-sampler-cache-private.h"
#include "cogl-texture-private.h"
typedef struct _CoglDriverVtable CoglDriverVtable; typedef struct _CoglDriverVtable CoglDriverVtable;

2
cogl/cogl/cogl-fence.c
View File

@ -29,9 +29,9 @@
#include "cogl-config.h" #include "cogl-config.h"
#include "cogl-context-private.h"
#include "cogl-fence.h" #include "cogl-fence.h"
#include "cogl-fence-private.h" #include "cogl-fence-private.h"
#include "cogl-context-private.h"
#include "winsys/cogl-winsys-private.h" #include "winsys/cogl-winsys-private.h"
#define FENCE_CHECK_TIMEOUT 5000 /* microseconds */ #define FENCE_CHECK_TIMEOUT 5000 /* microseconds */

2
cogl/test-fixtures/test-utils.c
View File

@ -99,7 +99,7 @@ create_onscreen (CoglContext *cogl_context,
break; break;
#endif #endif
case COGL_WINSYS_ID_EGL_XLIB: case COGL_WINSYS_ID_EGL_XLIB:
#ifdef COGL_HAS_EGL_SUPPORT #ifdef COGL_HAS_EGL_PLATFORM_XLIB_SUPPORT
return COGL_ONSCREEN (cogl_onscreen_xlib_new (cogl_context, return COGL_ONSCREEN (cogl_onscreen_xlib_new (cogl_context,
width, height)); width, height));
#else #else

4
meson.build
View File

@ -135,6 +135,10 @@ if have_xwayland and not have_wayland
error('XWayland support requires Wayland support enabled') error('XWayland support requires Wayland support enabled')
endif endif
if not have_wayland and not have_x11
error('A Wayland/X11 backend must be enabled')
endif
if have_x11_client if have_x11_client
x11_dep = dependency('x11') x11_dep = dependency('x11')
xcomposite_dep = dependency('xcomposite', version: xcomposite_req) xcomposite_dep = dependency('xcomposite', version: xcomposite_req)