xserver: Branch 'master' - 3 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Jun 1 20:40:13 UTC 2020
glx/meson.build | 1 +
hw/xfree86/dixmods/meson.build | 2 +-
include/meson.build | 6 +++---
meson.build | 6 ++++--
meson_options.txt | 1 +
os/xsha1.c | 9 +++++++++
6 files changed, 19 insertions(+), 6 deletions(-)
New commits:
commit b5b529799a20f8a262066daeb726307c0631f208
Author: Jan Beich <jbeich at FreeBSD.org>
Date: Sun Feb 9 15:28:10 2020 +0000
meson: split udev from udev_kms which requires systemd
DragonFly and FreeBSD can use xf86-input-libinput with config/udev.
ld: error: undefined symbol: xf86PlatformDeviceProbe
>>> referenced by xf86platformBus.c
>>> xf86platformBus.c.o:(xf86platformProbe) in archive hw/xfree86/common/libxorg_common.a
ld: error: undefined symbol: xf86PlatformDeviceCheckBusID
>>> referenced by xf86platformBus.c
>>> xf86platformBus.c.o:(xf86platformProbeDev) in archive hw/xfree86/common/libxorg_common.a
ld: error: undefined symbol: xf86PlatformReprobeDevice
>>> referenced by xf86platformBus.c
>>> xf86platformBus.c.o:(xf86platformVTProbe) in archive hw/xfree86/common/libxorg_common.a
ld: error: undefined symbol: NewGPUDeviceRequest
>>> referenced by udev.c
>>> udev.c.o:(device_added) in archive config/liblibxserver_config.a
ld: error: undefined symbol: DeleteGPUDeviceRequest
>>> referenced by udev.c
>>> udev.c.o:(device_removed) in archive config/liblibxserver_config.a
diff --git a/include/meson.build b/include/meson.build
index ed9b3619e..0b89499c0 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -86,7 +86,7 @@ conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
# Note: this symbol is used by libXtrans.
conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found())
conf_data.set('CONFIG_UDEV', build_udev)
-conf_data.set('CONFIG_UDEV_KMS', build_udev)
+conf_data.set('CONFIG_UDEV_KMS', build_udev_kms)
conf_data.set('HAVE_DBUS', build_dbus)
conf_data.set('CONFIG_HAL', build_hal)
conf_data.set('SYSTEMD_LOGIND', build_systemd_logind)
@@ -310,7 +310,7 @@ conf_data.set('PCVT_SUPPORT', supports_pcvt)
conf_data.set('SYSCONS_SUPPORT', supports_syscons)
conf_data.set('WSCONS_SUPPORT', supports_wscons)
conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess'))
-conf_data.set('XSERVER_PLATFORM_BUS', build_udev)
+conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms)
configure_file(output : 'dix-config.h',
configuration : conf_data)
@@ -359,7 +359,7 @@ xorg_data.set_quoted('DEFAULT_LIBRARY_PATH', join_paths(get_option('prefix'), ge
xorg_data.set_quoted('__XSERVERNAME__', 'Xorg')
xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess'))
xorg_data.set_quoted('PCI_TXT_IDS_PATH', '')
-xorg_data.set('XSERVER_PLATFORM_BUS', build_udev)
+xorg_data.set('XSERVER_PLATFORM_BUS', build_udev_kms)
xorg_data.set('WSCONS_SUPPORT', host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd')
xorg_data.set('HAVE_STROPTS_H', cc.has_header('stropts.h'))
xorg_data.set('HAVE_SYS_KD_H', cc.has_header('sys/kd.h'))
diff --git a/meson.build b/meson.build
index 32ce9f042..dd3ef8fd6 100644
--- a/meson.build
+++ b/meson.build
@@ -163,13 +163,15 @@ hal_option = get_option('hal')
glamor_option = get_option('glamor')
build_udev = get_option('udev')
+build_udev_kms = get_option('udev_kms')
if host_machine.system() == 'windows' or host_machine.system() == 'darwin'
build_udev = false
+ build_udev_kms = false
hal_option = 'false'
endif
if get_option('systemd_logind') == 'auto'
- build_systemd_logind = build_udev and dbus_dep.found()
+ build_systemd_logind = build_udev_kms and dbus_dep.found()
else
build_systemd_logind = get_option('systemd_logind') == 'true'
endif
@@ -303,7 +305,7 @@ endif
build_dbus = build_hal or build_systemd_logind
udev_dep = dependency('', required:false)
-if build_udev
+if build_udev or build_udev_kms
udev_dep = dependency('libudev', version: '>= 143')
endif
diff --git a/meson_options.txt b/meson_options.txt
index c9b97727b..0e123f450 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -68,6 +68,7 @@ option('suid_wrapper', type: 'boolean', value: 'false',
option('pciaccess', type: 'boolean', value: 'true',
description: 'Xorg pciaccess support')
option('udev', type: 'boolean', value: 'true')
+option('udev_kms', type: 'boolean', value: 'true')
option('hal', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Enable HAL integration')
option('systemd_logind', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
commit be731e0bdc7d76ad3782d5b533b6bcc8378f41ad
Author: Jan Beich <jbeich at FreeBSD.org>
Date: Sun Feb 9 15:12:39 2020 +0000
glx: unbreak on Unix without /usr/include/drm
In file included from ../glx/glxdri2.c:35:
/usr/local/include/GL/internal/dri_interface.h:43:10: fatal error: 'drm.h' file not found
#include <drm.h>
^~~~~~~
In file included from ../glx/glxdriswrast.c:39:
/usr/local/include/GL/internal/dri_interface.h:43:10: fatal error: 'drm.h' file not found
#include <drm.h>
^~~~~~~
diff --git a/glx/meson.build b/glx/meson.build
index 1140522f6..292e7a59d 100644
--- a/glx/meson.build
+++ b/glx/meson.build
@@ -38,6 +38,7 @@ if build_glx
dependencies: [
common_dep,
dl_dep,
+ dri_dep,
dependency('glproto', version: '>= 1.4.17'),
dependency('gl', version: '>= 1.2'),
],
diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index e4ac02228..a1afbe8b9 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -33,7 +33,7 @@ if build_glx
include_directories: [ inc, xorg_inc, glx_inc ],
c_args: [ xorg_c_args, glx_align64 ],
- dependencies: [ common_dep, dl_dep ],
+ dependencies: [ common_dep, dl_dep, dri_dep ],
link_whole: libxserver_glx,
link_with: e,
commit f2cf236da8e8fefd6f503ceb0a448c5ad9651024
Author: Jan Beich <jbeich at FreeBSD.org>
Date: Sat Nov 16 18:40:36 2019 +0000
os: unbreak xsha1 on FreeBSD
../os/xsha1.c:36:10: fatal error: 'sha1.h' file not found
#include <sha1.h>
^~~~~~~~
../os/xsha1.c:45:5: error: implicit declaration of function 'SHA1Init' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
SHA1Init(ctx);
^
../os/xsha1.c:54:5: error: implicit declaration of function 'SHA1Update' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
SHA1Update(sha1_ctx, data, size);
^
../os/xsha1.c:63:5: error: implicit declaration of function 'SHA1Final' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
SHA1Final(result, sha1_ctx);
^
diff --git a/os/xsha1.c b/os/xsha1.c
index c54e68c83..a160b7eb4 100644
--- a/os/xsha1.c
+++ b/os/xsha1.c
@@ -33,7 +33,16 @@
#if defined(HAVE_SHA1_IN_LIBMD) /* Use libmd for SHA1 */ \
|| defined(HAVE_SHA1_IN_LIBC) /* Use libc for SHA1 */
+#if defined(__DragonFly__) || defined(__FreeBSD__)
+#include <sha.h>
+#define SHA1End SHA1_End
+#define SHA1File SHA1_File
+#define SHA1Final SHA1_Final
+#define SHA1Init SHA1_Init
+#define SHA1Update SHA1_Update
+#else
#include <sha1.h>
+#endif
void *
x_sha1_init(void)
More information about the xorg-commit
mailing list