mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
xorg-server: update to xorg-server-1.20.7
This commit is contained in:
MilhouseVH
parent
e0fe76288e
commit
fd48b607fc
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="xorg-server"
|
||||
PKG_VERSION="1.20.5"
|
||||
PKG_SHA256="a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d"
|
||||
PKG_VERSION="1.20.7"
|
||||
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"
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user