Commit ca360cd1 authored by Eric Vidal's avatar Eric Vidal 💬
Browse files

upgpkg: 1.20.0-4

parent ebcec450
Pipeline #374793 passed with stages
in 7 minutes and 33 seconds
......@@ -12,17 +12,16 @@ pkgname=(
'xorg-server-xephyr-rootless'
'xorg-server-xvfb-rootless'
'xorg-server-xnest-rootless'
'xorg-server-xwayland-rootless'
'xorg-server-common-rootless'
'xorg-server-devel-rootless')
pkgver=1.20.9.r21.g5c400cae1
pkgrel=3
pkgver=1.20.10
pkgrel=4
url="https://xorg.freedesktop.org/releases/individual/xserver"
track=commit
target=5c400cae1f9817045378966effa6bca91e45aead # server-1.20-branch 2020-11-09
target=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10
source=("git+https://gitlab.freedesktop.org/xorg/xserver#${track}=${target}"
'xserver-autobind-hotplug.patch'
'0001-v2-FS-58644.patch'
......@@ -60,10 +59,10 @@ makedepends=(
'xcb-util-keysyms'
'libxshmfence'
'libunwind'
'wayland-protocols'
'egl-wayland'
'meson'
'git')
'git'
'wayland-protocols'
'egl-wayland')
#--------------------------------------| BUILD PREPARATION |------------------------------------
......@@ -233,20 +232,6 @@ package_xorg-server-xnest-rootless() {
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-xwayland-rootless() {
pkgdesc="run X clients under wayland"
depends=(libxfont2 libepoxy libunwind libgl pixman xorg-server-common-rootless
nettle libtirpc)
conflicts=('xorg-server-xwayland')
provides=('xorg-server-xwayland')
_install fakeinstall/usr/bin/Xwayland
# license
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
}
package_xorg-server-devel-rootless() {
pkgdesc="Development files for the X.Org X server"
depends=('xorgproto' 'mesa' 'libpciaccess'
......@@ -264,6 +249,7 @@ package_xorg-server-devel-rootless() {
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
# make sure there are no files left to install
rm fakeinstall/usr/bin/Xwayland
find fakeinstall -depth -print0 | xargs -0 rmdir
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment