mainnika
/
weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5420 Commits
1 Branch
0 Tags
13 MiB
Tag: Branch: Tree: 36d699a164
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '36d699a164'
${ noResults }
weston/configure.ac

698 lines
27 KiB
Raw Normal View History Unescape

configure.ac: bump to version 1.10.0 for the official release
9 years ago
m4_define([weston_major_version], [1])
configure.ac: bump to version 1.11.0 for the official release
9 years ago
m4_define([weston_minor_version], [11])
configure.ac: bump version to 1.11.90 for open development As announced in 1.11.0 release notes, master is open again. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
m4_define([weston_micro_version], [90])
Install header files and pkg-config file for external modules This patch installs the three header files that define the compositor plugin interface as well as a pkg-config file. This allows building weston plugins outside the weston tree. We currently don't make any guarantees about the plugin API/ABI except that within a stable branch we won't break it.
12 years ago
m4_define([weston_version],
[weston_major_version.weston_minor_version.weston_micro_version])
libweston: use new versioning scheme Use the documented libweston-$major.so.0.$minor.$patch scheme. An (almost) identical one is used by GLIB, GDK{2,3}, QT5, json-glib and others. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years ago
m4_define([libweston_major_version], [0])
m4_define([libweston_minor_version], [0])
m4_define([libweston_patch_version], [0])
Install header files and pkg-config file for external modules This patch installs the three header files that define the compositor plugin interface as well as a pkg-config file. This allows building weston plugins outside the weston tree. We currently don't make any guarantees about the plugin API/ABI except that within a stable branch we won't break it.
12 years ago
Update autotools configuration Use new libtool syntax and cleaning the code a bit
14 years ago
AC_PREREQ([2.64])
configure: Change project to weston, set version to 0.89
13 years ago
AC_INIT([weston],
Install header files and pkg-config file for external modules This patch installs the three header files that define the compositor plugin interface as well as a pkg-config file. This allows building weston plugins outside the weston tree. We currently don't make any guarantees about the plugin API/ABI except that within a stable branch we won't break it.
12 years ago
[weston_version],
[https://bugs.freedesktop.org/enter_bug.cgi?product=Wayland&component=weston&version=weston_version],
configure: Change project to weston, set version to 0.89
13 years ago
[weston],
Very OCD cosmetic nitpick
10 years ago
[http://wayland.freedesktop.org])
Update autotools configuration Use new libtool syntax and cleaning the code a bit
14 years ago
build: Define wayland prereq version Establishes a single variable for defining the libwayland version requirements, where we have versioned checks. Enforces the same version dependency between libwayland-client and libwayland-server. Developers typically only test the greater version of the two, so if they're different it masks cases that don't get tested adequately. So this sets wayland-client's required version to 1.10, same as for the server. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
9 years ago
WAYLAND_PREREQ_VERSION="1.10.0"
Install header files and pkg-config file for external modules This patch installs the three header files that define the compositor plugin interface as well as a pkg-config file. This allows building weston plugins outside the weston tree. We currently don't make any guarantees about the plugin API/ABI except that within a stable branch we won't break it.
12 years ago
AC_SUBST([WESTON_VERSION_MAJOR], [weston_major_version])
AC_SUBST([WESTON_VERSION_MINOR], [weston_minor_version])
AC_SUBST([WESTON_VERSION_MICRO], [weston_micro_version])
AC_SUBST([WESTON_VERSION], [weston_version])
libweston: use new versioning scheme Use the documented libweston-$major.so.0.$minor.$patch scheme. An (almost) identical one is used by GLIB, GDK{2,3}, QT5, json-glib and others. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years ago
AC_SUBST([LIBWESTON_MAJOR], [libweston_major_version])
# We use minor as current and age since on ABI/API break/removal we bump major
# so minor will be reset to 0.
m4_define([lt_current], [libweston_minor_version])
m4_define([lt_revision], [libweston_patch_version])
m4_define([lt_age], [libweston_minor_version])
AC_SUBST([LT_VERSION_INFO], [lt_current:lt_revision:lt_age])
Install header files and pkg-config file for external modules This patch installs the three header files that define the compositor plugin interface as well as a pkg-config file. This allows building weston plugins outside the weston tree. We currently don't make any guarantees about the plugin API/ABI except that within a stable branch we won't break it.
12 years ago
build: Set a default aux dir This moves all the auxiliary build scripts into a build-aux directory, and fixes an issue with configure being unable to find scripts because it tries to change to an empty directory to get the absolute path, which results in getting the path to the user's home directory instead. ,-- checking whether build environment is sane... yes /bin/bash: /home/user/missing: No such file or directory configure: WARNING: 'missing' script is too old or missing `--- Signed-off-by: Guillem Jover <guillem@hadrons.org>
11 years ago
AC_CONFIG_AUX_DIR([build-aux])
Fall back to cairo image backend and shm surface if we don't have cairo gl
14 years ago
AC_CONFIG_HEADERS([config.h])
build: Silence libtoolize warnings When running the autogen.sh script, libtoolize complains thusly: libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am. Silence the warnings by following libtoolize's advice. Signed-off-by: Thierry Reding <treding@nvidia.com>
11 years ago
AC_CONFIG_MACRO_DIR([m4])
Update autotools configuration Use new libtool syntax and cleaning the code a bit
14 years ago
configure.ac: Enable AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS enables _XOPEN_SOURCE, _GNU_SOURCE and similar macros to expose the largest extent of functionality supported by the underlying system. This is required since these macros are often limiting rather than merely additive, e.g. _XOPEN_SOURCE will actually on some systems hide declarations which are not part of the X/Open spec. Since this goes into config.h rather than the command line, ensure all source is consistently including config.h before anything else, including system libraries. This doesn't need to be guarded by a HAVE_CONFIG_H ifdef, which was only ever a hangover from the X.Org modular transition. Signed-off-by: Daniel Stone <daniel@fooishbar.org> [pq: rebased and converted more files]
12 years ago
AC_USE_SYSTEM_EXTENSIONS
configure.ac: Add AC_SYS_LARGEFILE for mmap()ing dumb GEM buffers We're mmap()ing buffers with 64 bit offsets coming from the DRM_IOCTL_MODE_MAP_DUMB ioctl and need to make sure mmap accepts those.
11 years ago
AC_SYS_LARGEFILE
configure.ac: Enable AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS enables _XOPEN_SOURCE, _GNU_SOURCE and similar macros to expose the largest extent of functionality supported by the underlying system. This is required since these macros are often limiting rather than merely additive, e.g. _XOPEN_SOURCE will actually on some systems hide declarations which are not part of the X/Open spec. Since this goes into config.h rather than the command line, ensure all source is consistently including config.h before anything else, including system libraries. This doesn't need to be guarded by a HAVE_CONFIG_H ifdef, which was only ever a hangover from the X.Org modular transition. Signed-off-by: Daniel Stone <daniel@fooishbar.org> [pq: rebased and converted more files]
12 years ago
build: Use subdir-objects automake option This makes automake place the object files in the same subdir as the source file. For a recursive build system as we have now, there's no difference, but with a non-recursive build system it means that the object files don't all end up in the toplevel directory.
11 years ago
AM_INIT_AUTOMAKE([1.11 parallel-tests foreign no-dist-gzip dist-xz color-tests subdir-objects])
Update autotools configuration Use new libtool syntax and cleaning the code a bit
14 years ago
Use automake
14 years ago
AM_SILENT_RULES([yes])
Use autoconf instead of $(shell ...) in the Makefile.
16 years ago
Update autotools configuration Use new libtool syntax and cleaning the code a bit
14 years ago
# Check for programs
AC_PROG_CC
man: add man page for weston It is not complete, but has lots of stuff already. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
AC_PROG_SED
Update autotools configuration Use new libtool syntax and cleaning the code a bit
14 years ago
compositor: Support loadable shells The shell module is responsible for implementing the higher level compositor behavior. We default to the desktop-lite shell built in to the compositor.
14 years ago
# Initialize libtool
LT_PREREQ([2.2])
compositor: Split backends into modules
14 years ago
LT_INIT([disable-static])
compositor: Support loadable shells The shell module is responsible for implementing the higher level compositor behavior. We default to the desktop-lite shell built in to the compositor.
14 years ago
build: make default backend configurable Instead of hardcoding drm-backend.so as the default if environment presents neither Wayland nor X11, have a ./configure option to change it. It still defaults to drm-backend.so, if not given. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
AC_ARG_VAR([WESTON_NATIVE_BACKEND],
[Set the native backend to use, if Weston is not running under Wayland nor X11. @<:@default=drm-backend.so@:>@])
Make the default desktop shell client configurable The default can be set by passing WESTON_SHELL_CLIENT as an argument to configure, similarly to WESTON_NATIVE_BACKEND. Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
11 years ago
AC_ARG_VAR([WESTON_SHELL_CLIENT],
[Set the default desktop shell client to load if none is specified in weston.ini. @<:@default=weston-desktop-shell@:>@])
build: make default backend configurable Instead of hardcoding drm-backend.so as the default if environment presents neither Wayland nor X11, have a ./configure option to change it. It still defaults to drm-backend.so, if not given. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
Use autoconf instead of $(shell ...) in the Makefile.
16 years ago
PKG_PROG_PKG_CONFIG()
build: Add (and use) an AC_SEARCH_LIBS wrapper AC_SEARCH_LIBS is the recommended macro for these checks, unfortunately, we use AC_CHECK_LIB instead, and even AC_CHECK_FUNC, when only one AC_SEARCH_LIBS would be enough. This wrapper macro is used much like PKG_CHECK_MODULES, as it defines (and AC_SUBST) the PREFIX_LIBS variable itself. It also avoids adding unnecessary stuff to LIBS. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
WESTON_SEARCH_LIBS([DLOPEN], [dl], [dlopen])
compositor: Support loadable shells The shell module is responsible for implementing the higher level compositor behavior. We default to the desktop-lite shell built in to the compositor.
14 years ago
build: add check for clock_gettime() in librt zuctest is another clock_gettime() user that fails to link against librt when necessary. Instead of adding another -lrt LDADD entry i've opted for the saner way and converted the check to a configure test that will set CLOCK_GETTIME_LIBS appropiately and replaced all instances of -lrt with it. Built-tested against old and new glibc. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
# In old glibc versions (< 2.17) clock_gettime() is in librt
build: Add (and use) an AC_SEARCH_LIBS wrapper AC_SEARCH_LIBS is the recommended macro for these checks, unfortunately, we use AC_CHECK_LIB instead, and even AC_CHECK_FUNC, when only one AC_SEARCH_LIBS would be enough. This wrapper macro is used much like PKG_CHECK_MODULES, as it defines (and AC_SUBST) the PREFIX_LIBS variable itself. It also avoids adding unnecessary stuff to LIBS. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
WESTON_SEARCH_LIBS([CLOCK_GETTIME], [rt], [clock_gettime])
build: add check for clock_gettime() in librt zuctest is another clock_gettime() user that fails to link against librt when necessary. Instead of adding another -lrt LDADD entry i've opted for the saner way and converted the check to a configure test that will set CLOCK_GETTIME_LIBS appropiately and replaced all instances of -lrt with it. Built-tested against old and new glibc. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
build: Add declaration checks to check for required syscall flags The required flags are relatively new and some older enterprise distributions do not feature them. https://bugs.freedesktop.org/show_bug.cgi?id=63360
12 years ago
AC_CHECK_DECL(SFD_CLOEXEC,[],
[AC_MSG_ERROR("SFD_CLOEXEC is needed to compile weston")],
[[#include <sys/signalfd.h>]])
AC_CHECK_DECL(TFD_CLOEXEC,[],
[AC_MSG_ERROR("TFD_CLOEXEC is needed to compile weston")],
[[#include <sys/timerfd.h>]])
AC_CHECK_DECL(CLOCK_MONOTONIC,[],
[AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")],
[[#include <time.h>]])
compositor: check for execinfo.h Some systems may not have execinfo.h. Add a configure test for it, and if it is not found, make the backtrace() call a no-operation. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
13 years ago
AC_CHECK_HEADERS([execinfo.h])
os: use posix_fallocate in creating sharable buffers If posix_fallocate is available, use it instead of ftruncate. Unlike ftruncate, when posix_fallocate succeeds, it guarantees that you cannot run out of disk space, when later writing to the mmap()'ed file. With posix_fallocate, if os_create_anonymous_file() succeeds, the program cannot get a SIGBUS later from accessing this file via mmap. If there is insufficient disk space, the function fails and errno is set to ENOSPC. This is useful on systems, that limit the available buffer space by having XDG_RUNTIME_DIR on a small tmpfs. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
11 years ago
AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate])
Rewrite shm buffer file allocation v2 We had duplicated code in many places, using hardcoded paths for temporary files into more than one path. Some cases did not bother with O_CLOEXEC, and all hardcoded paths that might not exist. Add an OS helper function for creating a unique anonymous file with close-on-exec semantics. The helper uses $XDG_RUNTIME_DIR as the directory for a file. This patch unifies the buffer file creation in both Weston and the clients. As simple clients are better not linking to libshared, as it would require e.g. Cairo, they pull the OS compatibility code directly. Android does not have mkostemp(), so a configure test is added for it, and a fallback used if it is not available. Changes in v2: remove all the alternate possible directory definitions and use XDG_RUNTIME_DIR only, and fail is it is not set. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
13 years ago
build: Define wayland prereq version Establishes a single variable for defining the libwayland version requirements, where we have versioned checks. Enforces the same version dependency between libwayland-client and libwayland-server. Developers typically only test the greater version of the two, so if they're different it masks cases that don't get tested adequately. So this sets wayland-client's required version to 1.10, same as for the server. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
9 years ago
COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2"
Make EGL/GLESv2 dependencies optional Introduce --disable-egl switch for configure to disable EGL/GLESv2 support. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
12 years ago
Adding doxygen setup and info for the testing framework. Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
AC_CONFIG_FILES([doc/doxygen/tools.doxygen doc/doxygen/tooldev.doxygen])
AC_ARG_ENABLE(devdocs,
AS_HELP_STRING([--disable-devdocs],
[do not enable building of developer documentation]),,
enable_devdocs=auto)
if test "x$enable_devdocs" != "xno"; then
AC_CHECK_PROGS([DOXYGEN], [doxygen])
if test "x$DOXYGEN" = "x" -a "x$enable_devdocs" = "xyes"; then
AC_MSG_ERROR([Developer documentation explicitly requested, but Doxygen couldn't be found])
fi
if test "x$DOXYGEN" != "x"; then
enable_devdocs=yes
else
enable_devdocs=no
fi
fi
AM_CONDITIONAL(ENABLE_DEVDOCS, test "x$enable_devdocs" = "xyes")
configure.ac: Indent --disable-egl option correctly
12 years ago
AC_ARG_ENABLE(egl, [ --disable-egl],,
Make EGL/GLESv2 dependencies optional Introduce --disable-egl switch for configure to disable EGL/GLESv2 support. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
12 years ago
enable_egl=yes)
AM_CONDITIONAL(ENABLE_EGL, test x$enable_egl = xyes)
if test x$enable_egl = xyes; then
AC_DEFINE([ENABLE_EGL], [1], [Build Weston with EGL support])
configure: don't control egl version The required version only corresponds to version of mesa implementation. This mesa version requirement causes configure errors, when weston is configured for a different egl implementation than mesa. Because the version of the egl drivers are not alligned to the mesa version. Therefore, I deleted the version controlling for egl, so that weston can be configured for a different egl implementation. Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
PKG_CHECK_MODULES(EGL, [egl glesv2])
PKG_CHECK_MODULES([EGL_TESTS], [egl glesv2 wayland-client wayland-egl])
gl-renderer: add dmabuf import Import dmabuf as an EGLImage, and hold on to the EGLImage until we are signalled a content change. On content change, destroy the EGLImage and re-import to trigger GPU cache flushes. We hold on to the EGLImage as long as possible just in case the client does other imports that might later make re-importing fail. As dmabuf protocol uses drm_fourcc codes, we need libdrm for drm_fourcc.h. However, we are not doing any libdrm function calls, so there is no new need to link to libdrm. RFCv1 changes: - fix error if dmabuf exposed unsupported - always use GL_TEXTURE_EXTERNAL_OES with dmabuf v2 changes: - improve support check and error handling - hold on to the imported EGLImage to avoid the dmabuf becoming unimportable in the future - send internal errors with linux_dmabuf_buffer_send_server_error() - import EGL_EXT_image_dma_buf_import extension headers - use heuristics to decide between GL_TEXTURE_2D and GL_TEXTURE_EXTERNAL_OES - add comment about Mesa requirements - change y-invert from per-plane boolean to per-buffer flag Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
11 years ago
PKG_CHECK_MODULES([GL_RENDERER], [libdrm])
Make EGL/GLESv2 dependencies optional Introduce --disable-egl switch for configure to disable EGL/GLESv2 support. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
12 years ago
fi
clients: Make poppler-glib optional Just don't compile the view client.
14 years ago
build: Make libxkbcommon build-time optional in the compositor v2: Incorporate review feedback from Daniel Stone - improved configure message about the purpose of this option and reorganisation of #ifdefs.
12 years ago
AC_ARG_ENABLE(xkbcommon,
AS_HELP_STRING([--disable-xkbcommon], [Disable libxkbcommon
support: This is only useful in environments
where you do not have a hardware keyboard. If
libxkbcommon support is disabled clients will not
be sent a keymap and and must know how to
interpret the keycode sent for any key event.]),,
enable_xkbcommon=yes)
if test x$enable_xkbcommon = xyes; then
AC_DEFINE(ENABLE_XKBCOMMON, [1], [Build Weston with libxkbcommon support])
configure.ac: Require at least version 0.3.0 of xkbcommon https://bugs.freedesktop.org/show_bug.cgi?id=70870
11 years ago
COMPOSITOR_MODULES="$COMPOSITOR_MODULES xkbcommon >= 0.3.0"
build: Make libxkbcommon build-time optional in the compositor v2: Incorporate review feedback from Daniel Stone - improved configure message about the purpose of this option and reorganisation of #ifdefs.
12 years ago
fi
configure: Add --enable-setuid-install This adds support for installing the compositor setuid.
13 years ago
AC_ARG_ENABLE(setuid-install, [ --enable-setuid-install],,
enable_setuid_install=yes)
configure: Fix build on debian by avoiding bashisms in the test command.
13 years ago
AM_CONDITIONAL(ENABLE_SETUID_INSTALL, test x$enable_setuid_install = xyes)
configure: Add --enable-setuid-install This adds support for installing the compositor setuid.
13 years ago
xwayland: change library name Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
13 years ago
AC_ARG_ENABLE(xwayland, [ --enable-xwayland],,
enable_xwayland=yes)
configure.ac: Make xwayland tests depend on xwayland Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
12 years ago
AC_ARG_ENABLE(xwayland-test, [ --enable-xwayland-test],,
enable_xwayland_test=yes)
xwayland: change library name Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
13 years ago
AM_CONDITIONAL(ENABLE_XWAYLAND, test x$enable_xwayland = xyes)
configure.ac: Make xwayland tests depend on xwayland Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
12 years ago
AM_CONDITIONAL(ENABLE_XWAYLAND_TEST, test x$enable_xwayland = xyes -a x$enable_xwayland_test = xyes)
xwayland: change library name Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
13 years ago
if test x$enable_xwayland = xyes; then
xwm: Redirect root window subwindows xwayland no longer does this for us, we have to request it now
11 years ago
PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes xcb-composite xcursor cairo-xcb)
xwayland: change library name Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
13 years ago
AC_DEFINE([BUILD_XWAYLAND], [1], [Build the X server launcher])
configure: add helper for setting xserver directory With this the X server directory can become independent from the installation prefix set by autoconf. Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
13 years ago
AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH],
[Path to X server]), [XSERVER_PATH="$withval"],
configure.ac: Don't look for Xwayland in the weston install destination Xwayland isn't part of this distribution so looking for Xwayland in weston's install dir will cause distcheck to fail. Let's set the default to /usr/bin where it's likely to live. It can still be overriden during configure exactly as before. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
10 years ago
[XSERVER_PATH="/usr/bin/Xwayland"])
configure: add helper for setting xserver directory With this the X server directory can become independent from the installation prefix set by autoconf. Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
13 years ago
AC_SUBST([XSERVER_PATH])
configure.ac: Make xwayland tests depend on xwayland Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
12 years ago
if test x$enable_xwayland_test = xyes; then
xwayland-test: Replace the xwayland-test The old xwayland-test hasn't worked in a while... This new test checks that the wayland specific WL_SURFACE_ID atom exists, checks that the window manager name is "Weston WM" and then maps a window and waits for an exposure event. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Tested-by: Bryce Harrington <bryce@osg.samsung.com>
10 years ago
PKG_CHECK_MODULES([XWAYLAND_TEST], x11)
configure.ac: Make xwayland tests depend on xwayland Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
12 years ago
fi
compositor: Add a simple WM to the xserver launcher
14 years ago
fi
configure.ac: Make libdrm optional in weston-launch If libdrm is available, weston-launch and launcer-util.c will support getting the drm device and setting and dropping drm master, otherwise we'll only support getting input devices.
11 years ago
PKG_CHECK_MODULES(LIBDRM, [libdrm],
[AC_DEFINE(HAVE_LIBDRM, 1, [Define if libdrm is available]) have_libdrm=yes], have_libdrm=no)
compositor: Add a simple WM to the xserver launcher
14 years ago
Make it possible to enable/disable the various compositors from configure
14 years ago
AC_ARG_ENABLE(x11-compositor, [ --enable-x11-compositor],,
enable_x11_compositor=yes)
configure: Fix build on debian by avoiding bashisms in the test command.
13 years ago
AM_CONDITIONAL(ENABLE_X11_COMPOSITOR, test x$enable_x11_compositor = xyes)
if test x$enable_x11_compositor = xyes; then
configure: Only check for XCB if x11 compositor is enabled
14 years ago
PKG_CHECK_MODULES([XCB], xcb)
xcb_save_LIBS=$LIBS
xcb_save_CFLAGS=$CFLAGS
CFLAGS=$XCB_CFLAGS
LIBS=$XCB_LIBS
AC_CHECK_FUNCS([xcb_poll_for_queued_event])
LIBS=$xcb_save_LIBS
CFLAGS=$xcb_save_CFLAGS
build: Make the X11 compositor explicitely depend on xcb-shm Otherwise, it means the X11 compositor depends on another library to pull xcb-shm (cairo?), which is not always the case. Here I end up with: [01:54:38.970] Failed to load module: $prefix/lib/weston/x11-backend.so: undefined symbol: xcb_shm_id
12 years ago
X11_COMPOSITOR_MODULES="x11 x11-xcb xcb-shm"
compositor-x11: Add base XCB/XKB support Try to find the XKB extension, to be used in later commits. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
13 years ago
PKG_CHECK_MODULES(X11_COMPOSITOR_XKB, [xcb-xkb],
[have_xcb_xkb="yes"], [have_xcb_xkb="no"])
if test "x$have_xcb_xkb" = xyes; then
# Most versions of XCB have totally broken XKB bindings, where the
# events don't work. Make sure we can actually use them.
xcb_xkb_save_CFLAGS=$CFLAGS
CFLAGS=$X11_COMPOSITOR_XKB_CFLAGS
AC_CHECK_MEMBER([struct xcb_xkb_state_notify_event_t.xkbType],
[], [have_xcb_xkb=no], [[#include <xcb/xkb.h>]])
CFLAGS=$xcb_xkb_save_CFLAGS
fi
if test "x$have_xcb_xkb" = xyes; then
X11_COMPOSITOR_MODULES="$X11_COMPOSITOR_MODULES xcb-xkb"
AC_DEFINE([HAVE_XCB_XKB], [1], [libxcb supports XKB protocol])
fi
PKG_CHECK_MODULES(X11_COMPOSITOR, [$X11_COMPOSITOR_MODULES])
Make it possible to enable/disable the various compositors from configure
14 years ago
AC_DEFINE([BUILD_X11_COMPOSITOR], [1], [Build the X11 compositor])
fi
Enable all compositors by default
14 years ago
AC_ARG_ENABLE(drm-compositor, [ --enable-drm-compositor],,
enable_drm_compositor=yes)
configure.ac: The drm backend no longer requires EGL We can run with just the pixman renderer and 'dumb' kms buffers.
11 years ago
AM_CONDITIONAL(ENABLE_DRM_COMPOSITOR, test x$enable_drm_compositor = xyes)
if test x$enable_drm_compositor = xyes; then
Make it possible to enable/disable the various compositors from configure
14 years ago
AC_DEFINE([BUILD_DRM_COMPOSITOR], [1], [Build the DRM compositor])
build, compositor-drm: fix output name constants another way Bumping libdrm requirement by 3 years just for output connector name constants was a bit much. Fix the problem introduced in 89c49b3060a115e846ba1e7fbef94d14894244f2 by conditionally using the new additions. Both VIRTUAL and DSI came in the same libdrm commit 566c3ce877a4be72697e15cdfc421ce965f7c37d, so we check only for DSI. This patch also reverts faee330c5e027011941d50533156683be3a67ca3. Reported-by: Eugen Friedrich <friedrix@gmail.com> Cc: Derek Foreman <derekf@osg.samsung.com> Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> Acked-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
PKG_CHECK_MODULES(DRM_COMPOSITOR, [libudev >= 136 libdrm >= 2.4.30 gbm mtdev >= 1.1.0])
Fix build breakage when using older gbm lacking dmabuf import The buildbots discovered this issue on Ubuntu 14.04, which carries libgbm 10.1.3-0ubuntu0.4. The dmabuf changes need gbm 10.2, so it fails during build like this: src/compositor-drm.c: In function ‘drm_output_prepare_overlay_view’: src/compositor-drm.c:984:10: error: variable ‘gbm_dmabuf’ has initializer but incomplete type struct gbm_import_fd_data gbm_dmabuf = { ^ etc. Proposed fix is to conditionalize the gbm fd import feature in compositor-drm. This fix was suggested by daniels. I set up a synthetic test environment to reproduce the issue as found by the buildbots and tweaked the patch to get it to build both with and without gbm 10.2. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
PKG_CHECK_MODULES(DRM_COMPOSITOR_GBM, [gbm >= 10.2],
[AC_DEFINE([HAVE_GBM_FD_IMPORT], 1, [gbm supports dmabuf import])],
[AC_MSG_WARN([gbm does not support dmabuf import, will omit that capability])])
Make it possible to enable/disable the various compositors from configure
14 years ago
fi
Add libinput based input device backend While disable by default, passing --enable-libinput-backend to ./configure switches the input backend in weston's drm, fbdev and rpi compositing backends to use libinput instead of udev-seat.c, evdev.c and friends. When enabled, weston now also depends on libinput >= 0.1.0. Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
11 years ago
configure.ac: Require libinput 0.8 Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
10 years ago
PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0])
build: Add dependency between libdrm and compositor for drm backend The compositor uses libdrm in launcher-util.c if the drm backend is built, but there was no explicit requirement in the build. egl brings libdrm implicity so the build doesn't fail. This patch adds an explicit dependency between the compositor and libdrm if the drm backend is built, so that changes to the compositor modules don't cause build failures.
11 years ago
PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES])
Make it possible to enable/disable the various compositors from configure
14 years ago
compositor: migrate to stable viewporter.xml Migrate from wl_scaler to wp_viewporter extension. The viewporter.xml file is provided by wayland-protocols. This stops Weston from advertising wl_scaler, and advertises wp_viewporter instead. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> [Pekka: fix wayland-protocols requirement]
9 years ago
PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.4],
Use fullscreen-shell.xml from wayland-protocols Use the fullscreen-shell protocol XML from the wayland-protocols installation, and remove the one we provide ourself. Signed-off-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Mariusz Ceier <mceier+wayland@gmail.com> Acked-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
[ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
Enable all compositors by default
14 years ago
AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],,
enable_wayland_compositor=yes)
Make it possible to enable/disable the various compositors from configure
14 years ago
AM_CONDITIONAL(ENABLE_WAYLAND_COMPOSITOR,
Make EGL/GLESv2 dependencies optional Introduce --disable-egl switch for configure to disable EGL/GLESv2 support. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
12 years ago
test x$enable_wayland_compositor = xyes -a x$enable_egl = xyes)
if test x$enable_wayland_compositor = xyes -a x$enable_egl = xyes; then
Make it possible to enable/disable the various compositors from configure
14 years ago
AC_DEFINE([BUILD_WAYLAND_COMPOSITOR], [1],
[Build the Wayland (nested) compositor])
build: Define wayland prereq version Establishes a single variable for defining the libwayland version requirements, where we have versioned checks. Enforces the same version dependency between libwayland-client and libwayland-server. Developers typically only test the greater version of the two, so if they're different it masks cases that don't get tested adequately. So this sets wayland-client's required version to 1.10, same as for the server. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
9 years ago
PKG_CHECK_MODULES(WAYLAND_COMPOSITOR, [wayland-client >= $WAYLAND_PREREQ_VERSION wayland-egl wayland-cursor])
Make it possible to enable/disable the various compositors from configure
14 years ago
fi
Add Android backend The Android backend provides basic EGL/GLES2 graphics, where everything is always composited. Overlays are not used. Input is stubbed, therefore there is no input yet. This adds the first C++ source file into Weston compositor. The Android gralloc and fb HAL glue code to the Android EGL library is in C++, and there is no way to access it from plain C. We have a simple wrapper to the required C++ class API. Android forces the C++ file name extension to .cpp. The android backend is compiled by default. However, all Android specific calls are protected with #ifdef ANDROID, so it will build also without Android headers. The binary produced without the Android build system is useless, but allows build-testing generic Weston changes. Therefore the android backend is not installed. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
13 years ago
Add a headless backend Add a headless backend and a noop renderer, mainly for testing purposes. Although no rendering is performed with this backend, this allow some of the code paths inside Weston and shm clients to be tested without any windowing system or any need for drm access.
12 years ago
AC_ARG_ENABLE(headless-compositor, [ --enable-headless-compositor],,
enable_headless_compositor=yes)
AM_CONDITIONAL(ENABLE_HEADLESS_COMPOSITOR,
test x$enable_headless_compositor = xyes)
configure.ac: Indicate headless compositor presence in config.h Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years ago
if test x$enable_headless_compositor = xyes; then
AC_DEFINE([BUILD_HEADLESS_COMPOSITOR], [1], [Build the headless compositor])
fi
Add a headless backend Add a headless backend and a noop renderer, mainly for testing purposes. Although no rendering is performed with this backend, this allow some of the code paths inside Weston and shm clients to be tested without any windowing system or any need for drm access.
12 years ago
fbdev: Add an fbdev compositor backend using pixman and evdev Add a frame buffer backend using pixman to render to fbdev. This has been tested against nouveaufb but nothing else. Much of the code came straight from the rpi backend (and copyright has been attributed accordingly). The behaviour of this backend on less modern frame buffers has yet to be tested. The refresh rate is calculated from the frame buffer's metadata. Every frame is finished in synchrony with the refresh rate. Frame buffer devices are currently specified on the command line (or using the default of /dev/fb0); udev could be used in future to enumerate them. pixman is used for compositing, and a suitable pixman format is built from the frame buffer's metadata. This doesn't support the full range of frame buffer formats, but does support varying BPPs of RGBA and ARGB. That should be enough for now. The following are not currently supported: • FOURCC • Non-packed formats (interleaved, planes, etc.) • Non-true-colour formats (monochrome, greyscale, etc.) • Big-endian formats (with component MSBs on the right) • Non-RGBA and non-ARGB formats Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
12 years ago
AC_ARG_ENABLE([fbdev-compositor], [ --enable-fbdev-compositor],,
enable_fbdev_compositor=yes)
AM_CONDITIONAL([ENABLE_FBDEV_COMPOSITOR],
[test x$enable_fbdev_compositor = xyes])
AS_IF([test x$enable_fbdev_compositor = xyes], [
AC_DEFINE([BUILD_FBDEV_COMPOSITOR], [1], [Build the fbdev compositor])
compositor-fbdev: drop dependency on libdrm Signed-off-by: Adrian Negreanu <adrian.m.negreanu@intel.com>
11 years ago
PKG_CHECK_MODULES([FBDEV_COMPOSITOR], [libudev >= 136 mtdev >= 1.1.0])
fbdev: Add an fbdev compositor backend using pixman and evdev Add a frame buffer backend using pixman to render to fbdev. This has been tested against nouveaufb but nothing else. Much of the code came straight from the rpi backend (and copyright has been attributed accordingly). The behaviour of this backend on less modern frame buffers has yet to be tested. The refresh rate is calculated from the frame buffer's metadata. Every frame is finished in synchrony with the refresh rate. Frame buffer devices are currently specified on the command line (or using the default of /dev/fb0); udev could be used in future to enumerate them. pixman is used for compositing, and a suitable pixman format is built from the frame buffer's metadata. This doesn't support the full range of frame buffer formats, but does support varying BPPs of RGBA and ARGB. That should be enough for now. The following are not currently supported: • FOURCC • Non-packed formats (interleaved, planes, etc.) • Non-true-colour formats (monochrome, greyscale, etc.) • Big-endian formats (with component MSBs on the right) • Non-RGBA and non-ARGB formats Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
12 years ago
])
RDP compositor take 6 This patch is the 6th version of the FreeRDP based compositor. Changes from last version: * use pixman_image_get_stride() when appropriate * always realloc Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
12 years ago
AC_ARG_ENABLE([rdp-compositor], [ --enable-rdp-compositor],,
enable_rdp_compositor=no)
AM_CONDITIONAL([ENABLE_RDP_COMPOSITOR],
[test x$enable_rdp_compositor = xyes])
if test x$enable_rdp_compositor = xyes; then
Document RDP compositor options Help was missing for the RDP compositor, this patch gives details about available options.
12 years ago
AC_DEFINE([BUILD_RDP_COMPOSITOR], [1], [Build the RDP compositor])
rdp: allow to compile against FreeRDP 2.0 FreeRDP 2.0 is about to be released, this allows to compile against this version. The detection is adjusted to prefer FreeRDP 2 against version 1.x. Signed-off-by: David Fort <contact@hardening-consulting.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp2 >= 2.0.0],
[],
[PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp >= 1.1.0],[])]
)
Fix compilation with FreeRdp 1.1 and master v2 The API to use remoteFx encoding has changed between master and stable 1.1 branch. This patch should fix compilation for both. This new version adds checks for the freerdp/version.h file
11 years ago
SAVED_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $RDP_COMPOSITOR_CFLAGS"
AC_CHECK_HEADERS([freerdp/version.h])
CPPFLAGS="$SAVED_CPPFLAGS"
RDP compositor take 6 This patch is the 6th version of the FreeRDP based compositor. Changes from last version: * use pixman_image_get_stride() when appropriate * always realloc Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
12 years ago
fi
fbdev: Add an fbdev compositor backend using pixman and evdev Add a frame buffer backend using pixman to render to fbdev. This has been tested against nouveaufb but nothing else. Much of the code came straight from the rpi backend (and copyright has been attributed accordingly). The behaviour of this backend on less modern frame buffers has yet to be tested. The refresh rate is calculated from the frame buffer's metadata. Every frame is finished in synchrony with the refresh rate. Frame buffer devices are currently specified on the command line (or using the default of /dev/fb0); udev could be used in future to enumerate them. pixman is used for compositing, and a suitable pixman format is built from the frame buffer's metadata. This doesn't support the full range of frame buffer formats, but does support varying BPPs of RGBA and ARGB. That should be enough for now. The following are not currently supported: • FOURCC • Non-packed formats (interleaved, planes, etc.) • Non-true-colour formats (monochrome, greyscale, etc.) • Big-endian formats (with component MSBs on the right) • Non-RGBA and non-ARGB formats Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
12 years ago
configure.ac: Fix indent for screen-share option
11 years ago
AC_ARG_ENABLE([screen-sharing], [ --enable-screen-sharing],,
Add a screen sharing plugin This adds a plugin called screen-share.so. If the screen-share.so module is imported, it will add the CTRL+ALT+s keybinding to start a screen sharing session. If you press CTRL+ALT+S, weston will spawn another copy of weston, this time with the RDP backend, and mirrors the current screen to it and adds any seats from RDP as aditional seats. The current screen is defined as the one with the mouse pointer. Currently the CTRL+ALT+s keybinding is hardcoded as the only way to activate screen sharing. If, at some point, shells want more control over the screen sharing process, the API's should be easy to update and export to make this possible. For security, the command and path to weston is currently hard-coded. It would not take much aditional code to make this configurable or to allow a shell to launch other screen-sharing programs. However, handling those security issues is outside the scope of this patch so it is hard-coded for now. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
11 years ago
enable_screen_sharing=no)
AM_CONDITIONAL([ENABLE_SCREEN_SHARING],
[test x$enable_screen_sharing = xyes])
if test x$enable_screen_sharing = xyes; then
PKG_CHECK_MODULES(SCREEN_SHARE, [wayland-client])
if test x$enable_rdp_compositor != xyes; then
AC_MSG_WARN([The screen-share.so module requires the RDP backend.])
fi
fi
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
AC_ARG_WITH(cairo,
AS_HELP_STRING([--with-cairo=@<:@image|gl|glesv2@:>@]
[Which Cairo renderer to use for the clients]),
[],[with_cairo="image"])
if test "x$with_cairo" = "ximage"; then
cairo_modules="cairo"
else
if test "x$with_cairo" = "xgl"; then
cairo_modules="cairo-gl"
configure: Warn that cairo-gl and cairo-glesv2 are risky Most distros do not ship with gl-enabled cairo, since doing so can result in libgl being linked to each cairo-using client, even if they don't actually use GL, and this can cause much larger per-client memory footprint, and thus can become a resource issue. Furthermore, while in theory this should work fine, we don't actively test this configuration, and there could be random undiscovered bugs if it's used. We keep the option available for people interested in helping us chase down those issues, but warn everyone else away.
10 years ago
AC_MSG_WARN([The --with-cairo=gl option can cause increased resource usage and potential instability, and thus is not recommended. It is needed only for a few special demo programs.])
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
else
if test "x$with_cairo" = "xglesv2"; then
cairo_modules="cairo-glesv2"
configure: Warn that cairo-gl and cairo-glesv2 are risky Most distros do not ship with gl-enabled cairo, since doing so can result in libgl being linked to each cairo-using client, even if they don't actually use GL, and this can cause much larger per-client memory footprint, and thus can become a resource issue. Furthermore, while in theory this should work fine, we don't actively test this configuration, and there could be random undiscovered bugs if it's used. We keep the option available for people interested in helping us chase down those issues, but warn everyone else away.
10 years ago
AC_MSG_WARN([The --with-cairo=gles2 option can cause increased resource usage and potential instability, and thus is not recommended. It is needed only for a few special demo programs.])
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
else
AC_ERROR([Unknown cairo renderer requested])
fi
fi
fi
# Included for legacy compat
configure: fix --without-cairo-glesv2 Make it do what you would think it does, instead of enabling GLESv2. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
AC_ARG_WITH(cairo-glesv2,
AS_HELP_STRING([--with-cairo-glesv2],
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
[Use GLESv2 cairo]))
configure: fix --without-cairo-glesv2 Make it do what you would think it does, instead of enabling GLESv2. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
if test "x$with_cairo_glesv2" = "xyes"; then
cairo_modules="cairo-glesv2"
autotools: Add configure summary
11 years ago
with_cairo="glesv2"
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
fi
if test "x$cairo_modules" = "xcairo-glesv2"; then
AC_DEFINE([USE_CAIRO_GLESV2], [1], [Use the GLESv2 GL cairo backend])
clients: Allow compiling with the cairo glesv2 backend This disables gears and wscreensaver, which use full GL.
13 years ago
fi
Consolidate image loading code and move to shared/
13 years ago
PKG_CHECK_MODULES(PIXMAN, [pixman-1])
PKG_CHECK_MODULES(PNG, [libpng])
configure: Make WebP support togglable, and improve its error message. The current way was enabling WebP support whenever libwebp was found, giving no way to the user to disable it if they had the library installed but didn’t want to link against it. This adds a --without-webp configure option to never link against it, and a --with-webp one to fail the build if it isn’t found, the default being to use it if it is present. Additionally, we now tell the user when WebP support has been disabled and they try to load a WebP file. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
configure: Make jpeglib an optional dependency. It doesn’t make sense to fail the entire build when jpeglib isn’t present, so this commit makes it optional just like libwebp in the previous one, disabled with --without-jpeg and forced with --with-jpeg. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
AC_ARG_WITH([jpeg],
AS_HELP_STRING([--without-jpeg],
[Use jpeglib for JPEG decoding support [default=auto]]))
AS_IF([test "x$with_jpeg" != "xno"],
build: Add (and use) an AC_SEARCH_LIBS wrapper AC_SEARCH_LIBS is the recommended macro for these checks, unfortunately, we use AC_CHECK_LIB instead, and even AC_CHECK_FUNC, when only one AC_SEARCH_LIBS would be enough. This wrapper macro is used much like PKG_CHECK_MODULES, as it defines (and AC_SUBST) the PREFIX_LIBS variable itself. It also avoids adding unnecessary stuff to LIBS. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
[WESTON_SEARCH_LIBS([JPEG], [jpeg], [jpeg_CreateDecompress], [have_jpeglib=yes], [have_jpeglib=no])],
configure: Make jpeglib an optional dependency. It doesn’t make sense to fail the entire build when jpeglib isn’t present, so this commit makes it optional just like libwebp in the previous one, disabled with --without-jpeg and forced with --with-jpeg. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
[have_jpeglib=no])
AS_IF([test "x$have_jpeglib" = "xyes"],
build: Add (and use) an AC_SEARCH_LIBS wrapper AC_SEARCH_LIBS is the recommended macro for these checks, unfortunately, we use AC_CHECK_LIB instead, and even AC_CHECK_FUNC, when only one AC_SEARCH_LIBS would be enough. This wrapper macro is used much like PKG_CHECK_MODULES, as it defines (and AC_SUBST) the PREFIX_LIBS variable itself. It also avoids adding unnecessary stuff to LIBS. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
[AC_DEFINE([HAVE_JPEG], [1], [Have jpeglib])],
configure: Make jpeglib an optional dependency. It doesn’t make sense to fail the entire build when jpeglib isn’t present, so this commit makes it optional just like libwebp in the previous one, disabled with --without-jpeg and forced with --with-jpeg. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
[AS_IF([test "x$with_jpeg" = "xyes"],
[AC_MSG_ERROR([JPEG support explicitly requested, but jpeglib couldn't be found])])])
configure: Make WebP support togglable, and improve its error message. The current way was enabling WebP support whenever libwebp was found, giving no way to the user to disable it if they had the library installed but didn’t want to link against it. This adds a --without-webp configure option to never link against it, and a --with-webp one to fail the build if it isn’t found, the default being to use it if it is present. Additionally, we now tell the user when WebP support has been disabled and they try to load a WebP file. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
AC_ARG_WITH([webp],
AS_HELP_STRING([--without-webp],
[Use libwebp for WebP decoding support [default=auto]]))
AS_IF([test "x$with_webp" != "xno"],
[PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no])],
[have_webp=no])
Consolidate image loading code and move to shared/
13 years ago
AS_IF([test "x$have_webp" = "xyes"],
configure: Make WebP support togglable, and improve its error message. The current way was enabling WebP support whenever libwebp was found, giving no way to the user to disable it if they had the library installed but didn’t want to link against it. This adds a --without-webp configure option to never link against it, and a --with-webp one to fail the build if it isn’t found, the default being to use it if it is present. Additionally, we now tell the user when WebP support has been disabled and they try to load a WebP file. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
[AC_DEFINE([HAVE_WEBP], [1], [Have webp])],
[AS_IF([test "x$with_webp" = "xyes"],
[AC_MSG_ERROR([WebP support explicitly requested, but libwebp couldn't be found])])])
Move cairo-util to shared/
13 years ago
configure.ac: Auto-enable vaapi recorder, but allow overrides If libva is available and recent, we'll enable the vaapi recorder feature, but it can also be forced on or off by --enable/disable-vaapi-recorder.
11 years ago
AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],,
enable_vaapi_recorder=auto)
if test x$enable_vaapi_recorder != xno; then
PKG_CHECK_MODULES(LIBVA, [libva >= 0.34.0 libva-drm >= 0.34.0],
[have_libva=yes], [have_libva=no])
if test "x$have_libva" = "xno" -a "x$enable_vaapi_recorder" = "xyes"; then
AC_MSG_ERROR([vaapi-recorder explicitly enabled, but libva couldn't be found])
fi
configure.ac: Only build libva recorder if we found libva The automatic detection failed to disable the build if it didn't find libva. https://bugs.freedesktop.org/show_bug.cgi?id=68908
11 years ago
AS_IF([test "x$have_libva" = "xyes"],
[AC_DEFINE([BUILD_VAAPI_RECORDER], [1], [Build the vaapi recorder])])
configure.ac: Auto-enable vaapi recorder, but allow overrides If libva is available and recent, we'll enable the vaapi recorder feature, but it can also be forced on or off by --enable/disable-vaapi-recorder.
11 years ago
fi
configure.ac: Only build libva recorder if we found libva The automatic detection failed to disable the build if it didn't find libva. https://bugs.freedesktop.org/show_bug.cgi?id=68908
11 years ago
AM_CONDITIONAL(ENABLE_VAAPI_RECORDER, test "x$have_libva" = xyes)
configure.ac: Auto-enable vaapi recorder, but allow overrides If libva is available and recent, we'll enable the vaapi recorder feature, but it can also be forced on or off by --enable/disable-vaapi-recorder.
11 years ago
configure: link image libs with libshared This fix xwayland.so that was complaining about jpeg symbols from the libshared. Note that xwayland is not using the jpeg ones, but now that symbols are read up front we need to link anyway.. or break apart that library. Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
12 years ago
PKG_CHECK_MODULES(CAIRO, [cairo])
Consolidate image loading code and move to shared/
13 years ago
tests: introduce struct buffer for client-helper We are growing more tests that need to handle buffers, both just images and wl_buffers. Particularly the screenshooting facility needs these. Currently everything is in struct surface, which contains more than we need. It is a bit messy. Create a new struct buffer to encapsulate the image representation, the wl_buffer, and enough information to tear it all down (munmap) so we don't have to leak everything. Some tests might start doing things in loops, and leaking would accumulate. Instead of inventing our own image representation, use pixman_image_t. It is a well-tested library worth using, and we already rely on it in other places. This makes the tests depend on Pixman, which requires the fix for building buffer-count, which would otherwise not find pixman.h. The new create_shm_buffer_a8r8g8b8() creates an image with an explicit format, and pixman_image_t keeps track of it. And stride and size and data. This implementation is still a little hacky due to calling create_shm_buffer(). A very new thing is buffer_destroy(). Previously we didn't really free any buffers. It is not a problem when the process will exit soon anyway, but it may become a problem if tests start iterating things. Manual memset() on a image is converted to a pixman action, just to show how to do it properly with pixman. Stride and pixel format assumptions still linger all around, but those are for another patch. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com>
9 years ago
PKG_CHECK_MODULES(TEST_CLIENT, [wayland-client >= $WAYLAND_PREREQ_VERSION pixman-1])
tests: Use TEST_CLIENT for test client modules We abused SIMPLE_CLIENT_LIBS before, but if you disable simple clients, the test suite fails to link. Use test client specific variables instead. https://bugs.freedesktop.org/show_bug.cgi?id=71530
11 years ago
configure: separate simple EGL clients from others Separate simple EGL clients from other simple clients. This allows to build either simple-shm or simple-egl, whichever you want. We avoid linking libEGL and GLESv2 into simple-shm, and we can build simple-shm even if nothing provides EGL, GLESv2, or wayland-egl APIs. Change the options in configure --help from --enable to --disable, since these are enabled by default, and you would normally only ever give the --disable flavor. Add descriptions. Remove the #define BUILD_SIMPLE_CLIENTS since it is not used. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
AC_ARG_ENABLE(simple-clients,
AS_HELP_STRING([--disable-simple-clients],
[do not build the simple wl_shm clients]),,
enable_simple_clients=yes)
AM_CONDITIONAL(BUILD_SIMPLE_CLIENTS, test "x$enable_simple_clients" = "xyes")
configure: Fix build on debian by avoiding bashisms in the test command.
13 years ago
if test x$enable_simple_clients = xyes; then
configure: separate simple EGL clients from others Separate simple EGL clients from other simple clients. This allows to build either simple-shm or simple-egl, whichever you want. We avoid linking libEGL and GLESv2 into simple-shm, and we can build simple-shm even if nothing provides EGL, GLESv2, or wayland-egl APIs. Change the options in configure --help from --enable to --disable, since these are enabled by default, and you would normally only ever give the --disable flavor. Add descriptions. Remove the #define BUILD_SIMPLE_CLIENTS since it is not used. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
PKG_CHECK_MODULES(SIMPLE_CLIENT, [wayland-client])
fi
AC_ARG_ENABLE(simple-egl-clients,
AS_HELP_STRING([--disable-simple-egl-clients],
[do not build the simple EGL clients]),,
configure.ac: Only enable enable_simple_egl_clients if enable_egl is yes This simplifies a few checks and makes sure we only build the subsurfaces client if EGL is enabled. https://bugs.freedesktop.org/show_bug.cgi?id=68727
11 years ago
enable_simple_egl_clients="$enable_egl")
AM_CONDITIONAL(BUILD_SIMPLE_EGL_CLIENTS, test "x$enable_simple_egl_clients" = "xyes")
if test x$enable_simple_egl_clients = xyes; then
configure: separate simple EGL clients from others Separate simple EGL clients from other simple clients. This allows to build either simple-shm or simple-egl, whichever you want. We avoid linking libEGL and GLESv2 into simple-shm, and we can build simple-shm even if nothing provides EGL, GLESv2, or wayland-egl APIs. Change the options in configure --help from --enable to --disable, since these are enabled by default, and you would normally only ever give the --disable flavor. Add descriptions. Remove the #define BUILD_SIMPLE_CLIENTS since it is not used. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
PKG_CHECK_MODULES(SIMPLE_EGL_CLIENT,
configure: don't control egl version The required version only corresponds to version of mesa implementation. This mesa version requirement causes configure errors, when weston is configured for a different egl implementation than mesa. Because the version of the egl drivers are not alligned to the mesa version. Therefore, I deleted the version controlling for egl, so that weston can be configured for a different egl implementation. Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
[egl glesv2 wayland-client wayland-egl wayland-cursor])
configure: set up simple clients independently from the others Namely, simple-client and simple-shm. Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
14 years ago
fi
Make it possible to enable/disable the various compositors from configure
14 years ago
clients: rename simple-dmabuf into simple-dmabuf-intel This client was using an Intel-specific way to allocate a dmabuf, so it makes sense to have that in its name. Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> Differential Revision: https://phabricator.freedesktop.org/D342
9 years ago
AC_ARG_ENABLE(simple-dmabuf-intel-client,
AS_HELP_STRING([--disable-simple-dmabuf-intel-client],
[do not build the simple dmabuf intel client]),,
enable_simple_dmabuf_intel_client="auto")
if ! test "x$enable_simple_dmabuf_intel_client" = "xno"; then
PKG_CHECK_MODULES(SIMPLE_DMABUF_INTEL_CLIENT, [wayland-client libdrm libdrm_intel],
have_simple_dmabuf_intel_client=yes, have_simple_dmabuf_intel_client=no)
if test "x$have_simple_dmabuf_intel_client" = "xno" -a "x$enable_simple_dmabuf_intel_client" = "xyes"; then
Fix armhf configure breakage due to missing libdrm_intel package The buildbots discovered that recent changes break on Ubuntu 15.04's armhf images: configure:16137: checking for SIMPLE_DMABUF_CLIENT configure:16144: $PKG_CONFIG --exists --print-errors "wayland-client libdrm libdrm_intel" Package libdrm_intel was not found in the pkg-config search path. ... configure:16194: error: Package requirements (wayland-client libdrm libdrm_intel) were not met: No package 'libdrm_intel' found This patch was provided by Daniel Stone. I've not tested it other than verifying it does not cause build problems on x86_64. Acked-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
AC_MSG_ERROR([Intel dmabuf client explicitly enabled, but libdrm_intel couldn't be found])
fi
clients: rename simple-dmabuf into simple-dmabuf-intel This client was using an Intel-specific way to allocate a dmabuf, so it makes sense to have that in its name. Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> Differential Revision: https://phabricator.freedesktop.org/D342
9 years ago
enable_simple_dmabuf_intel_client="$have_simple_dmabuf_intel_client"
clients: add simple-dmabuf client v2: - adapted to protocol changes - added TODO comments - minor clean-up - change y-invert from per-plane boolean to per-buffer flag v3: - fix a typo: 1 -> i (noticed by Carlos Olmedo Escobar) Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com> Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com> Acked-by: Daniel Stone <daniels@collabora.com>
11 years ago
fi
clients: rename simple-dmabuf into simple-dmabuf-intel This client was using an Intel-specific way to allocate a dmabuf, so it makes sense to have that in its name. Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com> Differential Revision: https://phabricator.freedesktop.org/D342
9 years ago
AM_CONDITIONAL(BUILD_SIMPLE_DMABUF_INTEL_CLIENT, test "x$enable_simple_dmabuf_intel_client" = "xyes")
clients: add simple-dmabuf client v2: - adapted to protocol changes - added TODO comments - minor clean-up - change y-invert from per-plane boolean to per-buffer flag v3: - fix a typo: 1 -> i (noticed by Carlos Olmedo Escobar) Signed-off-by: George Kiagiadakis <george.kiagiadakis@collabora.com> Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Signed-off-by: Louis-Francis Ratté-Boulianne <lfrb@collabora.com> Acked-by: Daniel Stone <daniels@collabora.com>
11 years ago
clients: add simple-v4l-dmabuf client This client opens a V4L2 device, usually exposed as /dev/videoN, and retrieves its frames as dmabuf for later import into the compositor. It supports both single- and multi-planar devices, and any format exposed by the V4L2 device the Wayland compositor accepts. This client never changes the v4l2 settings, use `v4l2-ctl -c` if you want to change those. Signed-off-by: Emmanuel Gil Peyrot <emmanuel.peyrot@collabora.com> Acked-by: Derek Foreman <derekf@osg.samsung.com> Tested-by: Derek Foreman <derekf@osg.samsung.com> Maniphest Tasks: T90 Differential Revision: https://phabricator.freedesktop.org/D339
9 years ago
AC_ARG_ENABLE(simple-dmabuf-v4l-client,
AS_HELP_STRING([--disable-simple-dmabuf-v4l-client],
[do not build the simple dmabuf v4l client]),,
enable_simple_dmabuf_v4l_client="auto")
if ! test "x$enable_simple_dmabuf_v4l_client" = "xno"; then
PKG_CHECK_MODULES(SIMPLE_DMABUF_V4L_CLIENT, [wayland-client libdrm],
have_simple_dmabuf_v4l_client=yes, have_simple_dmabuf_v4l_client=no)
if test "x$have_simple_dmabuf_v4l_client" = "xno" -a "x$enable_simple_dmabuf_v4l_client" = "xyes"; then
AC_MSG_ERROR([V4L dmabuf client explicitly enabled, but libdrm couldn't be found])
fi
enable_simple_dmabuf_v4l_client="$have_simple_dmabuf_v4l_client"
fi
AM_CONDITIONAL(BUILD_SIMPLE_DMABUF_V4L_CLIENT, test "x$enable_simple_dmabuf_v4l_client" = "xyes")
Add --disable-clients configure option
14 years ago
AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes)
configure: Fix build on debian by avoiding bashisms in the test command.
13 years ago
AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes)
if test x$enable_clients = xyes; then
Add --disable-clients configure option
14 years ago
AC_DEFINE([BUILD_CLIENTS], [1], [Build the Wayland clients])
build: Define wayland prereq version Establishes a single variable for defining the libwayland version requirements, where we have versioned checks. Enforces the same version dependency between libwayland-client and libwayland-server. Developers typically only test the greater version of the two, so if they're different it masks cases that don't get tested adequately. So this sets wayland-client's required version to 1.10, same as for the server. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
9 years ago
PKG_CHECK_MODULES(CLIENT, [wayland-client >= $WAYLAND_PREREQ_VERSION cairo >= 1.10.0 xkbcommon wayland-cursor])
clients/nested: Fix compilation
12 years ago
PKG_CHECK_MODULES(SERVER, [wayland-server])
build: Define wayland prereq version Establishes a single variable for defining the libwayland version requirements, where we have versioned checks. Enforces the same version dependency between libwayland-client and libwayland-server. Developers typically only test the greater version of the two, so if they're different it masks cases that don't get tested adequately. So this sets wayland-client's required version to 1.10, same as for the server. Signed-off-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net>
9 years ago
PKG_CHECK_MODULES(WESTON_INFO, [wayland-client >= $WAYLAND_PREREQ_VERSION])
Consolidate image loading code and move to shared/
13 years ago
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
# Only check for cairo-egl if a GL or GLES renderer requested
AS_IF([test "x$cairo_modules" = "xcairo-gl" -o "x$cairo_modules" = "xcairo-glesv2"], [
configure: don't control egl version The required version only corresponds to version of mesa implementation. This mesa version requirement causes configure errors, when weston is configured for a different egl implementation than mesa. Because the version of the egl drivers are not alligned to the mesa version. Therefore, I deleted the version controlling for egl, so that weston can be configured for a different egl implementation. Signed-off-by: Emre Ucan <eucan@de.adit-jv.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
PKG_CHECK_MODULES(CAIRO_EGL, [wayland-egl egl cairo-egl >= 1.11.3 $cairo_modules],
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
[have_cairo_egl=yes], [have_cairo_egl=no])
AS_IF([test "x$have_cairo_egl" = "xyes"],
[AC_DEFINE([HAVE_CAIRO_EGL], [1], [Have cairo-egl])],
autotools: Add configure summary
11 years ago
[AC_ERROR([cairo-egl not used because $CAIRO_EGL_PKG_ERRORS])])],
[have_cairo_egl=no])
build: Allow more control over cairo use in the clients Previously the configure script would silently disable the use of accelerated cairo in the clients if cairo-gl could not be found (or cairo-glesv2 if that was requested.) Conversely the use of cairo-gl would be automatically enabled if it was found with no way to disable that feature This change adds --with-cairo which takes one of "image", "gl" or "glesv2" (defaulting to "image"). If "gl" or "glesv2" is specified cairo-egl is checked for as well as the specified renderer. If the check fails then the configure process errors out.
11 years ago
editor: add support for pre-edit styling Add pango dependency to the example and use pango for text handling. Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
12 years ago
PKG_CHECK_MODULES(PANGO, [pangocairo], [have_pango=yes], [have_pango=no])
Add --disable-clients configure option
14 years ago
fi
toytoolkit: Make the window resizing optimization optional Whether or not a shm pool is used for resizing is now configurable at build time (--disable-resize-optimization). [pq: removed an unnecessary hunk from the patch]
12 years ago
AC_ARG_ENABLE(resize-optimization,
AS_HELP_STRING([--disable-resize-optimization],
[disable resize optimization allocating a big buffer in toytoolkit]),,
enable_resize_optimization=yes)
AS_IF([test "x$enable_resize_optimization" = "xyes"],
[AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])])
Introduce weston-launch weston-launch starts weston and provides mechanism for weston to set/drop drm master, open a tty, and read input devices without being root. Execution is allowed for local-active sessions or users in the group weston-launch.
13 years ago
AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes)
AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch == xyes)
if test x$enable_weston_launch == xyes; then
build: Add (and use) an AC_SEARCH_LIBS wrapper AC_SEARCH_LIBS is the recommended macro for these checks, unfortunately, we use AC_CHECK_LIB instead, and even AC_CHECK_FUNC, when only one AC_SEARCH_LIBS would be enough. This wrapper macro is used much like PKG_CHECK_MODULES, as it defines (and AC_SUBST) the PREFIX_LIBS variable itself. It also avoids adding unnecessary stuff to LIBS. Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no])
Introduce weston-launch weston-launch starts weston and provides mechanism for weston to set/drop drm master, open a tty, and read input devices without being root. Execution is allowed for local-active sessions or users in the group weston-launch.
13 years ago
if test x$have_pam == xno; then
AC_ERROR([weston-launch requires pam])
fi
fi
editor: add support for pre-edit styling Add pango dependency to the example and use pango for text handling. Signed-off-by: Jan Arne Petersen <jpetersen@openismus.com>
12 years ago
AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes")
clients/nested: Fix compilation
12 years ago
AM_CONDITIONAL(HAVE_CAIRO_GLESV2,
[test "x$have_cairo_egl" = "xyes" -a "x$cairo_modules" = "xcairo-glesv2" -a "x$enable_egl" = "xyes"])
configure: toytoolkit GL apps depend on cairo-egl Do not build toytoolkit applications that use GL, if Cairo-egl is not available. These applications (which happen to be also the full GL clients) do not work at all without Cairo-egl, and fail at runtime with "unable to acquire window surface". Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
13 years ago
AM_CONDITIONAL(BUILD_FULL_GL_CLIENTS,
Make EGL/GLESv2 dependencies optional Introduce --disable-egl switch for configure to disable EGL/GLESv2 support. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
12 years ago
test x$cairo_modules = "xcairo-gl" -a "x$have_cairo_egl" = "xyes" -a "x$enable_egl" = "xyes")
configure: toytoolkit GL apps depend on cairo-egl Do not build toytoolkit applications that use GL, if Cairo-egl is not available. These applications (which happen to be also the full GL clients) do not work at all without Cairo-egl, and fail at runtime with "unable to acquire window surface". Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
13 years ago
clients: add subsurfaces demo Add a demo program with: - a main surface (green) - a Cairo-image sub-surface (red) - a raw GLESv2 widget (triangle) Sub-surface input region is set empty to avoid problems in toytoolkit. If Cairo links to libGL, then we will end up with also libGLESv2 linked to subsurfaces program, and both libs getting really used, which leads to disaster. Do not build subsurfaces demo, if Cairo links to libGL and cairo-egl is usable. The GL rendering loop is not tied to the toytoolkit or the widget, but runs directly from its own frame callback. Therefore it runs independent of the rest of the application. This also relies on one of two things: - eglSwapInterval(0) is implemented, and therefore eglSwapBuffers never blocks indefinitely, or - toytoolkit has a workaround, that guarantees that eglSwapBuffers will return soon, when we force a repaint on resize. Otherwise the demo will deadlock. The code is separated into three sections: 1. The library component, using only EGL, GLESv2, and libwayland-client APIs, and not aware of any toolkit details of the parent application. This runs independently until the parent application tells otherwise. 2. The glue code: a toytoolkit application widget, who has its own rendering machinery. 3. The application written in toytoolkit. This patch also adds new toytoolkit interfaces: - widget_get_wl_surface() - widget_get_last_time() - widget_input_region_add() Toytoolkit applications have not had a possibility to change the input region. The frame widget (decorations) set the input region on its own when used, otherwise the default input region of everything has been used. If a window does not have a frame widget, it can now use widget_input_region_add() to set a custom input region. These are not window methods, because a widget may lie on a different wl_surface (sub-surface) than the window. Changes in v3: - replace set_commit_mode with set_sync and set_desync Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
AM_CONDITIONAL(BUILD_SUBSURFACES_CLIENT,
[test '(' "x$have_cairo_egl" != "xyes" -o "x$cairo_modules" = "xcairo-glesv2" ')' -a "x$enable_simple_egl_clients" = "xyes"])
compositor: Split backends into modules
14 years ago
AM_CONDITIONAL(ENABLE_DESKTOP_SHELL, true)
Add a wl_fullscreen_shell implementation Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
11 years ago
AC_ARG_ENABLE(fullscreen-shell,
AS_HELP_STRING([--disable-fullscreen-shell],
[do not build fullscreen-shell server plugin]),,
enable_fullscreen_shell=yes)
AM_CONDITIONAL(ENABLE_FULLSCREEN_SHELL,
test "x$enable_fullscreen_shell" = "xyes")
Add a colord implementation of a CMS plugin for weston This allows users to change the assigned display profile in GNOME (using gnome-control-center) or KDE (using colord-kde) and also allows the profiling tools to correctly inhibit the calibration state whilst measuring the native screen response.
12 years ago
# CMS modules
AC_ARG_ENABLE(colord,
AS_HELP_STRING([--disable-colord],
[do not build colord CMS support]),,
Don't fail if colord or libunwind are not present This patch adds auto detection for presence of the colord and libunwind packages.
12 years ago
enable_colord=auto)
if test "x$enable_colord" != "xno"; then
PKG_CHECK_MODULES(COLORD,
colord >= 0.1.27,
have_colord=yes,
have_colord=no)
if test "x$have_colord" = "xno" -a "x$enable_colord" = "xyes"; then
AC_MSG_ERROR([colord support explicitly requested, but colord couldn't be found])
fi
if test "x$have_colord" = "xyes"; then
enable_colord=yes
fi
Add a colord implementation of a CMS plugin for weston This allows users to change the assigned display profile in GNOME (using gnome-control-center) or KDE (using colord-kde) and also allows the profiling tools to correctly inhibit the calibration state whilst measuring the native screen response.
12 years ago
fi
configure.ac: Set automake conditional after testing for colord pkg
12 years ago
AM_CONDITIONAL(ENABLE_COLORD, test "x$enable_colord" = "xyes")
wcap: Add option to disable building wcap tools
13 years ago
Add optional dbus helpers This adds optional libdbus integration for weston. If libdbus is available and not disabled via --disable-dbus during weston build, we now provide basic DBusConnection main-loop integration for weston. The dbus.c file provides a new helper to integrate any DBusConnection object into a wl_event_loop object. This avoids any glib/qt/.. dependencies but instead only uses the low-level libdbus library. Note that we do not provide dummy fallbacks for dbus helpers in case dbus-support is disabled. The reason for that is that you need dbus/dbus.h for nearly any operation you want to do via dbus. Therefore, only the most basic helpers which can be used independently provide a "static inline" dummy fallback to avoid #ifdef all over the code.
11 years ago
# dbus support
AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
[do not build with dbus support]),,
enable_dbus=auto)
if test "x$enable_dbus" != "xno"; then
PKG_CHECK_MODULES(DBUS,
dbus-1 >= 1.6,
have_dbus=yes,
have_dbus=no)
if test "x$have_dbus" = "xno" -a "x$enable_dbus" = "xyes"; then
AC_MSG_ERROR([dbus support explicitly requested, but libdbus couldn't be found])
fi
if test "x$have_dbus" = "xyes"; then
enable_dbus=yes
AC_DEFINE([HAVE_DBUS], [1], [Build with dbus support])
else
enable_dbus=no
fi
fi
AM_CONDITIONAL(ENABLE_DBUS, test "x$enable_dbus" = "xyes")
build: Require dbus for systemd-login systemd-login support requires dbus (see "dbus.h" header in "launcher-logind.c") but the configure script was only checking libsystemd-login availability to define the HAVE_SYSTEMD_LOGIN macro, which results in undefined symbols in launcher-unit. Put the systemd-login checks after the dbus ones, and only run the checks if it is present. Also mention dbus in the error message if "--enable-systemd-login" was forced. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
# systemd-login support
AC_ARG_ENABLE(systemd-login,
AS_HELP_STRING([--enable-systemd-login],
[Enable logind support]),,
enable_systemd_login=auto)
if test x$enable_systemd_login != xno -a x$have_dbus != xno; then
PKG_CHECK_MODULES(SYSTEMD_LOGIN,
[libsystemd >= 209],
[have_systemd_login_209=yes;have_systemd_login=yes],
[have_systemd_login_209=no;have_systemd_login=no])
# Older versions of systemd package systemd-login separately. Fall back on that
AS_IF([test x$have_systemd_login != xyes],[
PKG_CHECK_MODULES(SYSTEMD_LOGIN,
[libsystemd-login >= 198],
[have_systemd_login=yes],
[have_systemd_login=no])
])
else
have_systemd_login=no
fi
if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then
AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209, libsystemd-login or dbus])
fi
AS_IF([test "x$have_systemd_login" = "xyes"],
[AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])])
AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes")
AS_IF([test "x$have_systemd_login_209" = "xyes"],
[AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])])
Enables output in the JUnit XML format. Adds basic support for optionally outputting in the XML format commonly used by JUnit compatible tools. This format is supported by default by many tools, including the Jenkins build system. It also is more detailed and captures more information than the more simplistic TAP format. Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
# Note that other features might want libxml2, or this feature might use
# alternative xml libraries at some point. Therefore the feature and
# pre-requisite concepts are split.
AC_ARG_ENABLE(junit_xml,
AS_HELP_STRING([--disable-junit-xml],
[do not build with JUnit XML output]),,
enable_junit_xml=auto)
if test "x$enable_junit_xml" != "xno"; then
PKG_CHECK_MODULES(LIBXML2,
[libxml-2.0 >= 2.6],
have_libxml2=yes,
have_libxml2=no)
if test "x$have_libxml2" = "xno" -a "x$enable_junit_xml" = "xyes"; then
AC_MSG_ERROR([JUnit XML support explicitly requested, but libxml2 couldn't be found])
fi
if test "x$have_libxml2" = "xyes"; then
enable_junit_xml=yes
AC_DEFINE(ENABLE_JUNIT_XML, [1], [Build Weston with JUnit output support])
else
enable_junit_xml=no
fi
fi
AM_CONDITIONAL(ENABLE_JUNIT_XML, test "x$enable_junit_xml" = "xyes")
ivi-shell: add IVI layout APIs - ivi-layout.so - introduces ivi-layout-export.h, ivi-layout.[ch] API set of controlling properties of surface and layer which groups surfaces. An unique ID whose type is integer is required to create surface and layer. With the unique ID, surface and layer are identified to control them. The API set consists of APIs to control properties of surface and layers about followings, - visibility. - opacity. - clipping (x,y,width,height). - position and size of it to be displayed. - orientation per 90 degree. - add or remove surfaces to a layer. - order of surfaces/layers in layer/screen to be displayed. - commit to apply property changes. - notifications of property change. Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years ago
# ivi-shell support
AC_ARG_ENABLE(ivi-shell,
AS_HELP_STRING([--disable-ivi-shell],
[do not build ivi-shell server plugin and client]),,
enable_ivi_shell=yes)
AM_CONDITIONAL(ENABLE_IVI_SHELL, test "x$enable_ivi_shell" = "xyes")
wcap: Add option to disable building wcap tools
13 years ago
AC_ARG_ENABLE(wcap-tools, [ --disable-wcap-tools],, enable_wcap_tools=yes)
AM_CONDITIONAL(BUILD_WCAP_TOOLS, test x$enable_wcap_tools = xyes)
if test x$enable_wcap_tools = xyes; then
AC_DEFINE([BUILD_WCAP_TOOLS], [1], [Build the wcap tools])
configure.ac: Don't require vpx now that we don't build the webm encoder
12 years ago
PKG_CHECK_MODULES(WCAP, [cairo])
wcap: Add option to disable building wcap tools
13 years ago
WCAP_LIBS="$WCAP_LIBS -lm"
fi
configure: make setbacklight optional Modify the pkg-config check for setbacklight so that failure only disables building setbacklight, instead of failing the whole configure. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
PKG_CHECK_MODULES(SETBACKLIGHT, [libudev libdrm], enable_setbacklight=yes, enable_setbacklight=no)
AM_CONDITIONAL(BUILD_SETBACKLIGHT, test "x$enable_setbacklight" = "xyes")
wcap: Add option to disable building wcap tools
13 years ago
fix configure check for gcc This shouldn't fail just because someone sets CC=gcc-4.5 explicitly. Besides, this way it also works with compilers that advertise GCC-compatibility like clang and ICC.
14 years ago
if test "x$GCC" = "xyes"; then
configure: remove C++ support With the Android backend gone, there is no C++ code anymore. Remove support for C++ in the build. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
GCC_CFLAGS="-Wall -Wextra -Wno-unused-parameter \
Build: Silence shift-negative-value warning Pixman's headers include a representation of -1 in fixed-point, which is -1 << 16. This trips a GCC warning about shifting negative values. As we can't do much about it, just silence the warning. Signed-off-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
9 years ago
-Wno-shift-negative-value -Wno-missing-field-initializers \
-g -fvisibility=hidden \
build: Add -Wsign-compare to GCC flags
11 years ago
-Wstrict-prototypes -Wmissing-prototypes -Wsign-compare"
Use autoconf instead of $(shell ...) in the Makefile.
16 years ago
fi
AC_SUBST(GCC_CFLAGS)
Don't fail if colord or libunwind are not present This patch adds auto detection for presence of the colord and libunwind packages.
12 years ago
AC_ARG_ENABLE(libunwind,
AS_HELP_STRING([--disable-libunwind],
[Disable libunwind usage for backtraces]),,
enable_libunwind=auto)
autotools: Add a libunwind configure switch Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
12 years ago
AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$enable_libunwind" = xyes])
Don't fail if colord or libunwind are not present This patch adds auto detection for presence of the colord and libunwind packages.
12 years ago
if test "x$enable_libunwind" != "xno"; then
PKG_CHECK_MODULES(LIBUNWIND,
libunwind,
have_libunwind=yes,
have_libunwind=no)
if test "x$have_libunwind" = "xno" -a "x$enable_libunwind" = "xyes"; then
AC_MSG_ERROR([libunwind support explicitly requested, but libunwind couldn't be found])
fi
if test "x$have_libunwind" = "xyes"; then
enable_libunwind=yes
AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])
fi
fi
compositor: Use libunwind if available for better backtraces libunwind has a dwarf parser and automatically queries the dlinfo for location of dlopened modules. The resulting backtrace is much better and includes stack frames in dynamically loaded modules. krh: Originally submitted for Xorg, adapted for weston: http://lists.x.org/archives/xorg-devel/2013-February/035493.html Note this require libunwind at least 1.1 to get the pkg-config files. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
12 years ago
build: make default backend configurable Instead of hardcoding drm-backend.so as the default if environment presents neither Wayland nor X11, have a ./configure option to change it. It still defaults to drm-backend.so, if not given. Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
12 years ago
if test "x$WESTON_NATIVE_BACKEND" = "x"; then
WESTON_NATIVE_BACKEND="drm-backend.so"
fi
AC_MSG_NOTICE([Weston's native backend: $WESTON_NATIVE_BACKEND])
AC_DEFINE_UNQUOTED([WESTON_NATIVE_BACKEND], ["$WESTON_NATIVE_BACKEND"],
[The default backend to load, if not wayland nor x11.])
Make the default desktop shell client configurable The default can be set by passing WESTON_SHELL_CLIENT as an argument to configure, similarly to WESTON_NATIVE_BACKEND. Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
11 years ago
if test "x$WESTON_SHELL_CLIENT" = "x"; then
WESTON_SHELL_CLIENT="weston-desktop-shell"
fi
AC_MSG_NOTICE([Weston's default desktop shell client: $WESTON_SHELL_CLIENT])
AC_DEFINE_UNQUOTED([WESTON_SHELL_CLIENT], ["$WESTON_SHELL_CLIENT"],
[The default desktop shell client to load.])
build: Rename option and conditional for installing demo clients Previously the option was --enable-demo-clients and the conditional was ENABLE_DEMO_CLIENTS. They control whether or not we install the demo clients (ie all other clients than weston-terminal and weston-info). Rename the option and the conditional to better reflect this.
11 years ago
AC_ARG_ENABLE(demo-clients-install,
AS_HELP_STRING([--enable-demo-clients-install],
[Install demo clients built with weston]),,
build: fix commit that changed option for installing client Without this patch the option --enable-demo-clients-install does not install the client demos.
11 years ago
enable_demo_clients_install=no)
AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"])
autotools: Add an option to install demo clients This patch adds a configure option which will enable user to install demo clients if desired. It is disabled by default. v2: Remove AC_DEFINE as it is not necesary
11 years ago
configure.ac: add explicit enable/disable for lcms This is useful for reproducable builds. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
AC_ARG_ENABLE(lcms,
AS_HELP_STRING([--disable-lcms],
[Disable lcms support]),,
enable_lcms=auto)
if test "x$enable_lcms" != "xno"; then
PKG_CHECK_MODULES(LCMS,
lcms2,
have_lcms=yes,
have_lcms=no)
if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then
AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found])
fi
if test "x$have_lcms" = "xyes"; then
enable_lcms=yes
AC_DEFINE(HAVE_LCMS, 1, [Have lcms support])
fi
Add initial color management framework code ICC profiles can now be specified in weston.ini for each output, or a CMS implementation can optionally loaded from a pluggable module.
12 years ago
fi
configure.ac: add explicit enable/disable for lcms This is useful for reproducable builds. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes])
Add initial color management framework code ICC profiles can now be specified in weston.ini for each output, or a CMS implementation can optionally loaded from a pluggable module.
12 years ago
autotools: Fix AC_PATH_PROG call Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
11 years ago
AC_PATH_PROG([wayland_scanner], [wayland-scanner])
if test x$wayland_scanner = x; then
configure.ac: make use of wayland-scanner.pc Currently we use the wayland-scanner executable as found with AC_PATH_PROG, and then check the presence of wayland-scanner.pc Currently the latter is unused even if AC_PATH_PROG fails to find the binary. Rework things to use the pkg-config variable as a fall-back. Cc: Andrew Oakley <aoakley@espial.com> Cc: Bill Spitzak <spitzak@gmail.com> Cc: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Andrew Oakley <aoakley@espial.com> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Quentin Glidic <sardemff7+wayland@sardemff7.net>
10 years ago
PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner])
wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
autotools: Fix AC_PATH_PROG call Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
11 years ago
fi
Split into a demo repository that holds the demo compositor and clients
14 years ago
compositor: systemd notifications support Add systemd status and watchdog notification support. Feature is not compiled by default and can be enabled by "--enable-systemd-notify" configuration flag. It compiles into module "systemd-notify.so" and can be loaded by adding it in weston.ini like any other module, i.e. "modules=systemd-notify.so". Watchdog timeout equals to half of timeout defined by "WATCHDOG_USEC" environment variable, which is set by "WatchdogSec=" setting in service file. Signed-off-by: Egor Starkov <egor.starkov@ge.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
9 years ago
AC_ARG_ENABLE(systemd_notify,
AS_HELP_STRING([--enable-systemd-notify],
[Enables systemd notifications to
notify systemd about weston state
systemd: take over sockets created by systemd Systemd provides a feature of socket-based activation, details in [1] This commit adds an implementation to check if sockets were provided by systemd and adds this as an additional socket to wayland display. before adding sockets are checked for the correctness: only AF_UNIX of type SOCK_STREAM are accepted This is usefull for early rendering use-cases where weston and early-rendering-application can be started parallel. [1] https://www.freedesktop.org/software/systemd/man/systemd.socket.html Signed-off-by: Eugen Friedrich <efriedrich@de.adit-jv.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
and update watchdog.
Also sockets provided by systemd
in case of socket-base activation
are added to wayland display]),,
compositor: systemd notifications support Add systemd status and watchdog notification support. Feature is not compiled by default and can be enabled by "--enable-systemd-notify" configuration flag. It compiles into module "systemd-notify.so" and can be loaded by adding it in weston.ini like any other module, i.e. "modules=systemd-notify.so". Watchdog timeout equals to half of timeout defined by "WATCHDOG_USEC" environment variable, which is set by "WatchdogSec=" setting in service file. Signed-off-by: Egor Starkov <egor.starkov@ge.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
9 years ago
enable_systemd_notify=no)
AM_CONDITIONAL(SYSTEMD_NOTIFY_SUPPORT, test x$enable_systemd_notify = xyes)
if test "x$enable_systemd_notify" = "xyes"; then
AC_DEFINE([SYSTEMD_NOTIFY_SUPPORT], [1], [Build the systemd sd_notify support])
PKG_CHECK_MODULES(SYSTEMD_DAEMON, [libsystemd])
fi
Rename src/ to libweston/ This clarifies what is supposed to be the libweston code. v2: screen-share.c is already in compositor/ instead. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Acked-by: Daniel Stone <daniels@collabora.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Benoit Gschwind <gschwind@gnu-log.net> Acked-by: Benoit Gschwind <gschwind@gnu-log.net> [Pekka: rebased]
9 years ago
AC_CONFIG_FILES([Makefile libweston/version.h compositor/weston.pc])
build: Only regenerate src/git-version.h when .git/logs/HEAD changes We rely on .git/logs/HEAD to be a file that changes when we commit to HEAD. The first idea is to make the makefile rule depend on .git/HEAD, but that's a symbolic ref that points to the current ref in refs/heads. However, .git/logs/HEAD changes whenever we commit to HEAD, so we can use that in the makefile rule.
11 years ago
Create a libweston-0.so This commit also adds a libweston-0.pc file. The -0 is the abi version introduced in the previous patch. Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
# AC_CONFIG_FILES needs the full name when running autoconf, so we need to use
# libweston_abi_version here, and outside [] because of m4 quoting rules
libweston: use new versioning scheme Use the documented libweston-$major.so.0.$minor.$patch scheme. An (almost) identical one is used by GLIB, GDK{2,3}, QT5, json-glib and others. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
8 years ago
AC_CONFIG_FILES([libweston/libweston-]libweston_major_version[.pc:libweston/libweston.pc.in])
Create a libweston-0.so This commit also adds a libweston-0.pc file. The -0 is the abi version introduced in the previous patch. Signed-off-by: Giulio Camuffo <giuliocamuffo@gmail.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
build: Only regenerate src/git-version.h when .git/logs/HEAD changes We rely on .git/logs/HEAD to be a file that changes when we commit to HEAD. The first idea is to make the makefile rule depend on .git/HEAD, but that's a symbolic ref that points to the current ref in refs/heads. However, .git/logs/HEAD changes whenever we commit to HEAD, so we can use that in the makefile rule.
11 years ago
AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD])
Install libraries plus headers and add pkg-config files.
16 years ago
AC_OUTPUT
autotools: Add configure summary
11 years ago
AC_MSG_RESULT([
Native Backend ${WESTON_NATIVE_BACKEND}
setuid Install ${enable_setuid_install}
Cairo Renderer ${with_cairo}
EGL ${enable_egl}
libxkbcommon ${enable_xkbcommon}
configure.ac: Report if built with XCB-XKB or not Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
11 years ago
xcb_xkb ${have_xcb_xkb}
autotools: Add configure summary
11 years ago
XWayland ${enable_xwayland}
Add optional dbus helpers This adds optional libdbus integration for weston. If libdbus is available and not disabled via --disable-dbus during weston build, we now provide basic DBusConnection main-loop integration for weston. The dbus.c file provides a new helper to integrate any DBusConnection object into a wl_event_loop object. This avoids any glib/qt/.. dependencies but instead only uses the low-level libdbus library. Note that we do not provide dummy fallbacks for dbus helpers in case dbus-support is disabled. The reason for that is that you need dbus/dbus.h for nearly any operation you want to do via dbus. Therefore, only the most basic helpers which can be used independently provide a "static inline" dummy fallback to avoid #ifdef all over the code.
11 years ago
dbus ${enable_dbus}
autotools: Add configure summary
11 years ago
ivi-shell: add IVI layout APIs - ivi-layout.so - introduces ivi-layout-export.h, ivi-layout.[ch] API set of controlling properties of surface and layer which groups surfaces. An unique ID whose type is integer is required to create surface and layer. With the unique ID, surface and layer are identified to control them. The API set consists of APIs to control properties of surface and layers about followings, - visibility. - opacity. - clipping (x,y,width,height). - position and size of it to be displayed. - orientation per 90 degree. - add or remove surfaces to a layer. - order of surfaces/layers in layer/screen to be displayed. - commit to apply property changes. - notifications of property change. Signed-off-by: Nobuhiko Tanibata <NOBUHIKO_TANIBATA@xddp.denso.co.jp> Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
10 years ago
ivi-shell ${enable_ivi_shell}
autotools: Add configure summary
11 years ago
Build wcap utility ${enable_wcap_tools}
Add a wl_fullscreen_shell implementation Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
11 years ago
Build Fullscreen Shell ${enable_fullscreen_shell}
Adding doxygen setup and info for the testing framework. Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
Enable developer documentation ${enable_devdocs}
autotools: Add configure summary
11 years ago
weston-launch utility ${enable_weston_launch}
launcher: add logind backend Instead of connecting to weston-launch from launcher-util, we now try to connect to logind first. If logind provides session-devices, we use them. If not, we fall back to the old weston-launch facility.
11 years ago
systemd-login support ${have_systemd_login}
compositor: systemd notifications support Add systemd status and watchdog notification support. Feature is not compiled by default and can be enabled by "--enable-systemd-notify" configuration flag. It compiles into module "systemd-notify.so" and can be loaded by adding it in weston.ini like any other module, i.e. "modules=systemd-notify.so". Watchdog timeout equals to half of timeout defined by "WATCHDOG_USEC" environment variable, which is set by "WatchdogSec=" setting in service file. Signed-off-by: Egor Starkov <egor.starkov@ge.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
9 years ago
systemd notify support ${enable_systemd_notify}
autotools: Add configure summary
11 years ago
DRM Compositor ${enable_drm_compositor}
X11 Compositor ${enable_x11_compositor}
Wayland Compositor ${enable_wayland_compositor}
Headless Compositor ${enable_headless_compositor}
FBDEV Compositor ${enable_fbdev_compositor}
RDP Compositor ${enable_rdp_compositor}
Add a screen sharing plugin This adds a plugin called screen-share.so. If the screen-share.so module is imported, it will add the CTRL+ALT+s keybinding to start a screen sharing session. If you press CTRL+ALT+S, weston will spawn another copy of weston, this time with the RDP backend, and mirrors the current screen to it and adds any seats from RDP as aditional seats. The current screen is defined as the one with the mouse pointer. Currently the CTRL+ALT+s keybinding is hardcoded as the only way to activate screen sharing. If, at some point, shells want more control over the screen sharing process, the API's should be easy to update and export to make this possible. For security, the command and path to weston is currently hard-coded. It would not take much aditional code to make this configurable or to allow a shell to launch other screen-sharing programs. However, handling those security issues is outside the scope of this patch so it is hard-coded for now. Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
11 years ago
Screen Sharing ${enable_screen_sharing}
Enables output in the JUnit XML format. Adds basic support for optionally outputting in the XML format commonly used by JUnit compatible tools. This format is supported by default by many tools, including the Jenkins build system. It also is more detailed and captures more information than the more simplistic TAP format. Signed-off-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
9 years ago
JUnit XML output ${enable_junit_xml}
autotools: Add configure summary
11 years ago
Build Clients ${enable_clients}
Build EGL Clients ${have_cairo_egl}
Build Simple Clients ${enable_simple_clients}
Build Simple EGL Clients ${enable_simple_egl_clients}
build: fix commit that changed option for installing client Without this patch the option --enable-demo-clients-install does not install the client demos.
11 years ago
Install Demo Clients ${enable_demo_clients_install}
autotools: Add configure summary
11 years ago
Colord Support ${have_colord}
LCMS2 Support ${have_lcms}
configure: Make jpeglib an optional dependency. It doesn’t make sense to fail the entire build when jpeglib isn’t present, so this commit makes it optional just like libwebp in the previous one, disabled with --without-jpeg and forced with --with-jpeg. Signed-off-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
9 years ago
libjpeg Support ${have_jpeglib}
autotools: Add configure summary
11 years ago
libwebp Support ${have_webp}
libunwind Support ${have_libunwind}
compositor-drm: Add hardware accelerated capture of screen using libva This patch adds a feature to the DRM backend that uses libva for encoding the screen contents in H.264. Screen recording can be activated by pressing mod-shift-space q. A file named capture.h264 will be created in the current directory, which can be muxed into an MP4 file with gstreamer using gst-launch filesrc location=capture.h264 ! h264parse ! mp4mux ! \ filesink location=file.mp4 This is limitted to the DRM compositor in order to avoid a copy when submitting the front buffer to libva. The code in vaapi-recorder.c takes a dma_buf fd referencing it, does a colorspace conversion using the video post processing pipeline and then uses that as input to the encoder. I'm sending this now so I get comments, but this is not ready for prime time yet. I have a somewhat consistent GPU hang when using i915 with SandyBridge. Sometimes a page flip never completes. If you want to try this anyway and your system get stuck, you might need to run the following: # echo 1 > /sys/kernel/debug/dri/0/i915_wedged After that, alt-sysrq [rv] should work. Once that's fixed it would also be good to make the parameters used by the encoder more flexible. For now the QP parameter is hardcoded to 0 and we have only I and P frames (no B frames), which causes the resulting files to be very large.
11 years ago
VA H.264 encoding Support ${have_libva}
autotools: Add configure summary
11 years ago
])