xserver: Branch 'master' - 6 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Aug 2 14:29:23 UTC 2018
configure.ac | 9 ---------
hw/kdrive/src/meson.build | 2 --
hw/xfree86/common/xf86Events.c | 6 ------
hw/xfree86/common/xf86Init.c | 8 --------
hw/xfree86/os-support/meson.build | 12 +++++++++++-
include/meson.build | 26 +++++++++++++++++++++-----
include/xorg-config.h.in | 3 ---
include/xorg-config.h.meson.in | 3 ---
8 files changed, 32 insertions(+), 37 deletions(-)
New commits:
commit c20e7b5e2222c0cae2a487264748fa5db711e6e4
Author: Eric Anholt <eric at anholt.net>
Date: Wed Aug 1 13:49:54 2018 -0700
meson: Automatically detect HAVE_PTHREAD_SETNAME_NP
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/include/meson.build b/include/meson.build
index 6ed7cc6ca..678555692 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -58,7 +58,23 @@ conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
# XXX: HAVE_LIBDISPATCH
conf_data.set_quoted('OSNAME', 'Linux') # XXX
conf_data.set('HAVE_INPUTTHREAD', '1') # XXX
-conf_data.set('HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID', '1') # XXX
+
+if cc.compiles('''
+ #define _GNU_SOURCE 1
+ #include <pthread.h>
+ void foo(int bar) { pthread_setname_np(pthread_self(), "example"); }
+''',
+ name: 'pthread_setname_np(tid, name)')
+ conf_data.set('HAVE_PTHREAD_SETNAME_NP_WITH_TID', 1)
+elif cc.compiles('''
+ #define _GNU_SOURCE 1
+ #include <pthread.h>
+ void foo(int bar) { pthread_setname_np("example"); }
+''',
+ name: 'pthread_setname_np(name)')
+ conf_data.set('HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID', 1)
+endif
+
conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
# XXX: HAVE_SYSTEMD_DAEMON
conf_data.set('CONFIG_UDEV', build_udev)
commit 86c9245838b95e8a0c37fa61d835112933c738f0
Author: Eric Anholt <eric at anholt.net>
Date: Wed Aug 1 13:49:53 2018 -0700
meson: Try to hook up BSD APM build configuration.
I don't have a BSD to test on, but this should do the same as what
autotools did.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 0e021dbe1..fb282be82 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -85,10 +85,17 @@ elif host_machine.system().endswith('bsd')
'bsd/bsd_VTsw.c',
'bsd/bsd_bell.c',
'bsd/bsd_init.c',
- 'shared/pm_noop.c',
]
- # XXX: APM
+ if cc.has_header('machine/apmvar.h')
+ if cc.has_header('sys/event.h')
+ srcs_xorg_os_support += 'bsd/bsd_kqueue_apm.c'
+ else
+ srcs_xorg_os_support += 'bsd/bsd_apm.c'
+ endif
+ else
+ srcs_xorg_os_support += 'shared/pm_noop.c'
+ endif
if host_machine.cpu_family() == 'x86_64'
srcs_xorg_os_support += 'bsd/i386_video.c'
commit accd32a466a1a87ab45b5422dff2ef5a9c867049
Author: Eric Anholt <eric at anholt.net>
Date: Wed Aug 1 13:49:52 2018 -0700
xorg: Remove the XF86PM define.
We already have pm_noop.c being built most of the time for the
no-OS-PM case, so just switch to always using it.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/configure.ac b/configure.ac
index e0ebc78a1..350c89a3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1915,9 +1915,6 @@ if test "x$XORG" = xyes; then
esac
dnl APM header
AC_CHECK_HEADERS([linux/apm_bios.h], [linux_apm=$enable_linux_apm])
- if test "x$linux_apm" = xyes -o "x$linux_acpi" = xyes; then
- AC_DEFINE(XF86PM, 1, [Support APM/ACPI power management in the server])
- fi
;;
freebsd* | kfreebsd*-gnu | dragonfly*)
XORG_OS_SUBDIR="bsd"
@@ -1926,15 +1923,10 @@ if test "x$XORG" = xyes; then
XORG_OS_SUBDIR="bsd"
;;
openbsd*)
- if test "x$ac_cv_BSD_APM" = xyes \
- -o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then
- XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
- fi
XORG_OS_SUBDIR="bsd"
;;
solaris*)
XORG_OS_SUBDIR="solaris"
- XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
AC_CHECK_HEADERS([sys/kd.h])
AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no])
# Check for minimum supported release
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 8a800bd8f..455a0eccb 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -86,9 +86,7 @@
#include "xf86platformBus.h"
#include "systemd-logind.h"
-#ifdef XF86PM
extern void (*xf86OSPMClose) (void);
-#endif
static void xf86VTSwitch(void);
@@ -396,11 +394,9 @@ xf86VTLeave(void)
if (!xf86VTSwitchAway())
goto switch_failed;
-#ifdef XF86PM
if (xf86OSPMClose)
xf86OSPMClose();
xf86OSPMClose = NULL;
-#endif
for (i = 0; i < xf86NumScreens; i++) {
/*
@@ -456,9 +452,7 @@ xf86VTEnter(void)
if (!xf86VTSwitchTo())
return;
-#ifdef XF86PM
xf86OSPMClose = xf86OSPMOpen();
-#endif
if (xorgHWAccess)
xf86EnableIO();
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 3c5cc7097..8773a47e8 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -92,9 +92,7 @@
#endif
#include <hotplug.h>
-#ifdef XF86PM
void (*xf86OSPMClose) (void) = NULL;
-#endif
static Bool xorgHWOpenConsole = FALSE;
/* Common pixmap formats */
@@ -397,9 +395,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
}
}
-#ifdef XF86PM
xf86OSPMClose = xf86OSPMOpen();
-#endif
xf86ExtensionInit();
@@ -626,7 +622,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
if (xorgHWOpenConsole)
xf86OpenConsole();
-#ifdef XF86PM
/*
should we reopen it here? We need to deal with an already opened
device. We could leave this to the OS layer. For now we simply
@@ -636,7 +631,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
xf86OSPMClose();
if ((xf86OSPMClose = xf86OSPMOpen()) != NULL)
xf86MsgVerb(X_INFO, 3, "APM registered successfully\n");
-#endif
/* Make sure full I/O access is enabled */
if (xorgHWAccess)
@@ -878,11 +872,9 @@ ddxGiveUp(enum ExitCode error)
xf86VGAarbiterFini();
-#ifdef XF86PM
if (xf86OSPMClose)
xf86OSPMClose();
xf86OSPMClose = NULL;
-#endif
for (i = 0; i < xf86NumScreens; i++) {
/*
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index b6e5c975d..0e021dbe1 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -45,6 +45,8 @@ if host_machine.system() == 'linux'
if build_acpi
srcs_xorg_os_support += 'linux/lnx_acpi.c'
endif
+ else
+ srcs_xorg_os_support += 'shared/pm_noop.c'
endif
elif host_machine.system() == 'solaris'
@@ -83,6 +85,7 @@ elif host_machine.system().endswith('bsd')
'bsd/bsd_VTsw.c',
'bsd/bsd_bell.c',
'bsd/bsd_init.c',
+ 'shared/pm_noop.c',
]
# XXX: APM
diff --git a/include/meson.build b/include/meson.build
index 81a48af96..6ed7cc6ca 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -323,7 +323,6 @@ 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('WSCONS_SUPPORT', host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd')
-xorg_data.set('XF86PM', build_apm or build_acpi)
if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
diff --git a/include/xorg-config.h.in b/include/xorg-config.h.in
index bf555eb95..e3000274d 100644
--- a/include/xorg-config.h.in
+++ b/include/xorg-config.h.in
@@ -148,9 +148,6 @@
/* Define to 1 if you have the `seteuid' function. */
#undef HAVE_SETEUID
-/* Support APM/ACPI power management in the server */
-#undef XF86PM
-
/* Fallback input driver if the assigned driver fails */
#undef FALLBACK_INPUT_DRIVER
diff --git a/include/xorg-config.h.meson.in b/include/xorg-config.h.meson.in
index 1e4213f9a..59f1c2a8d 100644
--- a/include/xorg-config.h.meson.in
+++ b/include/xorg-config.h.meson.in
@@ -142,9 +142,6 @@
/* Define to 1 if you have the `seteuid' function. */
#mesondefine HAVE_SETEUID
-/* Support APM/ACPI power management in the server */
-#mesondefine XF86PM
-
/* Fallback input driver if the assigned driver fails */
#mesondefine FALLBACK_INPUT_DRIVER
commit 708ddfbda1391468d66957e247f51854b39db5fa
Author: Eric Anholt <eric at anholt.net>
Date: Wed Aug 1 13:49:51 2018 -0700
automake,meson: Remove HAVE_LIBUDEV define.
CONFIG_UDEV and CONFIG_UDEV_KMS are the actual defines that are used
in the C code.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/configure.ac b/configure.ac
index 7d5cb0d4d..e0ebc78a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -859,7 +859,6 @@ fi
PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
if test "x$CONFIG_UDEV" = xauto; then
CONFIG_UDEV="$HAVE_LIBUDEV"
- AC_DEFINE(HAVE_LIBUDEV, 1, [Define to 1 if libudev is available.])
fi
AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])
if test "x$CONFIG_UDEV" = xyes; then
diff --git a/include/meson.build b/include/meson.build
index 9682827dd..81a48af96 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -61,7 +61,6 @@ conf_data.set('HAVE_INPUTTHREAD', '1') # XXX
conf_data.set('HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID', '1') # XXX
conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
# XXX: HAVE_SYSTEMD_DAEMON
-# XXX: HAVE_LIBUDEV
conf_data.set('CONFIG_UDEV', build_udev)
conf_data.set('CONFIG_UDEV_KMS', build_udev)
conf_data.set('HAVE_DBUS', build_dbus)
commit 7deaf990079b94c70d263d8f1e16bb954bd2917f
Author: Eric Anholt <eric at anholt.net>
Date: Wed Aug 1 13:49:50 2018 -0700
meson: Automatically detect support for XTRANS_SEND_FDs.
The SCM_RIGHTS flag seems to be the thing that xtrans depends on, and
meson makes the check easy without needing a build option.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/include/meson.build b/include/meson.build
index dfca3c340..9682827dd 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -156,8 +156,10 @@ conf_data.set('_XITYPEDEF_POINTER', '1')
conf_data.set('LISTEN_TCP', get_option('listen_tcp'))
conf_data.set('LISTEN_UNIX', get_option('listen_unix'))
conf_data.set('LISTEN_LOCAL', get_option('listen_local'))
-# XXX: Configurable?
-conf_data.set('XTRANS_SEND_FDS', '1')
+
+if cc.has_header_symbol('sys/socket.h', 'SCM_RIGHTS')
+ conf_data.set('XTRANS_SEND_FDS', '1')
+endif
conf_data.set('TCPCONN', '1')
conf_data.set('UNIXCONN', '1')
commit e3e5265743a3536f15c8b7ae521848a646cdc189
Author: Eric Anholt <eric at anholt.net>
Date: Wed Aug 1 13:49:49 2018 -0700
meson: Remove XXX for libconfig in kdrive.
This is already included in ephyr (the only kdrive server left)
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/kdrive/src/meson.build b/hw/kdrive/src/meson.build
index 06bc34e04..f57040745 100644
--- a/hw/kdrive/src/meson.build
+++ b/hw/kdrive/src/meson.build
@@ -11,8 +11,6 @@ if build_xv
srcs_kdrive += 'kxv.c'
endif
-#XXX: libconfig
-
kdrive = static_library('kdrive',
srcs_kdrive,
include_directories: inc,
More information about the xorg-commit
mailing list