Merge pull request #4121 from MilhouseVH/le10_xorg-updates

packages: update to latest, xorg-server-1.20.7

packages/addons/addon-depends/chrome-depends/libXcursor/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXcursor"
-PKG_VERSION="1.1.15"
+PKG_VERSION="1.2.0"
-PKG_SHA256="294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b"
+PKG_SHA256="3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXcursor-$PKG_VERSION.tar.bz2"

packages/addons/addon-depends/chrome-depends/libXft/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXft"
-PKG_VERSION="2.3.2"
+PKG_VERSION="2.3.3"
-PKG_SHA256="f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c"
+PKG_SHA256="225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/libXft-$PKG_VERSION.tar.bz2"

packages/x11/app/setxkbmap/package.mk

@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="setxkbmap"
-PKG_VERSION="1.3.1"
+PKG_VERSION="1.3.2"
-PKG_SHA256="a9ddb3963f263ba13f0ea105d8c45a531832140530217cc559587bb94f02d3e1"
+PKG_SHA256="8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/app/xrandr/package.mk

@@ -1,12 +1,13 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xrandr"
-PKG_VERSION="1.5.0"
+PKG_VERSION="1.5.1"
-PKG_SHA256="c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd"
+PKG_SHA256="7bc76daf9d72f8aff885efad04ce06b90488a1a169d118dea8a2b661832e8762"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
-PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/app/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros libXrandr"
 PKG_LONGDESC="Xrandr is a primitive command line interface to the RandR extension and used to set the screen size, orientation and/or reflection."
 

packages/x11/font/font-util/package.mk

@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="font-util"
-PKG_VERSION="1.3.1"
+PKG_VERSION="1.3.2"
-PKG_SHA256="aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921"
+PKG_SHA256="3ad880444123ac06a7238546fa38a2a6ad7f7e0cc3614de7e103863616522282"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/font/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/lib/libICE/package.mk

@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libICE"
-PKG_VERSION="1.0.9"
+PKG_VERSION="1.0.10"
-PKG_SHA256="8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202"
+PKG_SHA256="6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/lib/libX11/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libX11"
-PKG_VERSION="1.6.8"
+PKG_VERSION="1.6.9"
-PKG_SHA256="b289a845c189e251e0e884cc0f9269bbe97c238df3741e854ec4c17c21e473d5"
+PKG_SHA256="9cc7e8d000d6193fa5af580d50d689380b8287052270f5bb26a5fb6b58b2bed1"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/lib/libX11/patches/libX11-makekeys-remove-X11-headers.patch

@@ -1,37 +0,0 @@
-https://github.com/mirror/libX11/commit/0327c427d62f671eced067c6d9b69f4e216a8cac
-upstream in > 1.6.8
-
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 17 Jun 2019 13:36:08 -0400
-Subject: [PATCH] makekeys: Detach ourselves from X headers entirely
-
-Subsequent to a121b7b0c210efe10bf93453b29050282324c906 we are no longer
-building makekeys with enough -I/foo/bar to find the X11 headers, so if
-they're not in a system include path, things fail. Since this utility is
-only needed at build time, there's no real reason to demand the X
-headers be installed for both the build and target machines if cross-
-compiling, we can just assume a vaguely ANSI environment instead.
-
-Tested-by: Niclas Zeising <zeising@daemonic.se>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-Reviewed-by: Matt Turner <mattst88@gmail.com>
----
- src/util/makekeys.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/makekeys.c b/src/util/makekeys.c
-index bcb5b7d5..07563315 100644
---- a/src/util/makekeys.c
-+++ b/src/util/makekeys.c
-@@ -35,8 +35,10 @@ from The Open Group.
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdint.h>
-+#include <inttypes.h>
- 
--#include "../Xresinternal.h"
-+typedef uint32_t Signature;
- 
- #define KTNUM 4000
- 

packages/x11/lib/libXfont2/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXfont2"
-PKG_VERSION="2.0.3"
+PKG_VERSION="2.0.4"
-PKG_SHA256="0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e"
+PKG_SHA256="6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/lib/libXi/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXi"
-PKG_VERSION="1.7.9"
+PKG_VERSION="1.7.10"
-PKG_SHA256="c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45"
+PKG_SHA256="36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/lib/libXt/package.mk

@@ -1,9 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libXt"
-PKG_VERSION="1.1.5"
+PKG_VERSION="1.2.0"
-PKG_SHA256="46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a"
+PKG_SHA256="b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/lib/pixman/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pixman"
-PKG_VERSION="0.34.0"
+PKG_VERSION="0.38.4"
-PKG_SHA256="39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0"
+PKG_SHA256="84abb7fa2541af24d9c3b34bf75d6ac60cc94ac4410061bbb295b66a29221550"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/proto/xorgproto/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xorgproto"
-PKG_VERSION="2019.1"
+PKG_VERSION="2019.2"
-PKG_SHA256="a6daaa7a6cbc8e374032d83ff7f47d41be98f1e0f4475d66a4da3aa766a0d49b"
+PKG_SHA256="46ecd0156c561d41e8aa87ce79340910cdf38373b759e737fcbba5df508e7b8e"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/xserver/xorg-server/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xorg-server"
-PKG_VERSION="1.20.5"
+PKG_VERSION="1.20.7"
-PKG_SHA256="a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d"
+PKG_SHA256="bd5986f010f34f5b3d6bc99fe395ecb1e0dead15a26807e0c832701809a06ea1"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.X.org"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2"

packages/x11/xserver/xorg-server/patches/xorg-server-999.01-lower-gl-version-to-work-with-libglvnd.patch

