diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2021-03-25 10:16:31 +0100 |
|---|---|---|
| committer | Povilas Kanapickas <povilas@radix.lt> | 2021-08-06 11:29:29 +0000 |
| commit | a4ab57cb748674823744a8ef5a0b416ee553efe8 (patch) | |
| tree | a09237eb3d75a48214dfb722175d9794027b9dd2 | |
| parent | 84897891e5e7eb44068cda22284dca70c6cfd1a2 (diff) | |
build: Add dependency on libxcvt
libxcvt is a library providing a standalone version of the X server
implementation of the VESA CVT standard timing modelines generator.
Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1142
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 10b64e535..e57ba723a 100644 --- a/configure.ac +++ b/configure.ac @@ -758,6 +758,7 @@ LIBUDEV="libudev >= 143" LIBSELINUX="libselinux >= 2.0.86" LIBDBUS="dbus-1 >= 1.0" LIBPIXMAN="pixman-1 >= 0.27.2" +LIBXCVT="libxcvt" dnl Pixman is always required, but we separate it out so we can link dnl specific modules against it @@ -765,7 +766,7 @@ PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN) REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau" dnl Core modules for most extensions, et al. -SDK_REQUIRED_MODULES="$XPROTO $RANDRPROTO $RENDERPROTO $XEXTPROTO $INPUTPROTO $KBPROTO $FONTSPROTO $LIBPIXMAN" +SDK_REQUIRED_MODULES="$XPROTO $RANDRPROTO $RENDERPROTO $XEXTPROTO $INPUTPROTO $KBPROTO $FONTSPROTO $LIBPIXMAN $LIBXCVT" # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc AC_SUBST(SDK_REQUIRED_MODULES) @@ -1758,11 +1759,14 @@ fi AC_MSG_RESULT([$XORG]) if test "x$XORG" = xyes; then + PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" - XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" + XORG_CFLAGS="$XORGSERVER_CFLAGS $LIBXCVT_CFLAGS -DHAVE_XORG_CONFIG_H" XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $XI_LIB $XKB_LIB" + XORG_SYS_LIBS="$XORG_SYS_LIBS $LIBXCVT_LIBS" dnl ================================================================== dnl symbol visibility @@ -2347,8 +2351,10 @@ if test "x$XWAYLAND" = xyes; then AC_SUBST(have_eglstream, "false") fi + PKG_CHECK_MODULES([LIBXCVT], $LIBXCVT) + XWAYLAND_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB" - XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS" + XWAYLAND_SYS_LIBS="$XWAYLANDMODULES_LIBS $GLX_SYS_LIBS $LIBXCVT_LIBS" AC_SUBST([XWAYLAND_LIBS]) AC_SUBST([XWAYLAND_SYS_LIBS]) diff --git a/meson.build b/meson.build index 24a3840e0..bdab9a9f3 100644 --- a/meson.build +++ b/meson.build @@ -192,6 +192,7 @@ if (host_machine.system() != 'darwin' and endif endif xorgsdkdir = join_paths(get_option('prefix'), get_option('includedir'), 'xorg') +libxcvt_dep = dependency('libxcvt', required: build_xorg) build_xwayland = false if (host_machine.system() != 'darwin' and @@ -208,6 +209,7 @@ if (host_machine.system() != 'darwin' and xwayland_dep = [ dependency('wayland-client', version: wayland_req, required: xwayland_required), dependency('wayland-protocols', version: wayland_protocols_req, required: xwayland_required), + dependency('libxcvt', required: xwayland_required), ] if build_glamor |