Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -0,0 +1,31 @@
|
||||
From d16133e3e293fe16b291114d344fbd5a61d5ed65 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
Date: Thu, 20 Jul 2017 19:48:26 -0700
|
||||
Subject: [PATCH] glx: Only include compositeext.h if COMPOSITE is
|
||||
supported
|
||||
|
||||
Regressed-in: ea483af99a6351323afe00a0b630cd63310efdb1
|
||||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
glx/glxscreens.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/glx/glxscreens.c b/glx/glxscreens.c
|
||||
index 78e0aaff9..609661274 100644
|
||||
--- a/glx/glxscreens.c
|
||||
+++ b/glx/glxscreens.c
|
||||
@@ -43,7 +43,10 @@
|
||||
#include "glxutil.h"
|
||||
#include "glxext.h"
|
||||
#include "protocol-versions.h"
|
||||
+
|
||||
+#ifdef COMPOSITE
|
||||
#include "compositeext.h"
|
||||
+#endif
|
||||
|
||||
static DevPrivateKeyRec glxScreenPrivateKeyRec;
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -79,7 +79,7 @@ choice
|
||||
bool "X Window System server version"
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
|
||||
bool "1.19.5"
|
||||
bool "1.19.6"
|
||||
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
|
||||
select BR2_PACKAGE_XLIB_LIBXFONT2
|
||||
select BR2_PACKAGE_XPROTO_PRESENTPROTO
|
||||
@@ -99,7 +99,7 @@ endchoice
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
|
||||
string
|
||||
default "1.19.5" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
|
||||
default "1.19.6" 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
|
||||
|
||||
@@ -114,7 +114,8 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
|
||||
select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
|
||||
BR2_PACKAGE_XPROTO_DRI2PROTO)
|
||||
select BR2_PACKAGE_LIBPCIACCESS
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
|
||||
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
|
||||
(BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
|
||||
help
|
||||
This variant of the X.org server is the full-blown variant,
|
||||
as used by desktop GNU/Linux distributions. The drivers (for
|
||||
@@ -155,7 +156,8 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
|
||||
This driver can then be enabled by running the X server
|
||||
using:
|
||||
|
||||
Xfbdev -keybd evdev,,device=/dev/input/eventX -mouse evdev,,device=/dev/input/eventY.
|
||||
Xfbdev -keybd evdev,,device=/dev/input/eventX
|
||||
-mouse evdev,,device=/dev/input/eventY
|
||||
|
||||
config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD
|
||||
bool "Enable KDrive/TinyX kbd input driver"
|
||||
|
||||
@@ -3,8 +3,8 @@ 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/2017-October/002814.html
|
||||
md5 4ac6feeae6790436ce9de879ca9a3bf8 xorg-server-1.19.5.tar.bz2
|
||||
sha1 307d3405f709f7e41966c850b37deefe7f83eb9b xorg-server-1.19.5.tar.bz2
|
||||
sha256 18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447 xorg-server-1.19.5.tar.bz2
|
||||
sha512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c xorg-server-1.19.5.tar.bz2
|
||||
# From https://lists.x.org/archives/xorg-announce/2017-December/002830.html
|
||||
md5 3e47777ff034a331aed2322b078694a8 xorg-server-1.19.6.tar.bz2
|
||||
sha1 2dd560ac49bdbda7f67166546af43541fabf517f xorg-server-1.19.6.tar.bz2
|
||||
sha256 a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197 xorg-server-1.19.6.tar.bz2
|
||||
sha512 38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412 xorg-server-1.19.6.tar.bz2
|
||||
|
||||
@@ -12,47 +12,47 @@ XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
|
||||
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
|
||||
# xfont_font-util is needed only for autoreconf
|
||||
XSERVER_XORG_SERVER_AUTORECONF = YES
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||
xfont_font-util \
|
||||
xutil_util-macros \
|
||||
xlib_libX11 \
|
||||
xlib_libXau \
|
||||
xlib_libXdmcp \
|
||||
xlib_libXext \
|
||||
xlib_libXfixes \
|
||||
xlib_libXi \
|
||||
xlib_libXrender \
|
||||
xlib_libXres \
|
||||
xlib_libXft \
|
||||
xlib_libXcursor \
|
||||
xlib_libXinerama \
|
||||
xlib_libXrandr \
|
||||
xlib_libXdamage \
|
||||
xlib_libXxf86vm \
|
||||
xlib_libxkbfile \
|
||||
xlib_xtrans \
|
||||
xdata_xbitmaps \
|
||||
xproto_bigreqsproto \
|
||||
xproto_compositeproto \
|
||||
xproto_damageproto \
|
||||
xproto_fixesproto \
|
||||
xproto_fontsproto \
|
||||
xproto_glproto \
|
||||
xproto_inputproto \
|
||||
xproto_kbproto \
|
||||
xproto_randrproto \
|
||||
xproto_renderproto \
|
||||
xproto_resourceproto \
|
||||
xproto_videoproto \
|
||||
xproto_xcmiscproto \
|
||||
xproto_xextproto \
|
||||
xproto_xf86bigfontproto \
|
||||
xproto_xf86dgaproto \
|
||||
xproto_xf86vidmodeproto \
|
||||
xproto_xproto \
|
||||
xkeyboard-config \
|
||||
pixman \
|
||||
mcookie \
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES = \
|
||||
xfont_font-util \
|
||||
xutil_util-macros \
|
||||
xlib_libX11 \
|
||||
xlib_libXau \
|
||||
xlib_libXdmcp \
|
||||
xlib_libXext \
|
||||
xlib_libXfixes \
|
||||
xlib_libXi \
|
||||
xlib_libXrender \
|
||||
xlib_libXres \
|
||||
xlib_libXft \
|
||||
xlib_libXcursor \
|
||||
xlib_libXinerama \
|
||||
xlib_libXrandr \
|
||||
xlib_libXdamage \
|
||||
xlib_libXxf86vm \
|
||||
xlib_libxkbfile \
|
||||
xlib_xtrans \
|
||||
xdata_xbitmaps \
|
||||
xproto_bigreqsproto \
|
||||
xproto_compositeproto \
|
||||
xproto_damageproto \
|
||||
xproto_fixesproto \
|
||||
xproto_fontsproto \
|
||||
xproto_glproto \
|
||||
xproto_inputproto \
|
||||
xproto_kbproto \
|
||||
xproto_randrproto \
|
||||
xproto_renderproto \
|
||||
xproto_resourceproto \
|
||||
xproto_videoproto \
|
||||
xproto_xcmiscproto \
|
||||
xproto_xextproto \
|
||||
xproto_xf86bigfontproto \
|
||||
xproto_xf86dgaproto \
|
||||
xproto_xf86vidmodeproto \
|
||||
xproto_xproto \
|
||||
xkeyboard-config \
|
||||
pixman \
|
||||
mcookie \
|
||||
host-pkgconf
|
||||
|
||||
# We force -O2 regardless of the optimization level chosen by the
|
||||
@@ -220,7 +220,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
|
||||
else
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
|
||||
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
|
||||
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
|
||||
|
||||
Reference in New Issue
Block a user