Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -0,0 +1,66 @@
|
||||
Discover monotonic clock using compile-time check
|
||||
|
||||
monotonic clock check does not work when cross-compiling.
|
||||
|
||||
Upstream-Status: Denied [Does not work on OpenBSD]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
|
||||
|
||||
|
||||
Original patch follows:
|
||||
|
||||
When xorg-xserver is being cross-compiled, there is currently no way
|
||||
for us to detect whether the monotonic clock is available on the
|
||||
target system, because we aren't able to run a test program on the host
|
||||
system. Currently, in this situation, we default to not use the
|
||||
monotonic clock. One problem with this situation is that the user will
|
||||
be treated as idle when the date is updated.
|
||||
|
||||
To fix this situation, we now use a compile-time check to detect whether the
|
||||
monotonic clock is available. This check can run just fine when we are
|
||||
cross-compiling.
|
||||
|
||||
Signed-off-by: David James <davidjames at google.com>
|
||||
|
||||
Downloaded from
|
||||
https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
configure.ac | 17 +++++++----------
|
||||
1 file changed, 7 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index f7ab48c..26e85cd 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then
|
||||
CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
|
||||
fi
|
||||
|
||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
||||
#include <time.h>
|
||||
-
|
||||
-int main(int argc, char *argv[[]]) {
|
||||
- struct timespec tp;
|
||||
-
|
||||
- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
|
||||
+#include <unistd.h>
|
||||
+int main() {
|
||||
+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC))
|
||||
+ #error No monotonic clock
|
||||
+#endif
|
||||
return 0;
|
||||
- else
|
||||
- return 1;
|
||||
}
|
||||
- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
|
||||
- [MONOTONIC_CLOCK="cross compiling"])
|
||||
+]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no])
|
||||
|
||||
LIBS="$LIBS_SAVE"
|
||||
CPPFLAGS="$CPPFLAGS_SAVE"
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001
|
||||
From: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
||||
Date: Mon, 30 Jan 2017 16:32:06 -0600
|
||||
Subject: [PATCH] Remove check for useSIGIO option
|
||||
|
||||
Original patch follows:
|
||||
Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO
|
||||
option.
|
||||
|
||||
As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO
|
||||
and OsReleaseSIGIO.
|
||||
|
||||
No longer the check for useSIGIO is needed
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@nxp.com>
|
||||
|
||||
Downloaded from
|
||||
https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch
|
||||
|
||||
Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com>
|
||||
---
|
||||
hw/xfree86/os-support/shared/sigio.c | 6 ------
|
||||
1 file changed, 6 deletions(-)
|
||||
|
||||
diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c
|
||||
index 884a71c..be76498 100644
|
||||
--- a/hw/xfree86/os-support/shared/sigio.c
|
||||
+++ b/hw/xfree86/os-support/shared/sigio.c
|
||||
@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure)
|
||||
int i;
|
||||
int installed = FALSE;
|
||||
|
||||
- if (!xf86Info.useSIGIO)
|
||||
- return 0;
|
||||
-
|
||||
for (i = 0; i < MAX_FUNCS; i++) {
|
||||
if (!xf86SigIOFuncs[i].f) {
|
||||
if (xf86IsPipe(fd))
|
||||
@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd)
|
||||
int max;
|
||||
int ret;
|
||||
|
||||
- if (!xf86Info.useSIGIO)
|
||||
- return 0;
|
||||
-
|
||||
max = 0;
|
||||
ret = 0;
|
||||
for (i = 0; i < MAX_FUNCS; i++) {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
comment "xorg-server needs a glibc or uClibc toolchain"
|
||||
depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER
|
||||
bool "xorg-server"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
# xserver uses inb/outb on arm, which aren't available with musl
|
||||
depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL)
|
||||
# We need a SHA1 implementation. If either openssl or
|
||||
# libgcrypt are already part of the build, we'll use one of
|
||||
# them, otherwise, use the small libsha1 library.
|
||||
@@ -17,7 +22,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
|
||||
select BR2_PACKAGE_XLIB_LIBXDMCP
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
select BR2_PACKAGE_XLIB_LIBXFIXES
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT
|
||||
select BR2_PACKAGE_XLIB_LIBXFT
|
||||
select BR2_PACKAGE_XLIB_LIBXI
|
||||
select BR2_PACKAGE_XLIB_LIBXINERAMA
|
||||
@@ -48,6 +52,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
|
||||
select BR2_PACKAGE_XPROTO_XPROTO
|
||||
select BR2_PACKAGE_XUTIL_UTIL_MACROS
|
||||
select BR2_PACKAGE_XKEYBOARD_CONFIG
|
||||
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD
|
||||
help
|
||||
X.Org X server
|
||||
|
||||
@@ -61,37 +66,40 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
|
||||
bool
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
|
||||
int
|
||||
default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
|
||||
default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
|
||||
default 23 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
|
||||
|
||||
choice
|
||||
bool "X Window System server version"
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
|
||||
bool "1.18.4"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
|
||||
bool "1.19.1"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT2
|
||||
select BR2_PACKAGE_XPROTO_PRESENTPROTO
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
|
||||
bool "1.17.4"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT
|
||||
select BR2_PACKAGE_XPROTO_PRESENTPROTO
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
|
||||
bool "1.14.7"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
|
||||
string
|
||||
default "1.18.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
|
||||
default "1.19.1" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
|
||||
default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
|
||||
default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
|
||||
|
||||
@@ -129,6 +137,8 @@ endchoice
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX
|
||||
bool "Enable AIGLX Extension"
|
||||
# AIGLX Extension removed in 1.19.0
|
||||
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 || BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
|
||||
help
|
||||
Enable/Use AIGLX extension.
|
||||
|
||||
|
||||
@@ -3,5 +3,5 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x
|
||||
sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
|
||||
sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2016-July/002699.html
|
||||
sha256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 xorg-server-1.18.4.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2017-January/002754.html
|
||||
sha256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb xorg-server-1.19.1.tar.bz2
|
||||
|
||||
@@ -15,7 +15,6 @@ XSERVER_XORG_SERVER_AUTORECONF = YES
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||
xfont_font-util \
|
||||
xutil_util-macros \
|
||||
xlib_libXfont \
|
||||
xlib_libX11 \
|
||||
xlib_libXau \
|
||||
xlib_libXdmcp \
|
||||
@@ -73,7 +72,9 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--with-systemd-daemon \
|
||||
--enable-systemd-logind
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += systemd
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += \
|
||||
systemd \
|
||||
xproto_dri2proto
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
--without-systemd-daemon \
|
||||
@@ -81,9 +82,9 @@ XSERVER_XORG_SERVER_CONF_OPTS += \
|
||||
endif
|
||||
|
||||
# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyy)
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyyy)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xwayland
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland xlib_libXcomposite
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland wayland-protocols xlib_libXcomposite
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland
|
||||
endif
|
||||
@@ -169,12 +170,12 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
|
||||
endif
|
||||
else
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DBUS),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += dbus
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += freetype
|
||||
@@ -194,6 +195,14 @@ else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc
|
||||
endif
|
||||
@@ -214,9 +223,11 @@ endif
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
|
||||
ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yy)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-glamor
|
||||
endif
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri3 --disable-glamor
|
||||
|
||||
Reference in New Issue
Block a user