238 lines
9.8 KiB
Bash
238 lines
9.8 KiB
Bash
# Maintainer: AndyRTR <andyrtr@archlinux.org>
|
|
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
|
|
|
pkgbase=xorg-server
|
|
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest'
|
|
'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
|
|
pkgver=1.20.5
|
|
pkgrel=4.1
|
|
arch=('x86_64')
|
|
license=('custom')
|
|
groups=('xorg')
|
|
url="https://xorg.freedesktop.org"
|
|
makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
|
|
'libxkbfile' 'libxfont2' 'libpciaccess' 'libxv'
|
|
'libxmu' 'libxrender' 'libxi' 'libxaw' 'libdmx' '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}
|
|
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
|
|
https://gitlab.freedesktop.org/xorg/xserver/commit/{7f962c70,37a36a6b,8b67ec7c,56c0a71f,b4231d69}.diff
|
|
)
|
|
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
|
|
'C383B778255613DFDB409D91DB221A6900000011'
|
|
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
|
|
'995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
|
|
sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
|
|
'SKIP'
|
|
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
|
|
'74e1aa0c101e42f0f25349d305641873b3a79ab3b9bb2d4ed68ba8e392b4db2701fcbc35826531ee2667d3ee55673e4b4fecc2a9f088141af29ceb400f72f363'
|
|
'0c7f7e43a2ba2372509f4a35e33a8a87a2e631c7e630c9c7c67ecaad00453b52c31d9dc26d1852ecd2fe1cb8c02cb716c1f39a4723473c38a0ef6e559bead271'
|
|
'd60662f4eefeb64a034563cbfc36167466e0f4b0357d996bdb3462de14b2936420414e3527defe72af781d9fe9757e7486a43f952d8b7740b08815bc5df7b28f'
|
|
'0cdb9972af7fb215f0f2a7677cf05f0a35b7227a2953cb68a59d9947a02f6f1c128a080cf3e28d6c6295fc24d673cb258e29d6a976b8c924f73a797e5188452a'
|
|
'55bbf520333f6e818b0125b37179a7039b69a0d3d2242b80a08da003d94cbf6c1fb912d880abcce318a85d7947e3eff8fbc4cdf57d7118572e8ebc56c4569af6'
|
|
'de5e2cb3c6825e6cf1f07ca0d52423e17f34d70ec7935e9dd24be5fb9883bf1e03b50ff584931bd3b41095c510ab2aa44d2573fd5feaebdcb59363b65607ff22'
|
|
'85cde8ca13453ec84de6a70a96847e395fed73f9dd646d7c4a44fda71650cc7a7bee1c18befb6a014d93aafe7f72a1f4dcb3f7971c7304dbf2d46a3cc7440fb8'
|
|
'50b8c8916484ae57ffdd0b4b8212370b77d9781f7cc56ccb76961799adb9871faff0744747318689c62553db468baa02425b26e214a7f5f05d76639eb31b2290'
|
|
'98bf35bf345cc73c5316e3a63a021d273f5a7eab52288e6e10648377f3f788f142c550aef75cea50f3db7d8443df337d70fa1e89dd3c3ab837530996e1c26389'
|
|
'7670f7c481ebf930acbe5777b8e7fdbd25bc95437916048f5aacd93d41cc39a79230e2f52b500009af7451a48392f82427885a0837a5047a358046b905dbb734'
|
|
'bd3730f710767f7216825446ce27ac6fdb49ab7d9a9b5aaf7531322812d45aacd32bcbb6ac4f38160dcf1cba742354aa8918635da79964df87955b1395862a98')
|
|
|
|
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 - 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
|
|
|
|
# PRIME offloading patches, see http://download.nvidia.com/XFree86/Linux-x86_64/435.21/README/primerenderoffload.html
|
|
patch -Np1 -i ../7f962c70.diff
|
|
patch -Np1 -i ../37a36a6b.diff
|
|
patch -Np1 -i ../8b67ec7c.diff
|
|
patch -Np1 -i ../56c0a71f.diff
|
|
patch -Np1 -i ../b4231d69.diff
|
|
}
|
|
|
|
build() {
|
|
# Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
|
|
# With them, module fail to load with undefined symbol.
|
|
# See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
|
|
export CFLAGS=${CFLAGS/-fno-plt}
|
|
export CXXFLAGS=${CXXFLAGS/-fno-plt}
|
|
export LDFLAGS=${LDFLAGS/,-z,now}
|
|
|
|
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 \
|
|
-D xorg=true \
|
|
-D xephyr=true \
|
|
-D xwayland=true \
|
|
-D xwayland_eglstream=true \
|
|
-D glamor=true \
|
|
-D udev=true \
|
|
-D systemd_logind=true \
|
|
-D suid_wrapper=true \
|
|
-D xkb_dir=/usr/share/X11/xkb \
|
|
-D xkb_output_dir=/var/lib/xkb
|
|
|
|
# Print config
|
|
meson configure build
|
|
ninja -C build
|
|
|
|
# fake installation to be seperated into packages
|
|
DESTDIR="${srcdir}/fakeinstall" ninja -C build install
|
|
}
|
|
|
|
_install() {
|
|
local src f dir
|
|
for src; do
|
|
f="${src#fakeinstall/}"
|
|
dir="${pkgdir}/${f%/*}"
|
|
install -m755 -d "${dir}"
|
|
mv -v "${src}" "${dir}/"
|
|
done
|
|
}
|
|
|
|
package_xorg-server-common() {
|
|
pkgdesc="Xorg server common files"
|
|
depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
|
|
|
|
_install fakeinstall/usr/lib/xorg/protocol.txt
|
|
_install fakeinstall/usr/share/man/man1/Xserver.1
|
|
|
|
install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
|
|
# license
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
}
|
|
|
|
package_xorg-server() {
|
|
pkgdesc="Xorg X server"
|
|
depends=(libepoxy libxfont2 pixman xorg-server-common libunwind
|
|
dbus libgl xf86-input-libinput nettle
|
|
libpciaccess libdrm libxshmfence) # FS#52949
|
|
|
|
# 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')
|
|
conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
|
|
replaces=('glamor-egl' 'xf86-video-modesetting')
|
|
install=xorg-server.install
|
|
|
|
_install fakeinstall/usr/bin/{Xorg,cvt,gtf}
|
|
ln -s /usr/bin/Xorg "${pkgdir}/usr/bin/X"
|
|
_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
|
|
_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"
|
|
|
|
# license
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
}
|
|
|
|
package_xorg-server-xephyr() {
|
|
pkgdesc="A nested X server that runs as an X application"
|
|
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)
|
|
|
|
_install fakeinstall/usr/bin/Xephyr
|
|
_install fakeinstall/usr/share/man/man1/Xephyr.1
|
|
|
|
# license
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
}
|
|
|
|
package_xorg-server-xvfb() {
|
|
pkgdesc="Virtual framebuffer X server"
|
|
depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth libgl nettle)
|
|
|
|
_install fakeinstall/usr/bin/Xvfb
|
|
_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
|
|
|
|
# license
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
}
|
|
|
|
package_xorg-server-xnest() {
|
|
pkgdesc="A nested X server that runs as an X application"
|
|
depends=(libxfont2 libxext pixman xorg-server-common nettle libtirpc)
|
|
|
|
_install fakeinstall/usr/bin/Xnest
|
|
_install fakeinstall/usr/share/man/man1/Xnest.1
|
|
|
|
# license
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
}
|
|
|
|
package_xorg-server-xdmx() {
|
|
pkgdesc="Distributed Multihead X Server and utilities"
|
|
depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes
|
|
pixman xorg-server-common nettle)
|
|
|
|
_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() {
|
|
pkgdesc="run X clients under wayland"
|
|
depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common
|
|
nettle libtirpc)
|
|
|
|
_install fakeinstall/usr/bin/Xwayland
|
|
|
|
# license
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
}
|
|
|
|
package_xorg-server-devel() {
|
|
pkgdesc="Development files for the X.Org X server"
|
|
depends=('xorgproto' 'mesa' 'libpciaccess'
|
|
# not technically required but almost every Xorg pkg needs it to build
|
|
'xorg-util-macros')
|
|
|
|
_install fakeinstall/usr/include/xorg/*
|
|
_install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
|
|
_install fakeinstall/usr/share/aclocal/xorg-server.m4
|
|
|
|
# license
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
|
|
# make sure there are no files left to install
|
|
find fakeinstall -depth -print0 | xargs -0 rmdir
|
|
}
|