isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 16:10:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set the minimum required wayland-server version to 1.1.90

Browse Source 
Since the Wayland server support has been updated to use wl_shm_buffer
we need the latest git version of Wayland to build. Previously the
configure.ac file only had one define for the minimum version of both
the client-side and server-side support but as they are now different
this patch splits them out.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 75d62292fc268164f8a085225033abe17e59ba1c)
This commit is contained in:
Neil Roberts 2013-07-01 14:06:16 +01:00
parent 2d5a84fc35
commit c063896186
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -93,6 +93,7 @@ m4_define([xcomposite_req_version], [0.4])
m4_define([xrandr_req_version], [1.2]) m4_define([xrandr_req_version], [1.2])
m4_define([cairo_req_version], [1.10]) m4_define([cairo_req_version], [1.10])
m4_define([wayland_req_version], [1.0.0]) m4_define([wayland_req_version], [1.0.0])
m4_define([wayland_server_req_version], [1.1.90])
dnl These variables get copied into the generated README dnl These variables get copied into the generated README
AC_SUBST([GLIB_REQ_VERSION], [glib_req_version]) AC_SUBST([GLIB_REQ_VERSION], [glib_req_version])
@ -105,6 +106,7 @@ AC_SUBST([GTK_DOC_REQ_VERSION], [gtk_doc_req_version])
AC_SUBST([GI_REQ_VERSION], [gi_req_version]) AC_SUBST([GI_REQ_VERSION], [gi_req_version])
AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version]) AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version])
AC_SUBST([WAYLAND_REQ_VERSION], [wayland_req_version]) AC_SUBST([WAYLAND_REQ_VERSION], [wayland_req_version])
AC_SUBST([WAYLAND_SERVER_REQ_VERSION], [wayland_server_req_version])
# Save this value here, since automake will set cflags later and we # Save this value here, since automake will set cflags later and we
# want to know if the user specified custom cflags or not. # want to know if the user specified custom cflags or not.
@ -1089,8 +1091,8 @@ AS_IF([test "x$enable_wayland_egl_server" = "xyes"],
NEED_EGL=yes NEED_EGL=yes
PKG_CHECK_MODULES(WAYLAND_SERVER, PKG_CHECK_MODULES(WAYLAND_SERVER,
[wayland-server >= wayland_req_version]) [wayland-server >= wayland_server_req_version])
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-server >= wayland_req_version" COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES wayland-server >= wayland_server_req_version"
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT" COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT"
]) ])