@@ -1,64 +0,0 @@
-From c16186f700e9763ba25cb3475cab34c28b1d13a0 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Tue, 24 Sep 2019 09:58:43 +0200
-Subject: [PATCH] build: glx: Lower gl version to work with libglvnd
-
-When using mesa with libglvnd support, mesa will no longer install the
-gl, glx, egl pkg-config files but instead let libglvnd provide them.
-libglvnd maintainers decided to change the versioning as it was
-mesa-specific previously. Now the libraries have versions of the API
-they expose[1].
-This causes problems when building the X server:
-
-  checking for glproto >= 1.4.17 gl >= 9.2.0... no
-  configure: error: Package requirements (glproto >= 1.4.17 gl >= 9.2.0) were not met:
-
-  Requested 'gl >= 9.2.0' but version of gl is 1.2
-
-Lower the version requirement to 1.2 to allow building against libglvnd
-provided libraries
-
-[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba
----
- configure.ac    | 4 ++--
- glx/meson.build | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4b71f8559..56ef410f0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -763,7 +763,7 @@ LIBDRI="dri >= 7.8.0"
- LIBDRM="libdrm >= 2.4.89"
- LIBEGL="egl"
- LIBGBM="gbm >= 10.2.0"
--LIBGL="gl >= 7.1.0"
-+LIBGL="gl >= 1.2"
- LIBXEXT="xext >= 1.0.99.4"
- LIBXFONT="xfont2 >= 2.0.0"
- LIBXI="xi >= 1.2.99.1"
-@@ -1118,7 +1118,7 @@ case "$DRI2,$HAVE_DRI2PROTO" in
- 	yes,yes | auto,yes)
- 		AC_DEFINE(DRI2, 1, [Build DRI2 extension])
- 		DRI2=yes
--		LIBGL="gl >= 9.2.0"
-+		LIBGL="gl >= 1.2"
- 		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
- 		;;
- esac
-diff --git a/glx/meson.build b/glx/meson.build
-index 7f9e549f0..745814336 100644
---- a/glx/meson.build
-+++ b/glx/meson.build
-@@ -39,7 +39,7 @@ if build_glx
-             common_dep,
-             dl_dep,
-             dependency('glproto', version: '>= 1.4.17'),
--            dependency('gl', version: '>= 9.2.0'),
-+            dependency('gl', version: '>= 1.2'),
-         ],
-         c_args: [
-             glx_align64,
--- 
-2.22.0
-

packages/x11/xserver/xorg-server/patches/xorg-server-999.02-replace-MESA_EGL_NO_X11_HEADERS-hack-with-upstream-EGL_NO_X11.patch

@@ -1,81 +0,0 @@
-From 80d7c1ad75cc4cd3aa844d5ff34fee723966d9fc Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sat, 19 Oct 2019 21:58:09 +0200
-Subject: [PATCH] replace MESA_EGL_NO_X11_HEADERS hack with upstream EGL_NO_X11
-
----
- glamor/glamor_egl.h                     | 2 +-
- glamor/glamor_priv.h                    | 2 +-
- hw/xwayland/xwayland-glamor-eglstream.c | 2 +-
- hw/xwayland/xwayland-glamor-gbm.c       | 2 +-
- hw/xwayland/xwayland-glamor.c           | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/glamor/glamor_egl.h b/glamor/glamor_egl.h
-index 2f7566b24..af1c707d2 100644
---- a/glamor/glamor_egl.h
-+++ b/glamor/glamor_egl.h
-@@ -27,7 +27,7 @@
- #ifndef GLAMOR_EGL_H
- #define GLAMOR_EGL_H
- 
--#define MESA_EGL_NO_X11_HEADERS
-+#define EGL_NO_X11
- #include <epoxy/gl.h>
- #include <epoxy/egl.h>
- #include <glamor_egl_ext.h>
-diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
-index 7d9a7d4fb..bcdaf4040 100644
---- a/glamor/glamor_priv.h
-+++ b/glamor/glamor_priv.h
-@@ -39,7 +39,7 @@
- 
- #include <epoxy/gl.h>
- #ifdef GLAMOR_HAS_GBM
--#define MESA_EGL_NO_X11_HEADERS
-+#define EGL_NO_X11
- #include <epoxy/egl.h>
- #endif
- 
-diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c
-index c62c0d2ac..e665b963e 100644
---- a/hw/xwayland/xwayland-glamor-eglstream.c
-+++ b/hw/xwayland/xwayland-glamor-eglstream.c
-@@ -32,7 +32,7 @@
- #include "wayland-eglstream-client-protocol.h"
- #include "wayland-eglstream-controller-client-protocol.h"
- 
--#define MESA_EGL_NO_X11_HEADERS
-+#define EGL_NO_X11
- #include <glamor_egl.h>
- #include <glamor.h>
- #include <glamor_transform.h>
-diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c
-index 291e060cf..c92d6073f 100644
---- a/hw/xwayland/xwayland-glamor-gbm.c
-+++ b/hw/xwayland/xwayland-glamor-gbm.c
-@@ -35,7 +35,7 @@
- #include <xf86drm.h>
- #include <drm_fourcc.h>
- 
--#define MESA_EGL_NO_X11_HEADERS
-+#define EGL_NO_X11
- #include <gbm.h>
- #include <glamor_egl.h>
- 
-diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
-index 7ea6def61..587ef5ed0 100644
---- a/hw/xwayland/xwayland-glamor.c
-+++ b/hw/xwayland/xwayland-glamor.c
-@@ -25,7 +25,7 @@
- 
- #include "xwayland.h"
- 
--#define MESA_EGL_NO_X11_HEADERS
-+#define EGL_NO_X11
- #include <glamor_egl.h>
- 
- #include <glamor.h>
--- 
-2.23.0
-