Date: Saturday, November 6, 2021 @ 10:00:31 Author: lcarlier Revision: 427394
upgpkg: xorg-server -: upstream update 21.1.0 Modified: xorg-server/trunk/PKGBUILD ----------+ PKGBUILD | 67 ++++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 42 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-11-06 01:13:54 UTC (rev 427393) +++ PKGBUILD 2021-11-06 10:00:31 UTC (rev 427394) @@ -4,33 +4,32 @@ pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') +<<<<<<< .mine +pkgver=21.1.0 +pkgrel=1 +||||||| .r426734 pkgver=1.20.13 +pkgrel=2 +======= +pkgver=1.20.13 pkgrel=3 +>>>>>>> .r427393 arch=('x86_64') license=('custom') groups=('xorg') url="https://xorg.freedesktop.org" makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans' - 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv' + 'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv' 'libxcvt' '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' 'meson' 'git') -source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig} - xserver-autobind-hotplug.patch - 0001-v2-FS-58644.patch - 0002-fix-libshadow-2.patch +source=(${pkgbase}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/xserver.git#commit=27a0ee32ccef8d621aaa758c804fc9a5ceeb5a56 +#source=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.xz{,.sig} xvfb-run # with updates from FC master xvfb-run.1) -validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' - 'C383B778255613DFDB409D91DB221A6900000011' - 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' - '3BB639E56F861FA2E86505690FDD682D974CA72A') -sha512sums=('4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3' - 'SKIP' - 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' - '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' - '3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1' +validpgpkeys=('FD0004A26EADFE43A4C3F249C6F7AE200374452D') # Povilas Kanapickas <povi...@radix.lt> +sha512sums=('SKIP' '4154dd55702b98083b26077bf70c60aa957b4795dbf831bcc4c78b3cb44efe214f0cf8e3c140729c829b5f24e7466a24615ab8dbcce0ac6ebee3229531091514' 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22') @@ -37,15 +36,6 @@ prepare() { cd "${pkgbase}-${pkgver}" - # patch from Fedora, not yet merged - patch -Np1 -i ../xserver-autobind-hotplug.patch - - # Fix rootless xorg - FS#58644 - # https://bugs.freedesktop.org/show_bug.cgi?id=106588 - patch -Np1 -i ../0001-v2-FS-58644.patch - - # Fix libshadow.so: libfb.so => not found - merge in master - patch -Np1 -i ../0002-fix-libshadow-2.patch } build() { @@ -57,7 +47,6 @@ export LDFLAGS=${LDFLAGS/,-z,now} arch-meson ${pkgbase}-$pkgver build \ - -D os_vendor="Archlinux" \ -D ipv6=true \ -D xvfb=true \ -D xnest=true \ @@ -66,6 +55,7 @@ -D xephyr=true \ -D glamor=true \ -D udev=true \ + -D dtrace=false \ -D systemd_logind=true \ -D suid_wrapper=true \ -D xkb_dir=/usr/share/X11/xkb \ @@ -107,22 +97,44 @@ pkgdesc="Xorg X server" depends=(libepoxy libxfont2 pixman xorg-server-common libunwind dbus libgl xf86-input-libinput nettle +<<<<<<< .mine libpciaccess libdrm libxshmfence libxcvt) # FS#52949 +||||||| .r426734 + libpciaccess libdrm libxshmfence) # FS#52949 +======= + libpciaccess libdrm libxshmfence libxcvt) # FS#52949 + +>>>>>>> .r427393 # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on # and /usr/lib/pkgconfig/xorg-server.pc in xorg-server-devel pkg - provides=('X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server') + provides=('X-ABI-VIDEODRV_VERSION=25.2' 'X-ABI-XINPUT_VERSION=24.4' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server') conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') replaces=('glamor-egl' 'xf86-video-modesetting') install=xorg-server.install +<<<<<<< .mine + _install fakeinstall/usr/bin/{X,Xorg,gtf} +||||||| .r426734 + _install fakeinstall/usr/bin/{Xorg,cvt,gtf} + ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X" +======= _install fakeinstall/usr/bin/{Xorg,gtf} ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X" +>>>>>>> .r427393 _install fakeinstall/usr/lib/Xorg{,.wrap} _install fakeinstall/usr/lib/xorg/modules/* _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf +<<<<<<< .mine _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1 + _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,inputtestdrv,modesetting}.4 +||||||| .r426734 + _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1 _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4 +======= + _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,gtf}.1 + _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4 +>>>>>>> .r427393 _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5 # distro specific files must be installed in /usr/share/X11/xorg.conf.d @@ -185,6 +197,11 @@ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING # make sure there are no files left to install +<<<<<<< .mine +||||||| .r426734 + rm fakeinstall/usr/bin/Xwayland +======= rm -rf fakeinstall/usr/bin/cvt fakeinstall/usr/share/man/man1/cvt.1 +>>>>>>> .r427393 find fakeinstall -depth -print0 | xargs -0 rmdir }