summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2021-09-19 09:55:36 +0300
committerYurii Kolesnykov2021-10-26 16:52:04 +0300
commit992ab1695426195dcf96d41d2c96ee3d5e8a3847 (patch)
tree84887b67710bb526b96e805c4806b846eaebe552
parent4582fa76c1a8c7c92a59c9ed68f831417dc95c73 (diff)
downloadaur-992ab1695426195dcf96d41d2c96ee3d5e8a3847.tar.gz
sync with extra/xorg-server
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD17
2 files changed, 11 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ecd9a53953fe..0bf376bf11c8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = xorg-server-git
- pkgver = 21.0.99.1.r70.g7c63c582a
+ pkgver = 21.0.99.1.r111.gc93c2e771
pkgrel = 1
url = https://xorg.freedesktop.org
arch = x86_64
@@ -9,8 +9,8 @@ pkgbase = xorg-server-git
makedepends = pixman
makedepends = libx11
makedepends = mesa
- makedepends = mesa-libgl
makedepends = xtrans
+ makedepends = libxcvt
makedepends = libxkbfile
makedepends = libxfont2
makedepends = libpciaccess
@@ -37,7 +37,6 @@ pkgbase = xorg-server-git
makedepends = git
makedepends = wayland-protocols
makedepends = egl-wayland
- makedepends = libxcvt
source = git+https://gitlab.freedesktop.org/xorg/xserver.git
source = xvfb-run
source = xvfb-run.1
diff --git a/PKGBUILD b/PKGBUILD
index b1699a23bfda..99ad8b1fb5bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,19 +13,19 @@ pkgname=(
'xorg-server-xvfb-git'
)
_pkgbase='xserver'
-pkgver=21.0.99.1.r70.g7c63c582a
+pkgver=21.0.99.1.r111.gc93c2e771
pkgrel=1
arch=('x86_64')
license=('custom')
groups=('xorg')
url="https://xorg.freedesktop.org"
-makedepends=('xorgproto-git' 'pixman' 'libx11' 'mesa' 'mesa-libgl' 'xtrans'
+makedepends=('xorgproto-git' 'pixman' 'libx11' 'mesa' 'xtrans' 'libxcvt'
'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'
'libxshmfence' 'libunwind' 'systemd' 'meson' 'git'
- 'wayland-protocols' 'egl-wayland' 'libxcvt')
+ 'wayland-protocols' 'egl-wayland')
source=(git+https://gitlab.freedesktop.org/xorg/xserver.git
xvfb-run # with updates from FC master
xvfb-run.1)
@@ -47,16 +47,17 @@ build() {
export CXXFLAGS="${CXXFLAGS/-fno-plt -fno-lto}"
export LDFLAGS="${LDFLAGS/,-z,now,-fno-lto}"
- arch-meson ${_pkgbase} build \
- -D os_vendor="Archlinux" \
+ arch-meson "${_pkgbase}" build \
+ -D vendor_name="Archlinux" \
+ -D vendor_web="https://aur.archlinux.org/xorg-server-git.git" \
-D ipv6=true \
-D xvfb=true \
-D xnest=true \
-D xcsecurity=true \
-D xorg=true \
-D xephyr=true \
- -D xwayland=false \
- -D xwayland_eglstream=false \
+ -D xwayland=true \
+ -D xwayland_eglstream=true \
-D glamor=true \
-D udev=true \
-D systemd_logind=true \
@@ -122,7 +123,7 @@ package_xorg-server-git() {
_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,gtf}.1
- _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting,inputtestdrv}.4
+ _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