diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | PKGBUILD | 29 | ||||
| -rw-r--r-- | fix-xwayland-compile.patch | 28 |
3 files changed, 40 insertions, 36 deletions
@@ -1,5 +1,5 @@ pkgbase = xorg-server-git - pkgver = 1.20.0.r419.g7d0e660e0 + pkgver = 1.20.0.r569.gb1ee4036b pkgrel = 1 url = https://gitlab.freedesktop.org/xorg/xserver.git arch = x86_64 @@ -18,7 +18,6 @@ pkgbase = xorg-server-git makedepends = libxrender makedepends = libxi makedepends = libxaw - makedepends = libdmx makedepends = libxtst makedepends = libxres makedepends = xorg-xkbcomp @@ -38,9 +37,11 @@ pkgbase = xorg-server-git makedepends = meson makedepends = git source = git+https://gitlab.freedesktop.org/xorg/xserver.git + source = fix-xwayland-compile.patch source = xvfb-run source = xvfb-run.1 sha256sums = SKIP + sha256sums = a585e8c778ec2fd4f4f415051c6243e8e674f0cf038e8f2f440101bfde6f7d3b sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9 sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776 @@ -90,20 +91,6 @@ pkgname = xorg-server-xephyr-git provides = xorg-server-xephyr conflicts = xorg-server-xephyr -pkgname = xorg-server-xdmx-git - pkgdesc = Distributed Multihead X Server and utilities (git version) - depends = libxfont2 - depends = libxi - depends = libxaw - depends = libxrender - depends = libdmx - depends = libxfixes - depends = pixman - depends = xorg-server-common-git - depends = nettle - provides = xorg-server-xdmx - conflicts = xorg-server-xdmx - pkgname = xorg-server-xvfb-git pkgdesc = Virtual framebuffer X server (git version) depends = libxfont2 @@ -1,4 +1,5 @@ -# Maintainer: Yurii Kolesnykov <root@yurikoles.com> +# Maintainer: JustKidding <jk@vin.ovh> +# Contributor: Yurii Kolesnykov <root@yurikoles.com> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,14 +7,13 @@ pkgbase=xorg-server-git pkgname=( 'xorg-server-git' 'xorg-server-xephyr-git' - 'xorg-server-xdmx-git' 'xorg-server-xvfb-git' 'xorg-server-xnest-git' 'xorg-server-xwayland-git' 'xorg-server-common-git' 'xorg-server-devel-git') _pkgbase='xserver' -pkgver=1.20.0.r419.g7d0e660e0 +pkgver=1.20.0.r569.gb1ee4036b pkgrel=1 arch=('x86_64') license=('custom') @@ -21,14 +21,16 @@ groups=('xorg') url="https://gitlab.freedesktop.org/xorg/xserver.git" makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' '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=(git+https://gitlab.freedesktop.org/xorg/xserver.git + fix-xwayland-compile.patch xvfb-run xvfb-run.1) sha256sums=('SKIP' + 'a585e8c778ec2fd4f4f415051c6243e8e674f0cf038e8f2f440101bfde6f7d3b' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776') @@ -39,6 +41,9 @@ pkgver() { } prepare() { + cd "${_pkgbase}" + patch -Np1 -i ../fix-xwayland-compile.patch + cd .. # 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 @@ -54,7 +59,6 @@ prepare() { $mesonFlags \ -D os_vendor="Arch Linux" \ -D ipv6=true \ - -D dmx=true \ -D xvfb=true \ -D xnest=true \ -D xcsecurity=true \ @@ -193,21 +197,6 @@ package_xorg-server-xnest-git() { install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${_pkgbase}"/COPYING } -package_xorg-server-xdmx-git() { - _pkgname='xorg-server-xdmx' - provides=('xorg-server-xdmx') - conflicts=('xorg-server-xdmx') - pkgdesc="Distributed Multihead X Server and utilities (git version)" - depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes - pixman xorg-server-common-git 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}"/COPYING -} - package_xorg-server-xwayland-git() { _pkgname='xorg-server-xwayland' provides=('xorg-server-xwayland') diff --git a/fix-xwayland-compile.patch b/fix-xwayland-compile.patch new file mode 100644 index 000000000000..2636b570543e --- /dev/null +++ b/fix-xwayland-compile.patch @@ -0,0 +1,28 @@ +From bea53471f538d90eaaed5dcc7c9065d265d876ad Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com> +Date: Mon, 23 Dec 2019 09:26:17 +0100 +Subject: [PATCH 6/6] xwayland: Include xwayland-window.h from + xwayland-glamor-eglstream.c + +Fixes build failure. + +Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/954 +Fixes: 89e32d00f6e0 "xwayland: Move Xwayland windows to its own sources" +--- + hw/xwayland/xwayland-glamor-eglstream.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/hw/xwayland/xwayland-glamor-eglstream.c b/hw/xwayland/xwayland-glamor-eglstream.c +index 81947a6ba..aa5267a4d 100644 +--- a/hw/xwayland/xwayland-glamor-eglstream.c ++++ b/hw/xwayland/xwayland-glamor-eglstream.c +@@ -43,6 +43,7 @@ + #include "xwayland-glamor.h" + #include "xwayland-pixmap.h" + #include "xwayland-screen.h" ++#include "xwayland-window.h" + + #include "wayland-eglstream-client-protocol.h" + #include "wayland-eglstream-controller-client-protocol.h" +-- +2.24.1 |