extends:
- .use-x86_build-base
variables:
- MESA_IMAGE_TAG: &x86_build "2020-12-02"
+ MESA_IMAGE_TAG: &x86_build "2020-12-09"
.use-x86_build:
variables:
export XORGMACROS_VERSION=util-macros-1.19.0
export XCBPROTO_VERSION=xcb-proto-1.13
export LIBXCB_VERSION=libxcb-1.13
-export LIBWAYLAND_VERSION=wayland-1.17.0
+export LIBWAYLAND_VERSION=wayland-1.18.0
export WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.12
wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2
wl_scanner_arg = 'code'
endif
dep_wl_protocols = dependency('wayland-protocols', version : '>= 1.8')
- dep_wayland_client = dependency('wayland-client', version : '>=1.11')
- dep_wayland_server = dependency('wayland-server', version : '>=1.11')
+ dep_wayland_client = dependency('wayland-client', version : '>=1.18')
+ dep_wayland_server = dependency('wayland-server', version : '>=1.18')
if with_egl
dep_wayland_egl = dependency('wayland-egl-backend', version : '>= 3')
dep_wayland_egl_headers = dep_wayland_egl.partial_dependency(compile_args : true)
#include "wayland-drm-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h"
-/* cheesy workaround until wayland 1.18 is released */
-#if WAYLAND_VERSION_MAJOR > 1 || \
- (WAYLAND_VERSION_MAJOR == 1 && WAYLAND_VERSION_MINOR < 18)
-#define WL_SHM_FORMAT_ABGR16161616F 0x48344241
-#define WL_SHM_FORMAT_XBGR16161616F 0x48344258
-#endif
-
/*
* The index of entries in this table is used as a bitmask in
* dri2_dpy->formats, which tracks the formats supported by our server.