diff options
author | kyak | 2020-01-04 22:40:46 +0300 |
---|---|---|
committer | kyak | 2020-01-04 22:41:36 +0300 |
commit | 55ef37b35b2703f8d5ce6fb31962e83e66746626 (patch) | |
tree | 763f5e05dcfeef6d6978f3de40aa62f0a04f4184 | |
parent | 7cb3fa578cf59d83569aef08315bc76bd675f45b (diff) | |
download | aur-55ef37b35b2703f8d5ce6fb31962e83e66746626.tar.gz |
upgpkg: xorg-server 1.20.6-3
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch | 53 | ||||
-rw-r--r-- | 0002-fix-libshadow-2.patch | 32 | ||||
-rw-r--r-- | PKGBUILD | 29 | ||||
-rw-r--r-- | glvnd.patch | 181 | ||||
-rw-r--r-- | xvfb-run | 2 |
6 files changed, 38 insertions, 281 deletions
@@ -1,6 +1,6 @@ pkgbase = xorg-server-bug865 - pkgver = 1.20.5 - pkgrel = 4 + pkgver = 1.20.6 + pkgrel = 3 url = https://xorg.freedesktop.org arch = x86_64 groups = xorg @@ -19,7 +19,6 @@ pkgbase = xorg-server-bug865 makedepends = libxrender makedepends = libxi makedepends = libxaw - makedepends = libdmx makedepends = libxtst makedepends = libxres makedepends = xorg-xkbcomp @@ -37,13 +36,11 @@ pkgbase = xorg-server-bug865 makedepends = wayland-protocols makedepends = egl-wayland makedepends = meson - source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.5.tar.bz2 - source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.5.tar.bz2.sig + source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.6.tar.bz2 + source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.6.tar.bz2.sig source = xserver-autobind-hotplug.patch source = 0001-v2-FS-58644.patch source = 0002-fix-libshadow-2.patch - source = 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch - source = glvnd.patch source = xvfb-run source = xvfb-run.1 source = freedesktop-bug-865.patch @@ -51,14 +48,13 @@ pkgbase = xorg-server-bug865 validpgpkeys = C383B778255613DFDB409D91DB221A6900000011 validpgpkeys = DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3 validpgpkeys = 995ED5C8A6138EB0961F18474C09DD83CAAA50B2 - sha512sums = 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 + validpgpkeys = 3BB639E56F861FA2E86505690FDD682D974CA72A + sha512sums = 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 sha512sums = SKIP sha512sums = d84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22 sha512sums = 74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363 - sha512sums = 0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271 - sha512sums = d60662f4eefeb64a034563cbfc36167466e0f4b0357d996bdb3462de14b2936420414e3527defe72af781d9fe9757e7486a43f952d8b7740b08815bc5df7b28f - sha512sums = 0cdb9972af7fb215f0f2a7677cf05f0a35b7227a2953cb68a59d9947a02f6f1c128a080cf3e28d6c6295fc24d673cb258e29d6a976b8c924f73a797e5188452a - sha512sums = 55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6 + sha512sums = 3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1 + sha512sums = 73c8ead9fba6815dabfec0a55b3a53f01169f6f2d14ac4a431e53b2d96028672dbd6b50a3314568847b37b1e54ea4fc02bdf677feabb3b2697af55e2e5331810 sha512sums = de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22 sha512sums = 81be7b0ecd9de850f0c740762d37c7489f12b34eb6adb19b3d3077f66d66e48e1206eff4bd29e50f5640509390a08fa138a4664b60d90878d4d17cb1f6919baf @@ -81,7 +77,7 @@ pkgname = xorg-server-bug865 provides = X-ABI-XINPUT_VERSION=24.1 provides = X-ABI-EXTENSION_VERSION=10.0 provides = x-server - provides = xorg-server=1.20.5 + provides = xorg-server=1.20.6 conflicts = nvidia-utils<=331.20 conflicts = glamor-egl conflicts = xf86-video-modesetting diff --git a/0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch b/0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch deleted file mode 100644 index e72c31b25b39..000000000000 --- a/0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2f0dd1816d556eef8c4b691330d39f13e1ed93f0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> -Date: Wed, 3 Jul 2019 11:53:56 +0200 -Subject: [PATCH] Revert "present/scmd: Check that the flip and screen pixmap - pitches match" - -This reverts commit ef91da2757050652c724f6e674e8b1acf5d0cb31. - -I thought this couldn't work under any circumstances, but I was wrong, -and drivers are already checking for cases that really cannot work. - -Fixes issue #839. ---- - present/present_scmd.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/present/present_scmd.c b/present/present_scmd.c -index 7c2f80997..8417d0925 100644 ---- a/present/present_scmd.c -+++ b/present/present_scmd.c -@@ -78,7 +78,7 @@ present_check_flip(RRCrtcPtr crtc, - PresentFlipReason *reason) - { - ScreenPtr screen = window->drawable.pScreen; -- PixmapPtr screen_pixmap, window_pixmap; -+ PixmapPtr window_pixmap; - WindowPtr root = screen->root; - present_screen_priv_ptr screen_priv = present_screen_priv(screen); - -@@ -99,9 +99,8 @@ present_check_flip(RRCrtcPtr crtc, - return FALSE; - - /* Make sure the window hasn't been redirected with Composite */ -- screen_pixmap = screen->GetScreenPixmap(screen); - window_pixmap = screen->GetWindowPixmap(window); -- if (window_pixmap != screen_pixmap && -+ if (window_pixmap != screen->GetScreenPixmap(screen) && - window_pixmap != screen_priv->flip_pixmap && - window_pixmap != present_flip_pending_pixmap(screen)) - return FALSE; -@@ -127,8 +126,7 @@ present_check_flip(RRCrtcPtr crtc, - window->drawable.x != pixmap->screen_x || window->drawable.y != pixmap->screen_y || - #endif - window->drawable.width != pixmap->drawable.width || -- window->drawable.height != pixmap->drawable.height || -- pixmap->devKind != screen_pixmap->devKind) { -+ window->drawable.height != pixmap->drawable.height) { - return FALSE; - } - --- -2.23.0 - diff --git a/0002-fix-libshadow-2.patch b/0002-fix-libshadow-2.patch index 8f6834d62792..d98c6fd4beda 100644 --- a/0002-fix-libshadow-2.patch +++ b/0002-fix-libshadow-2.patch @@ -1,24 +1,30 @@ -From 9ed4ae9cf207360000742c09007a32ad144b52db Mon Sep 17 00:00:00 2001 -From: fafryd <dz1125.bug.tracker@gmail.com> -Date: Fri, 25 May 2018 20:17:35 +0200 -Subject: [PATCH] fix libshadow +From a530b6e8923f2b9153a773c8618a1e2f41619288 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 30 Apr 2019 18:01:27 -0400 +Subject: [PATCH] meson: Fix libshadow.so linkage +Don't link against fb, it's the driver's responsibility to load that +first. Underlinking like this is unpleasant but this matches what +autotools does. + +Fixes: xorg/xserver#540 --- - hw/xfree86/dixmods/meson.build | 1 + - 1 file changed, 1 insertion(+) + hw/xfree86/dixmods/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build -index 835d23215..6bd8029b6 100644 +index 835d23215..0562b630f 100644 --- a/hw/xfree86/dixmods/meson.build +++ b/hw/xfree86/dixmods/meson.build -@@ -38,6 +38,7 @@ shared_module( +@@ -34,7 +34,7 @@ shared_module( + c_args: xorg_c_args, + dependencies: common_dep, + link_whole: libxserver_miext_shadow, +- link_with: [fb, e], ++ link_with: e, install: true, install_dir: module_dir, -+ install_rpath: '$ORIGIN/./', - ) - - if build_glx -- -2.17.0 +2.22.0 @@ -3,15 +3,15 @@ pkgbase=xorg-server-bug865 pkgname=xorg-server-bug865 -pkgver=1.20.5 -pkgrel=4 +pkgver=1.20.6 +pkgrel=3 arch=('x86_64') license=('custom') groups=('xorg') url="https://xorg.freedesktop.org" makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans' 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv' - 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 'libxres' + 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'libepoxy' 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'egl-wayland' 'meson') # 'git') @@ -19,23 +19,20 @@ source=(https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${p xserver-autobind-hotplug.patch 0001-v2-FS-58644.patch 0002-fix-libshadow-2.patch - 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch - glvnd.patch xvfb-run # with updates from FC master xvfb-run.1 freedesktop-bug-865.patch) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' - '995ED5C8A6138EB0961F18474C09DD83CAAA50B2') -sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631' + '995ED5C8A6138EB0961F18474C09DD83CAAA50B2' + '3BB639E56F861FA2E86505690FDD682D974CA72A') +sha512sums=('9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6' 'SKIP' 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' - '0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271' - 'd60662f4eefeb64a034563cbfc36167466e0f4b0357d996bdb3462de14b2936420414e3527defe72af781d9fe9757e7486a43f952d8b7740b08815bc5df7b28f' - '0cdb9972af7fb215f0f2a7677cf05f0a35b7227a2953cb68a59d9947a02f6f1c128a080cf3e28d6c6295fc24d673cb258e29d6a976b8c924f73a797e5188452a' - '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6' + '3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1' + '73c8ead9fba6815dabfec0a55b3a53f01169f6f2d14ac4a431e53b2d96028672dbd6b50a3314568847b37b1e54ea4fc02bdf677feabb3b2697af55e2e5331810' 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22' '81be7b0ecd9de850f0c740762d37c7489f12b34eb6adb19b3d3077f66d66e48e1206eff4bd29e50f5640509390a08fa138a4664b60d90878d4d17cb1f6919baf') @@ -49,16 +46,9 @@ prepare() { # https://bugs.freedesktop.org/show_bug.cgi?id=106588 patch -Np1 -i ../0001-v2-FS-58644.patch - # Fix libshadow.so: libfb.so => not found - FS#58731 - # https://bugs.freedesktop.org/show_bug.cgi?id=106656 + # Fix libshadow.so: libfb.so => not found - merge in master patch -Np1 -i ../0002-fix-libshadow-2.patch - # fix building with libglvnd - partially merged upstream - FS#64228 - patch -Np1 -i ../glvnd.patch - - # fix FS#62973 - merged upstream - patch -Np1 -i ../0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch - # The patch for freedesktop bug 865 patch -Np1 -i "${srcdir}/freedesktop-bug-865.patch" } @@ -74,7 +64,6 @@ build() { arch-meson xorg-server-$pkgver build \ -D os_vendor="Arch Linux" \ -D ipv6=true \ - -D dmx=true \ -D xvfb=true \ -D xnest=true \ -D xcsecurity=true \ diff --git a/glvnd.patch b/glvnd.patch deleted file mode 100644 index 74f872f8cfe5..000000000000 --- a/glvnd.patch +++ /dev/null @@ -1,181 +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, --- -2.23.0 - -From c7486613b0dc586f93f6ba293d9b55c69995b05c Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 9 Oct 2019 15:17:47 -0400 -Subject: [PATCH] meson: Fix another reference to "gl" 9.2.0 - -Previous commit e6ef2b12 missed a spot. ---- - glx/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glx/meson.build b/glx/meson.build -index 745814336..d7a2aa468 100644 ---- a/glx/meson.build -+++ b/glx/meson.build -@@ -74,7 +74,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.0'), - ], - ) - --- -2.23.0 - -From 3340ddf37743fdf197dfc16a97107435ff53c6e4 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 9 Oct 2019 16:03:17 -0400 -Subject: [PATCH] meson: Apparently 1.2 is < 1.2.0 - -Siiiigh. ---- - glx/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glx/meson.build b/glx/meson.build -index d7a2aa468..1140522f6 100644 ---- a/glx/meson.build -+++ b/glx/meson.build -@@ -74,7 +74,7 @@ if build_glx - common_dep, - dl_dep, - dependency('glproto', version: '>= 1.4.17'), -- dependency('gl', version: '>= 1.2.0'), -+ dependency('gl', version: '>= 1.2'), - ], - ) - --- -2.23.0 - -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 a211e0915..e28b65078 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> @@ -101,7 +101,7 @@ find_free_servernum() { # Parse the command line. ARGS=$(getopt --options +ade:f:hn:lp:s:w: \ - --long auto-servernum,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ + --long auto-servernum,auto-display,error-file:auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ --name "$PROGNAME" -- "$@") GETOPT_STATUS=$? |