diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-11-23 20:34:16 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-11-24 08:59:50 +0100 |
commit | 211e104a467e569d010f15e79732d3a43306a707 (patch) | |
tree | 448ee8bf88663f504d01776e1ea1460ae6d3a52d /source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch | |
parent | bdd7acee1ce88958c9a3975d3a6f6e960d77afe5 (diff) | |
download | current-211e104a467e569d010f15e79732d3a43306a707.tar.gz current-211e104a467e569d010f15e79732d3a43306a707.tar.xz |
Sat Nov 23 20:34:16 UTC 201920191123203416
a/pkgtools-15.0-noarch-27.txz: Rebuilt.
Escape some shell characters in symlink filenames. Thanks to GazL.
d/parallel-20191122-noarch-1.txz: Upgraded.
x/xorg-server-1.20.6-x86_64-1.txz: Upgraded.
x/xorg-server-xephyr-1.20.6-x86_64-1.txz: Upgraded.
x/xorg-server-xnest-1.20.6-x86_64-1.txz: Upgraded.
x/xorg-server-xvfb-1.20.6-x86_64-1.txz: Upgraded.
extra/tigervnc/tigervnc-1.10.0-x86_64-2.txz: Rebuilt.
Recompiled against xorg-server-1.20.6.
Diffstat (limited to 'source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch')
-rw-r--r-- | source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch b/source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch deleted file mode 100644 index cd9213ee4..000000000 --- a/source/x/x11/patch/xorg-server/e6ef2b12404dfec7f23592a3524d2a63d9d25802.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e6ef2b12404dfec7f23592a3524d2a63d9d25802 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 03c2e367c..969090b94 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -760,7 +760,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" -@@ -1115,7 +1115,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, |