mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/xorg-server to 1.20.11-1
This commit is contained in:
Kevin Mihelich
parent
4c9abe7b6b
commit
92c0b3fe01
1 changed files with 15 additions and 33 deletions
|
|
@ -7,11 +7,8 @@
|
|||
pkgbase=xorg-server
|
||||
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xvfb' 'xorg-server-xnest'
|
||||
'xorg-server-common' 'xorg-server-devel')
|
||||
|
||||
_commit=bc111a2e67e16d4e6d4f3196ab86c22c1e278c45 # server-1.20-branch 2020-12-01 = 1.20.10
|
||||
|
||||
pkgver=1.20.10
|
||||
pkgrel=3
|
||||
pkgver=1.20.11
|
||||
pkgrel=1
|
||||
arch=('x86_64')
|
||||
license=('custom')
|
||||
groups=('xorg')
|
||||
|
|
@ -23,8 +20,7 @@ makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
|
|||
'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms'
|
||||
'libxshmfence' 'libunwind' 'systemd' 'meson' 'git'
|
||||
'wayland-protocols' 'egl-wayland')
|
||||
source=(#https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
|
||||
"git+https://gitlab.freedesktop.org/xorg/xserver#commit=${_commit}" #?signed"
|
||||
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
|
||||
|
|
@ -34,9 +30,9 @@ source=(#https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase}-${p
|
|||
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
|
||||
'C383B778255613DFDB409D91DB221A6900000011'
|
||||
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
|
||||
''
|
||||
'3BB639E56F861FA2E86505690FDD682D974CA72A')
|
||||
sha256sums=('SKIP'
|
||||
sha256sums=('914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49'
|
||||
'SKIP'
|
||||
'cae1b7f296c18177de38f9b1215a4f916da2288b85f1fcb9e80373a42e2892b8'
|
||||
'6253fb5cf06cf650539be585d6ca13cfa00217b51ca9825476c8fd55c09341a4'
|
||||
'd07b2fe55828dad61517a80c77f6f183113916f5e1fce30ff43041550d58bd6e'
|
||||
|
|
@ -44,14 +40,8 @@ sha256sums=('SKIP'
|
|||
'd709078f5658576931655c7a46ff90b3586a2643a9124075d00ff3a567937845'
|
||||
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
|
||||
|
||||
pkgver() {
|
||||
cd xserver
|
||||
git describe --tags | sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
|
||||
}
|
||||
|
||||
prepare() {
|
||||
#cd "${pkgbase}"-${pkgver}"
|
||||
cd xserver
|
||||
cd "${pkgbase}-${pkgver}"
|
||||
|
||||
# patch from Fedora, not yet merged
|
||||
patch -Np1 -i ../xserver-autobind-hotplug.patch
|
||||
|
|
@ -75,9 +65,8 @@ build() {
|
|||
export CXXFLAGS=${CXXFLAGS/-fno-plt}
|
||||
export LDFLAGS=${LDFLAGS/,-z,now}
|
||||
|
||||
#arch-meson ${pkgbase}-$pkgver build \
|
||||
arch-meson xserver build \
|
||||
-D os_vendor="Arch Linux" \
|
||||
arch-meson ${pkgbase}-$pkgver build \
|
||||
-D os_vendor="Archlinux" \
|
||||
-D ipv6=true \
|
||||
-D xvfb=true \
|
||||
-D xnest=true \
|
||||
|
|
@ -118,11 +107,9 @@ package_xorg-server-common() {
|
|||
_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
|
||||
install -m644 -Dt "${pkgdir}/var/lib/xkb/" xserver/xkb/README.compiled
|
||||
install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}-${pkgver}"/xkb/README.compiled
|
||||
# license
|
||||
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
}
|
||||
|
||||
package_xorg-server() {
|
||||
|
|
@ -151,8 +138,7 @@ package_xorg-server() {
|
|||
install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
|
||||
|
||||
# license
|
||||
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
}
|
||||
|
||||
package_xorg-server-xephyr() {
|
||||
|
|
@ -165,8 +151,7 @@ package_xorg-server-xephyr() {
|
|||
_install fakeinstall/usr/share/man/man1/Xephyr.1
|
||||
|
||||
# license
|
||||
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
}
|
||||
|
||||
package_xorg-server-xvfb() {
|
||||
|
|
@ -181,8 +166,7 @@ package_xorg-server-xvfb() {
|
|||
install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
|
||||
|
||||
# license
|
||||
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
}
|
||||
|
||||
package_xorg-server-xnest() {
|
||||
|
|
@ -193,8 +177,7 @@ package_xorg-server-xnest() {
|
|||
_install fakeinstall/usr/share/man/man1/Xnest.1
|
||||
|
||||
# license
|
||||
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
}
|
||||
|
||||
package_xorg-server-devel() {
|
||||
|
|
@ -208,8 +191,7 @@ package_xorg-server-devel() {
|
|||
_install fakeinstall/usr/share/aclocal/xorg-server.m4
|
||||
|
||||
# license
|
||||
#install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" xserver/COPYING
|
||||
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase}-${pkgver}"/COPYING
|
||||
|
||||
# make sure there are no files left to install
|
||||
rm fakeinstall/usr/bin/Xwayland
|
||||
|
|
|
|||
Loading…
Reference in a new issue