2020-08-30 21:34:57 +00:00
|
|
|
# Maintainer: AndyRTR <andyrtr@archlinux.org>
|
|
|
|
# Maintainer: Jan de Groot <jgc@archlinux.org>
|
|
|
|
|
|
|
|
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
|
|
# - upstream patch to fix segfault
|
|
|
|
|
|
|
|
pkgbase=xorg-server
|
|
|
|
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
|
2020-12-11 14:02:49 +00:00
|
|
|
'xorg-server-common' 'xorg-server-devel')
|
2020-11-21 17:12:24 +00:00
|
|
|
|
2020-12-01 20:53:55 +00:00
|
|
|
_commit=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10
|
2020-11-21 17:12:24 +00:00
|
|
|
|
2020-12-01 20:53:55 +00:00
|
|
|
pkgver=1.20.10
|
2020-12-11 14:02:49 +00:00
|
|
|
pkgrel=2
|
2020-08-30 21:34:57 +00:00
|
|
|
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' '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'
|
2020-12-11 14:02:49 +00:00
|
|
|
'libxshmfence' 'libunwind' 'systemd' 'meson' 'git')
|
2020-11-21 17:12:24 +00:00
|
|
|
source=(#https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
|
2020-12-01 20:53:55 +00:00
|
|
|
"git+https://gitlab.freedesktop.org/xorg/xserver#commit=${_commit}" #?signed"
|
2020-08-30 21:34:57 +00:00
|
|
|
xserver-autobind-hotplug.patch
|
|
|
|
0001-v2-FS-58644.patch
|
|
|
|
0002-fix-libshadow-2.patch
|
|
|
|
0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
|
|
|
|
xvfb-run # with updates from FC master
|
|
|
|
xvfb-run.1)
|
|
|
|
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
|
|
|
|
'C383B778255613DFDB409D91DB221A6900000011'
|
|
|
|
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
|
2020-11-16 14:55:41 +00:00
|
|
|
''
|
2020-08-30 21:34:57 +00:00
|
|
|
'3BB639E56F861FA2E86505690FDD682D974CA72A')
|
2020-11-21 17:12:24 +00:00
|
|
|
sha256sums=('SKIP'
|
|
|
|
'cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8'
|
|
|
|
'6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4'
|
|
|
|
'd07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e'
|
|
|
|
'12e2a4a330e3e253aa1064414e222deed3653b2da93963d85c9f58b0be993e03'
|
|
|
|
'd709078f5658576931655c7a46ff90b3586a2643a9124075d00ff3a567937845'
|
|
|
|
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
|
|
|
|
|
|
|
|
pkgver() {
|
|
|
|
cd xserver
|
|
|
|
git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
|
|
|
}
|
2020-08-30 21:34:57 +00:00
|
|
|
|
|
|
|
prepare() {
|
2020-11-21 17:12:24 +00:00
|
|
|
#cd "${pkgbase}"-${pkgver}"
|
|
|
|
cd xserver
|
2020-08-30 21:34:57 +00:00
|
|
|
|
|
|
|
# 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
|
|
|
|
|
|
|
|
# Fix segfault on probing a non-PCI platform device on a system with PCI
|
|
|
|
patch -Np1 -i ../0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch
|
|
|
|
}
|
|
|
|
|
|
|
|
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}
|
|
|
|
|
2020-11-21 17:12:24 +00:00
|
|
|
#arch-meson ${pkgbase}-$pkgver build \
|
|
|
|
arch-meson xserver build \
|
2020-08-30 21:34:57 +00:00
|
|
|
-D os_vendor="Arch Linux" \
|
|
|
|
-D ipv6=true \
|
|
|
|
-D xvfb=true \
|
|
|
|
-D xnest=true \
|
|
|
|
-D xcsecurity=true \
|
|
|
|
-D xorg=true \
|
|
|
|
-D xephyr=true \
|
2020-12-11 14:02:49 +00:00
|
|
|
-D xwayland=false \
|
|
|
|
-D xwayland_eglstream=false \
|
2020-08-30 21:34:57 +00:00
|
|
|
-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
|
|
|
|
|
2020-11-21 17:12:24 +00:00
|
|
|
#install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
|
|
|
|
install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled
|
2020-08-30 21:34:57 +00:00
|
|
|
# license
|
2020-11-21 17:12:24 +00:00
|
|
|
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
2020-08-30 21:34:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2020-11-21 17:12:24 +00:00
|
|
|
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
2020-08-30 21:34:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2020-11-21 17:12:24 +00:00
|
|
|
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
2020-08-30 21:34:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
package_xorg-server-xvfb() {
|
|
|
|
pkgdesc="Virtual framebuffer X server"
|
|
|
|
depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth
|
|
|
|
libgl nettle libtirpc)
|
|
|
|
|
|
|
|
_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
|
2020-11-21 17:12:24 +00:00
|
|
|
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
2020-08-30 21:34:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2020-11-21 17:12:24 +00:00
|
|
|
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
2020-08-30 21:34:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
2020-11-21 17:12:24 +00:00
|
|
|
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
|
|
|
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
2020-08-30 21:34:57 +00:00
|
|
|
|
|
|
|
# make sure there are no files left to install
|
|
|
|
find fakeinstall -depth -print0 | xargs -0 rmdir
|
|
|
|
}
|