diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 22 |
1 files changed, 13 insertions, 9 deletions
@@ -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 |