package/x11r7/xserver_xorg-server: bump version to 1.20.6
PATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.6
Removed patches 0006 & 0007 which were applied upstream as single commit on the server-1.20-branch branch:
https://gitlab.freedesktop.org/xorg/xserver/commit/07efd81b819f21046afc0bb7e19a6cdf7f3c7ea9
Updated upstream URL for patch 0001.
---
...-only-use-inx-outx-on-ARM-with-glibc.patch | 34 ----------
...t-include-sys-io.h-on-ARM-with-glibc.patch | 62 -------------------
.../0001-modesettings-needs-dri2.patch | 2 +-
...ure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0
...003-Remove-check-for-useSIGIO-option.patch | 0
...0004-include-misc.h-fix-uClibc-build.patch | 0
...nd-Makefile.am-fix-build-without-glx.patch | 0
package/x11r7/xserver_xorg-server/Config.in | 4 +-
.../xserver_xorg-server.hash | 10 +--
9 files changed, 8 insertions(+), 104 deletions(-)
delete mode 100644 package/x11r7/xserver_xorg-server/1.20.5/0006-compiler.h-only-use-inx-outx-on-ARM-with-glibc.patch
delete mode 100644 package/x11r7/xserver_xorg-server/1.20.5/0007-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0001-modesettings-needs-dri2.patch (89%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0003-Remove-check-for-useSIGIO-option.patch (100%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0004-include-misc.h-fix-uClibc-build.patch (100%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch (100%)package/x11r7/xserver_xorg-server/1.20.5/0006-compiler.h-only-use-inx-outx-on-ARM-with-glibc.patch deleted +0 -34
@@ -1,34 +0,0 @@ -From 6a2ce6c5da9456b97683db6224f38ef3b02cce4b Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Thu, 20 Sep 2018 13:21:34 +0100 -Subject: [PATCH] compiler.h: only use inx/outx on ARM with glibc - -musl only implements inx/outx on x86, so check for __GLIBC__ instead of -__linux__. - -Signed-off-by: Ross Burton <[email protected]> -[Upstream: https://gitlab.freedesktop.org/xorg/xserver/commit/6a2ce6c5da9456b97683db6224f38ef3b02cce4b.patch] -Signed-off-by: Thomas Preston <[email protected]> ---- - hw/xfree86/common/compiler.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h -index 7144c6a27..fb53ced80 100644 ---- a/hw/xfree86/common/compiler.h -+++ b/hw/xfree86/common/compiler.h -@@ -758,9 +758,9 @@ inl(unsigned short port) - return xf86ReadMmio32Le((void *) ioBase, port); - } - --#elif defined(__arm__) && defined(__linux__) -+#elif defined(__arm__) && defined(__GLIBC__) - --/* for Linux on ARM, we use the LIBC inx/outx routines */ -+/* for glibc on ARM, we use the LIBC inx/outx routines */ - /* note that the appropriate setup via "ioperm" needs to be done */ - /* *before* any inx/outx is done. */ - --- -2.23.0 -
package/x11r7/xserver_xorg-server/1.20.5/0007-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch deleted +0 -62
62 lines not on this page · raw message
package/x11r7/xserver_xorg-server/1.20.6/0001-modesettings-needs-dri2.patch renamed from package/x11r7/xserver_xorg-server/1.20.5/0001-modesettings-needs-dri2.patch +1 -1
@@ -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 <[email protected]>
package/x11r7/xserver_xorg-server/1.20.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch renamed from package/x11r7/xserver_xorg-server/1.20.5/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +0 -0
package/x11r7/xserver_xorg-server/1.20.6/0003-Remove-check-for-useSIGIO-option.patch renamed from package/x11r7/xserver_xorg-server/1.20.5/0003-Remove-check-for-useSIGIO-option.patch +0 -0
package/x11r7/xserver_xorg-server/1.20.6/0004-include-misc.h-fix-uClibc-build.patch renamed from package/x11r7/xserver_xorg-server/1.20.5/0004-include-misc.h-fix-uClibc-build.patch +0 -0
package/x11r7/xserver_xorg-server/1.20.6/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch renamed from package/x11r7/xserver_xorg-server/1.20.5/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch +0 -0
package/x11r7/xserver_xorg-server/Config.in +2 -2
@@ -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
package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +5 -5
@@ -3,11 +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
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.6
Quoted 17 lines · On Fri, 6 Dec 2019 19:34:40 +0100 Bernd Kuhls <[email protected]> wrote:
Removed patches 0006 & 0007 which were applied upstream as single commit on the server-1.20-branch branch:
https://gitlab.freedesktop.org/xorg/xserver/commit/07efd81b819f21046afc0bb7e19a6cdf7f3c7ea9Updated upstream URL for patch 0001.
Signed-off-by Bernd Kuhls <[email protected]>--- ...-only-use-inx-outx-on-ARM-with-glibc.patch | 34 ---------- ...t-include-sys-io.h-on-ARM-with-glibc.patch | 62 ------------------- .../0001-modesettings-needs-dri2.patch | 2 +- ...ure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 ...003-Remove-check-for-useSIGIO-option.patch | 0 ...0004-include-misc.h-fix-uClibc-build.patch | 0 ...nd-Makefile.am-fix-build-without-glx.patch | 0 package/x11r7/xserver_xorg-server/Config.in | 4 +- .../xserver_xorg-server.hash | 10 +--
Quoted 8 lines
9 files changed, 8 insertions(+), 104 deletions(-)
delete mode 100644 package/x11r7/xserver_xorg-server/1.20.5/0006-compiler.h-only-use-inx-outx-on-ARM-with-glibc.patch
delete mode 100644 package/x11r7/xserver_xorg-server/1.20.5/0007-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0001-modesettings-needs-dri2.patch (89%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0003-Remove-check-for-useSIGIO-option.patch (100%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0004-include-misc.h-fix-uClibc-build.patch (100%)
rename package/x11r7/xserver_xorg-server/{1.20.5 => 1.20.6}/0005-hw-xwayland-Makefile.am-fix-build-without-glx.patch (100%)Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.6
In reply to Bernd KuhlsQuoted 7 lines · On Fri, 6 Dec 2019 19:34:40 +0100 Bernd Kuhls <[email protected]> wrote:
Removed patches 0006 & 0007 which were applied upstream as single commit on the server-1.20-branch branch:
https://gitlab.freedesktop.org/xorg/xserver/commit/07efd81b819f21046afc0bb7e19a6cdf7f3c7ea9Updated upstream URL for patch 0001.
Signed-off-by Bernd Kuhls <[email protected]>
I have no idea if the version bump is the reason for that, but we are seeing a build failure of the xserver at:
https://gitlab.com/buildroot.org/buildroot/-/jobs/378314334
1407 In file included from xf86Init.c:81:
1408 ../../../include/glxvndabi.h:64:10: fatal error: GL/glxproto.h: No such file or directory 1409 #include <GL/glxproto.h>
Best regards,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.6
Am Mon, 16 Dec 2019 10:38:11 +0100 schrieb Thomas Petazzoni:
Quoted 8 lines
I have no idea if the version bump is the reason for that, but we are seeing a build failure of the xserver at:
https://gitlab.com/buildroot.org/buildroot/-/jobs/378314334
1407 In file included from xf86Init.c:81:
1408../../../include/glxvndabi.h:64:10: fatal error:GL/glxproto.h: No such file or directory 1409 #include <GL/glxproto.h>
Hi Thomas,
the error was caught by autobuilders before:
http://autobuild.buildroot.net/results/4df/
4df03009e25c1bddfd666f58bddf20e5cd6e80ef/
but I can not reproduce the error with this defconfig.
Regards, Bernd
PATCH 1/1 package/x11r7/xserver_xorg-server: bump version to 1.20.6
In reply to Bernd KuhlsQuoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Bernd" == Bernd Kuhls <[email protected]> writes:
Removed patches 0006 & 0007 which were applied upstream as single commit on the server-1.20-branch branch:
https://gitlab.freedesktop.org/xorg/xserver/commit/07efd81b819f21046afc0bb7e19a6cdf7f3c7ea9Updated upstream URL for patch 0001.
Signed-off-by Bernd Kuhls <[email protected]>
Committed to 2019.02.x and 2019.11.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard