diff options
author | Platon Ryzhikov | 2019-10-30 11:10:25 +0300 |
---|---|---|
committer | Platon Ryzhikov | 2019-10-30 11:10:25 +0300 |
commit | cb9c1404b1dde6a5c2ace4e58866c769a0062221 (patch) | |
tree | 2559f06c58ac41be28409c8e73b3a92c744aed0e | |
parent | cedbb7b31645135130a8e99b3c18103e75b87735 (diff) | |
download | aur-cb9c1404b1dde6a5c2ace4e58866c769a0062221.tar.gz |
Update to 1.20.5-4
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | 0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch | 53 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | glvnd.patch | 181 |
4 files changed, 253 insertions, 13 deletions
@@ -1,7 +1,7 @@ pkgbase = xorg-server-noudev pkgver = 1.20.5 - pkgrel = 2 - url = http://xorg.freedesktop.org + pkgrel = 4 + url = https://xorg.freedesktop.org arch = x86_64 groups = xorg-noudev license = custom @@ -38,10 +38,11 @@ pkgbase = xorg-server-noudev 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 = xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0 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 validpgpkeys = 7B27A3F1A6E18CD9588B4AE8310180050905E40C @@ -50,10 +51,11 @@ pkgbase = xorg-server-noudev validpgpkeys = 995ED5C8A6138EB0961F18474C09DD83CAAA50B2 sha512sums = 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 sha512sums = SKIP - sha512sums = d707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e sha512sums = d84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22 sha512sums = 74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363 sha512sums = 0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271 + sha512sums = d60662f4eefeb64a034563cbfc36167466e0f4b0357d996bdb3462de14b2936420414e3527defe72af781d9fe9757e7486a43f952d8b7740b08815bc5df7b28f + sha512sums = 0cdb9972af7fb215f0f2a7677cf05f0a35b7227a2953cb68a59d9947a02f6f1c128a080cf3e28d6c6295fc24d673cb258e29d6a976b8c924f73a797e5188452a sha512sums = 55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6 sha512sums = de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22 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 new file mode 100644 index 000000000000..e72c31b25b39 --- /dev/null +++ b/0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch @@ -0,0 +1,53 @@ +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 + @@ -11,11 +11,11 @@ _pkgbase=xorg-server pkgname=('xorg-server-noudev' 'xorg-server-xephyr-noudev' 'xorg-server-xdmx-noudev' 'xorg-server-xvfb-noudev' 'xorg-server-xnest-noudev' 'xorg-server-xwayland-noudev' 'xorg-server-common-noudev' 'xorg-server-devel-noudev') pkgver=1.20.5 -pkgrel=2 +pkgrel=4 arch=('x86_64') license=('custom') groups=('xorg-noudev') -url="http://xorg.freedesktop.org" +url="https://xorg.freedesktop.org" makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans' 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv' 'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' 'libxtst' 'libxres' @@ -23,10 +23,11 @@ makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans' 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'libxshmfence' 'libunwind' 'wayland-protocols' 'egl-wayland' 'meson') # 'git') source=(https://xorg.freedesktop.org/releases/individual/xserver/${_pkgbase}-${pkgver}.tar.bz2{,.sig} - 'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0' 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) validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' @@ -35,17 +36,15 @@ validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' '995ED5C8A6138EB0961F18474C09DD83CAAA50B2') sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631' 'SKIP' - 'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e' 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' '0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271' + 'd60662f4eefeb64a034563cbfc36167466e0f4b0357d996bdb3462de14b2936420414e3527defe72af781d9fe9757e7486a43f952d8b7740b08815bc5df7b28f' + '0cdb9972af7fb215f0f2a7677cf05f0a35b7227a2953cb68a59d9947a02f6f1c128a080cf3e28d6c6295fc24d673cb258e29d6a976b8c924f73a797e5188452a' '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6' 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22') prepare() { - # missing from tarball - cp xwayland-config.h.meson.in ${_pkgbase}-${pkgver}/include/ - cd "${_pkgbase}-${pkgver}" # patch from Fedora, not yet merged @@ -58,6 +57,12 @@ prepare() { # Fix libshadow.so: libfb.so => not found - FS#58731 # https://bugs.freedesktop.org/show_bug.cgi?id=106656 patch -Np1 -i ../0002-fix-libshadow-2.patch + + # fix FS#62973 - merged upstream + patch -Np1 -i ../0001-Revert-present-scmd-Check-that-the-flip-and-screen-p.patch + + # fix building with libglvnd - partially merged upstream - FS#64228 + patch -Np1 -i ../glvnd.patch } build() { @@ -106,7 +111,6 @@ _install() { done } - package_xorg-server-common-noudev() { pkgdesc="Xorg server common files (without udev support)" depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap) @@ -175,7 +179,7 @@ package_xorg-server-xvfb-noudev() { provides=('xorg-server-xvfb') conflicts=('xorg-server-xvfb') replaces=('xorg-server-xvfb') - + _install fakeinstall/usr/bin/Xvfb _install fakeinstall/usr/share/man/man1/Xvfb.1 diff --git a/glvnd.patch b/glvnd.patch new file mode 100644 index 000000000000..74f872f8cfe5 --- /dev/null +++ b/glvnd.patch @@ -0,0 +1,181 @@ +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> |