diff options
author | Michael Taboada | 2020-03-22 14:51:39 -0700 |
---|---|---|
committer | Michael Taboada | 2020-03-22 14:51:39 -0700 |
commit | ef383b702794dab79dcb6aaba4e9676ad5e8ef25 (patch) | |
tree | f7dd3d995f27343dc47bbdcf32160997c3732897 | |
parent | 384f987ae173e45b788647530065d46917a99be4 (diff) | |
download | aur-ef383b702794dab79dcb6aaba4e9676ad5e8ef25.tar.gz |
1.20.7
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | 0002-fix-libshadow-2.patch | 32 | ||||
-rw-r--r-- | PKGBUILD | 47 | ||||
-rw-r--r-- | xvfb-run | 2 |
4 files changed, 44 insertions, 71 deletions
@@ -1,5 +1,5 @@ pkgbase = xorg-server-notty - pkgver = 1.20.5 + pkgver = 1.20.7 pkgrel = 1 url = http://xorg.freedesktop.org arch = i686 @@ -21,7 +21,6 @@ pkgbase = xorg-server-notty makedepends = libxrender makedepends = libxi makedepends = libxaw - makedepends = libdmx makedepends = libxtst makedepends = libxres makedepends = xorg-xkbcomp @@ -39,9 +38,8 @@ pkgbase = xorg-server-notty 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 = 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 = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.7.tar.bz2 + source = https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.20.7.tar.bz2.sig source = xserver-autobind-hotplug.patch source = 0001-v2-FS-58644.patch source = 0002-fix-libshadow-2.patch @@ -52,13 +50,13 @@ pkgbase = xorg-server-notty validpgpkeys = C383B778255613DFDB409D91DB221A6900000011 validpgpkeys = DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3 validpgpkeys = 995ED5C8A6138EB0961F18474C09DD83CAAA50B2 - sha512sums = 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 + validpgpkeys = 3BB639E56F861FA2E86505690FDD682D974CA72A + sha512sums = c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5 sha512sums = SKIP - sha512sums = d707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e sha512sums = d84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22 sha512sums = 74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363 - sha512sums = 0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271 - sha512sums = 55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6 + sha512sums = 3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1 + sha512sums = 73c8ead9fba6815dabfec0a55b3a53f01169f6f2d14ac4a431e53b2d96028672dbd6b50a3314568847b37b1e54ea4fc02bdf677feabb3b2697af55e2e5331810 sha512sums = de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22 sha512sums = 4b336929498e29eaa272b81942dd2e08a01046fc8677664cb657dbd6ca12e4cab7dfacc2aa23c84f05156c0064f43419fc1d6dceba609a6bb40718bd6cb40839 @@ -81,6 +79,7 @@ pkgname = xorg-server-notty provides = X-ABI-XINPUT_VERSION=24.1 provides = X-ABI-EXTENSION_VERSION=10.0 provides = x-server + provides = xorg-server conflicts = nvidia-utils<=331.20 conflicts = glamor-egl conflicts = xf86-video-modesetting @@ -107,20 +106,6 @@ pkgname = xorg-server-xephyr-notty provides = xorg-server-xephyr conflicts = xorg-server-xephyr -pkgname = xorg-server-xdmx-notty - pkgdesc = Distributed Multihead X Server and utilities - depends = libxfont2 - depends = libxi - depends = libxaw - depends = libxrender - depends = libdmx - depends = libxfixes - depends = pixman - depends = xorg-server-common - depends = nettle - provides = xorg-server-xdmx - conflicts = xorg-server-xdmx - pkgname = xorg-server-xvfb-notty pkgdesc = Virtual framebuffer X server depends = libxfont2 @@ -130,6 +115,7 @@ pkgname = xorg-server-xvfb-notty depends = xorg-xauth depends = libgl depends = nettle + depends = libtirpc provides = xorg-server-xvfb conflicts = xorg-server-xvfb @@ -149,7 +135,7 @@ pkgname = xorg-server-xwayland-notty depends = libxfont2 depends = libepoxy depends = libunwind - depends = libsystemd + depends = systemd-libs depends = libgl depends = pixman depends = xorg-server-common 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 @@ -2,11 +2,11 @@ # based on the xorg-server package from official arch packages. -pkgbase=xorg-server-notty _pkgbase=xorg-server -pkgname=('xorg-server-notty' 'xorg-server-xephyr-notty' 'xorg-server-xdmx-notty' 'xorg-server-xvfb-notty' 'xorg-server-xnest-notty' +pkgbase=xorg-server-notty +pkgname=('xorg-server-notty' 'xorg-server-xephyr-notty' 'xorg-server-xvfb-notty' 'xorg-server-xnest-notty' 'xorg-server-xwayland-notty' 'xorg-server-common-notty' 'xorg-server-devel-notty') -pkgver=1.20.5 +pkgver=1.20.7 pkgrel=1 arch=('i686' 'x86_64' 'armv7h' 'aarch64') license=('custom') @@ -14,12 +14,11 @@ license=('custom') url="http://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') 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 @@ -29,21 +28,18 @@ source=(https://xorg.freedesktop.org/releases/individual/xserver/${_pkgbase}-${p validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C' 'C383B778255613DFDB409D91DB221A6900000011' 'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3' - '995ED5C8A6138EB0961F18474C09DD83CAAA50B2') -sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631' + '995ED5C8A6138EB0961F18474C09DD83CAAA50B2' + '3BB639E56F861FA2E86505690FDD682D974CA72A') +sha512sums=('c67612e379111c28c68941c0a660abf72be7669591b41ccaa3b3474c4540a03822a28d892831b12ce08bac6e5e7e33504c2d19ef2a0c2298f83bd083459f96f5' 'SKIP' - 'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e' 'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22' '74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363' - '0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271' - '55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6' + '3d3be34ad9fa976daec53573d3a30a9f1953341ba5ee27099af0141f0ef7994fa5cf84dc08aae848380e6abfc10879f9a67f07601c7a437abf8aef13a3ec9fe1' + '73c8ead9fba6815dabfec0a55b3a53f01169f6f2d14ac4a431e53b2d96028672dbd6b50a3314568847b37b1e54ea4fc02bdf677feabb3b2697af55e2e5331810' 'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22' '4b336929498e29eaa272b81942dd2e08a01046fc8677664cb657dbd6ca12e4cab7dfacc2aa23c84f05156c0064f43419fc1d6dceba609a6bb40718bd6cb40839') prepare() { - # missing from tarball - cp xwayland-config.h.meson.in ${_pkgbase}-${pkgver}/include/ - cd "${_pkgbase}-${pkgver}" # patch from Fedora, not yet merged @@ -53,8 +49,7 @@ 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 # add notty option for dummy (and similar) drivers @@ -72,7 +67,6 @@ build() { arch-meson ${_pkgbase}-$pkgver build \ -D os_vendor="Arch Linux" \ -D ipv6=true \ - -D dmx=true \ -D xvfb=true \ -D xnest=true \ -D xcsecurity=true \ @@ -127,7 +121,7 @@ package_xorg-server-notty() { # 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=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server' 'xorg-server') conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server') replaces=('glamor-egl' 'xf86-video-modesetting') install=xorg-server.install @@ -165,7 +159,8 @@ package_xorg-server-xephyr-notty() { package_xorg-server-xvfb-notty() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth libgl nettle) + depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth + libgl nettle libtirpc) conflicts=('xorg-server-xvfb') provides=('xorg-server-xvfb') @@ -192,23 +187,9 @@ package_xorg-server-xnest-notty() { install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_pkgbase}-${pkgver}"/COPYING } -package_xorg-server-xdmx-notty() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes - pixman xorg-server-common nettle) - conflicts=('xorg-server-xdmx') - provides=('xorg-server-xdmx') - - _install fakeinstall/usr/bin/{Xdmx,dmx*,vdltodmx,xdmxconfig} - _install fakeinstall/usr/share/man/man1/{Xdmx,dmxtodmx,vdltodmx,xdmxconfig}.1 - - # license - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_pkgbase}-${pkgver}"/COPYING -} - package_xorg-server-xwayland-notty() { pkgdesc="run X clients under wayland" - depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common + depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common nettle libtirpc) conflicts=('xorg-server-xwayland') provides=('xorg-server-xwayland') @@ -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=$? |