d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Migrate Buildroot 2019.02.9 (#539)

Browse Source
This commit is contained in:
Pascal Vizeli
2020-01-13 14:47:52 +01:00
committed by GitHub
parent d6a700565e
commit 13e4578b7a
139 changed files with 898 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot/package/x11r7/xserver_xorg-server/1.20.5/0001-modesettings-needs-dri2.patch → buildroot/package/x11r7/xserver_xorg-server/1.20.6/0001-modesettings-needs-dri2.patch
View File

@@ -1,7 +1,7 @@
Kernel modesettings support also depends on dri2, see
http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46
Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584
Patch sent upstream: https://gitlab.freedesktop.org/xorg/xserver/issues/479
[rebased for version 1.20.0]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

0
buildroot/package/x11r7/xserver_xorg-server/1.20.5/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch → buildroot/package/x11r7/xserver_xorg-server/1.20.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
View File

0
buildroot/package/x11r7/xserver_xorg-server/1.20.5/0003-Remove-check-for-useSIGIO-option.patch → buildroot/package/x11r7/xserver_xorg-server/1.20.6/0003-Remove-check-for-useSIGIO-option.patch
View File

0
buildroot/package/x11r7/xserver_xorg-server/1.20.5/0004-include-misc.h-fix-uClibc-build.patch → buildroot/package/x11r7/xserver_xorg-server/1.20.6/0004-include-misc.h-fix-uClibc-build.patch
View File

0
buildroot/package/x11r7/xserver_xorg-server/1.20.5/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch → buildroot/package/x11r7/xserver_xorg-server/1.20.6/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch
View File

45
buildroot/package/x11r7/xserver_xorg-server/1.20.6/0006-hw-xfree86-common-xf86Init.c-fix-build-without-glx.patch Normal file
View File

@@ -0,0 +1,45 @@
From 49456e0a37fac7bc9d1f01bc1519fb0d699956db Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 27 Dec 2019 23:33:37 +0100
Subject: [PATCH] hw/xfree86/common/xf86Init.c: fix build without glx
Since commit d8ec33fe0542141aed1d9016d2ecaf52da944b4b, an include on
glxvndabi.h has been added to hw/xfree86/common/xf86Init.c
However, if glx is disabled through --disable-glx and GLX headers are
not installed in the build's environment, build fails on:
In file included from xf86Init.c:81:
../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory
64 | #include <GL/glxproto.h>
| ^~~~~~~~~~~~~~~
Fix this failure by removing this include which does not seem to be
needed (an other option would have been to keep it under an ifdef GLXEXT
block)
Fixes:
- http://autobuild.buildroot.org/results/de838a843f97673d1381a55fd4e9b07164693913
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Retrieved from:
https://gitlab.freedesktop.org/xorg/xserver/commit/49456e0a37fac7bc9d1f01bc1519fb0d699956db]
---
hw/xfree86/common/xf86Init.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0631c7237..e6fb11398 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -74,7 +74,6 @@
#include "xf86Crtc.h"
#include "picturestr.h"
#include "randrstr.h"
-#include "glxvndabi.h"
#include "xf86Bus.h"
#ifdef XSERVER_LIBPCIACCESS
#include "xf86VGAarbiter.h"
--
2.24.1

4
buildroot/package/x11r7/xserver_xorg-server/Config.in
View File

@@ -61,7 +61,7 @@ choice
bool "X Window System server version"
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
bool "1.20.5"
bool "1.20.6"
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24
select BR2_PACKAGE_XLIB_LIBXFONT2
@@ -79,7 +79,7 @@ endchoice
config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
string
default "1.20.5" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
default "1.20.6" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
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

13
buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
View File

@@ -3,8 +3,11 @@ 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/2019-May/002993.html
md5 c9fc7e21e11286dbedd22c00df652130 xorg-server-1.20.5.tar.bz2
sha1 fea6fd34c7f48b3c69fbecd8fb294eaa1498e69c xorg-server-1.20.5.tar.bz2
sha256 a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d xorg-server-1.20.5.tar.bz2
sha512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 xorg-server-1.20.5.tar.bz2
# From https://lists.x.org/archives/xorg-announce/2019-November/003032.html
md5 a98170084f2c8fed480d2ff601f8a14b xorg-server-1.20.6.tar.bz2
sha1 59473e72136113f3a35b1ab5a5cfcbcad955b660 xorg-server-1.20.6.tar.bz2
sha256 6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1 xorg-server-1.20.6.tar.bz2
sha512 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 xorg-server-1.20.6.tar.bz2
# Locally calculated
sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING