diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 65 |
1 files changed, 23 insertions, 42 deletions
@@ -2,24 +2,23 @@ # 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.2 +pkgver=1.20.7 pkgrel=1 -arch=('x86_64') +arch=('i686' 'x86_64' 'armv7h' 'aarch64') license=('custom') #groups=('xorg') 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=('1c87d78b14529dd4b438ef038118c8540d1d17bdd58bf08ec5408a2ddbe8d0dda48033a9a9477cfc2c4c304dd1078fa40968a03c4d0cd3398359dd0fadb8e7c7' + '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 \ @@ -112,7 +106,7 @@ package_xorg-server-common-notty() { provides=('xorg-server-common') _install fakeinstall/usr/lib/xorg/protocol.txt - _install fakeinstall/usr/share/man/man1/Xserver.1.gz + _install fakeinstall/usr/share/man/man1/Xserver.1 install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${_pkgbase}-${pkgver}"/xkb/README.compiled # license @@ -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 @@ -137,9 +131,9 @@ package_xorg-server-notty() { _install fakeinstall/usr/lib/Xorg{,.wrap} _install fakeinstall/usr/lib/xorg/modules/* _install fakeinstall/usr/share/X11/xorg.conf.d/10-quirks.conf - _install fakeinstall/usr/share/man/man1/{Xorg,Xorg.wrap,cvt,gtf}.1.gz - _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4.gz - _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5.gz + _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/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5 # distro specific files must be installed in /usr/share/X11/xorg.conf.d install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" @@ -150,14 +144,14 @@ package_xorg-server-notty() { package_xorg-server-xephyr-notty() { pkgdesc="A nested X server that runs as an X application" - depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common + depends=(libxfont2 libgl libepoxy libunwind systemd-libs libxv pixman xorg-server-common xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms nettle libtirpc) conflicts=('xorg-server-xephyr') provides=('xorg-server-xephyr') _install fakeinstall/usr/bin/Xephyr - _install fakeinstall/usr/share/man/man1/Xephyr.1.gz + _install fakeinstall/usr/share/man/man1/Xephyr.1 # license install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_pkgbase}-${pkgver}"/COPYING @@ -165,12 +159,13 @@ 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') _install fakeinstall/usr/bin/Xvfb - _install fakeinstall/usr/share/man/man1/Xvfb.1.gz + _install fakeinstall/usr/share/man/man1/Xvfb.1 install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda @@ -186,21 +181,7 @@ package_xorg-server-xnest-notty() { provides=('xorg-server-xnest') _install fakeinstall/usr/bin/Xnest - _install fakeinstall/usr/share/man/man1/Xnest.1.gz - - # license - 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.gz + _install fakeinstall/usr/share/man/man1/Xnest.1 # license install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_pkgbase}-${pkgver}"/COPYING @@ -208,7 +189,7 @@ package_xorg-server-xdmx-notty() { 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') |