summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO106
-rw-r--r--.gitignore4
-rw-r--r--PKGBUILD360
-rw-r--r--xorg-server.install18
4 files changed, 225 insertions, 263 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 495e6b005e7..a6c0f4a4aaa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,22 @@
pkgbase = xorg-server-git
- pkgver = 1.19.0.99.r15877.g3f9507e
+ pkgver = 1.20.0.r341.gb4231d690
pkgrel = 1
- url = http://cgit.freedesktop.org/xorg/xserver/
+ url = https://gitlab.freedesktop.org/xorg/xserver.git
arch = x86_64
groups = xorg
license = custom
+ makedepends = xorgproto
makedepends = pixman
makedepends = libx11
makedepends = mesa
- makedepends = libgl
- makedepends = xf86driproto
- makedepends = xcmiscproto
makedepends = xtrans
- makedepends = bigreqsproto
- makedepends = randrproto
- makedepends = inputproto
- makedepends = fontsproto
- makedepends = videoproto
- makedepends = presentproto
- makedepends = compositeproto
- makedepends = recordproto
- makedepends = scrnsaverproto
- makedepends = resourceproto
- makedepends = xineramaproto
makedepends = libxkbfile
makedepends = libxfont2
- makedepends = renderproto
makedepends = libpciaccess
makedepends = libxv
- makedepends = xf86dgaproto
makedepends = libxmu
makedepends = libxrender
makedepends = libxi
- makedepends = dmxproto
makedepends = libxaw
makedepends = libdmx
makedepends = libxtst
@@ -40,22 +24,20 @@ pkgbase = xorg-server-git
makedepends = xorg-xkbcomp
makedepends = xorg-util-macros
makedepends = xorg-font-util
- makedepends = glproto
- makedepends = dri2proto
- makedepends = libgcrypt
makedepends = libepoxy
makedepends = xcb-util
makedepends = xcb-util-image
makedepends = xcb-util-renderutil
makedepends = xcb-util-wm
makedepends = xcb-util-keysyms
- makedepends = dri3proto
makedepends = libxshmfence
makedepends = libunwind
makedepends = systemd
makedepends = wayland-protocols
+ makedepends = egl-wayland
+ makedepends = meson
makedepends = git
- source = git://anongit.freedesktop.org/xorg/xserver
+ source = git+https://gitlab.freedesktop.org/xorg/xserver.git
source = xvfb-run
source = xvfb-run.1
sha256sums = SKIP
@@ -63,8 +45,8 @@ pkgbase = xorg-server-git
sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
pkgname = xorg-server-git
- pkgdesc = Xorg X server - Git
- install = xorg-server-git.install
+ pkgdesc = Xorg X server (git version)
+ install = xorg-server.install
depends = libepoxy
depends = libxfont2
depends = pixman
@@ -73,28 +55,29 @@ pkgname = xorg-server-git
depends = dbus
depends = libgl
depends = xf86-input-libinput
+ depends = nettle
depends = libpciaccess
depends = libdrm
depends = libxshmfence
- provides = xorg-server=1.19.0.99.r15877.g3f9507e
- provides = X-ABI-VIDEODRV_VERSION=23
+ provides = xorg-server
+ provides = X-ABI-VIDEODRV_VERSION=24.0
provides = X-ABI-XINPUT_VERSION=24.1
provides = X-ABI-EXTENSION_VERSION=10.0
provides = x-server
conflicts = xorg-server
- conflicts = nvidia-utils<375.26-3
+ conflicts = nvidia-utils<=331.20
conflicts = glamor-egl
conflicts = xf86-video-modesetting
replaces = glamor-egl
replaces = xf86-video-modesetting
pkgname = xorg-server-xephyr-git
- pkgdesc = A nested X server that runs as an X application - Git
+ pkgdesc = A nested X server that runs as an X application (git version)
depends = libxfont2
depends = libgl
depends = libepoxy
depends = libunwind
- depends = libsystemd
+ depends = systemd-libs
depends = libxv
depends = pixman
depends = xorg-server-common-git
@@ -102,87 +85,76 @@ pkgname = xorg-server-xephyr-git
depends = xcb-util-renderutil
depends = xcb-util-wm
depends = xcb-util-keysyms
- provides = xorg-server-xephyr=1.19.0.99.r15877.g3f9507e
+ depends = nettle
+ depends = libtirpc
+ provides = xorg-server-xephyr
conflicts = xorg-server-xephyr
pkgname = xorg-server-xdmx-git
- pkgdesc = Distributed Multihead X Server and utilities - Git
+ pkgdesc = Distributed Multihead X Server and utilities (git version)
depends = libxfont2
depends = libxi
depends = libxaw
depends = libxrender
depends = libdmx
depends = libxfixes
- depends = libunwind
depends = pixman
depends = xorg-server-common-git
- provides = xorg-server-xdmx=1.19.0.99.r15877.g3f9507e
+ depends = nettle
+ provides = xorg-server-xdmx
conflicts = xorg-server-xdmx
pkgname = xorg-server-xvfb-git
- pkgdesc = Virtual framebuffer X server - Git
+ pkgdesc = Virtual framebuffer X server (git version)
depends = libxfont2
depends = libunwind
- depends = libsystemd
depends = pixman
depends = xorg-server-common-git
depends = xorg-xauth
depends = libgl
- provides = xorg-server-xvfb=1.19.0.99.r15877.g3f9507e
+ depends = nettle
+ provides = xorg-server-xvfb
conflicts = xorg-server-xvfb
pkgname = xorg-server-xnest-git
- pkgdesc = A nested X server that runs as an X application - Git
+ pkgdesc = A nested X server that runs as an X application (git version)
depends = libxfont2
depends = libxext
- depends = libunwind
depends = pixman
depends = xorg-server-common-git
- depends = libsystemd
- provides = xorg-server-xnest=1.19.0.99.r15877.g3f9507e
+ depends = nettle
+ depends = libtirpc
+ provides = xorg-server-xnest
conflicts = xorg-server-xnest
pkgname = xorg-server-xwayland-git
- pkgdesc = Run X clients under Wayland - Git
- depends = libxfont
+ pkgdesc = run X clients under wayland (git version)
+ depends = libxfont2
depends = libepoxy
+ depends = libunwind
+ depends = systemd-libs
depends = libgl
depends = pixman
depends = xorg-server-common-git
- provides = xorg-server-xwayland=1.19.0.99.r15877.g3f9507e
+ depends = nettle
+ depends = libtirpc
+ provides = xorg-server-xwayland
conflicts = xorg-server-xwayland
pkgname = xorg-server-common-git
- pkgdesc = Xorg server common files - Git
+ pkgdesc = Xorg server common files (git version)
depends = xkeyboard-config
depends = xorg-xkbcomp
depends = xorg-setxkbmap
- depends = xorg-fonts-misc
- provides = xorg-server-common=1.19.0.99.r15877.g3f9507e
+ provides = xorg-server-common
conflicts = xorg-server-common
pkgname = xorg-server-devel-git
- pkgdesc = Development files for the X.Org X server - Git
- depends = xproto
- depends = randrproto
- depends = renderproto
- depends = xextproto
- depends = inputproto
- depends = kbproto
- depends = fontsproto
- depends = pixman
- depends = videoproto
- depends = xf86driproto
- depends = glproto
+ pkgdesc = Development files for the X.Org X server (git version)
+ depends = xorgproto
depends = mesa
- depends = dri2proto
- depends = dri3proto
- depends = xineramaproto
depends = libpciaccess
- depends = resourceproto
- depends = scrnsaverproto
- depends = presentproto
depends = xorg-util-macros
- provides = xorg-server-devel=1.19.0.99.r15877.g3f9507e
+ provides = xorg-server-devel
conflicts = xorg-server-devel
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..a8b58ecf7c7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+xserver/
+src/
+pkg/
+*.pkg.* \ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 3642ba94ba3..bfd0c513ac0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,22 +1,31 @@
-# Maintainer: Det <nimetonmaili g-mail>
-# Contributors: SpeedVin, FoxBuru, Federico Cinelli
-# Based on xorg-server-dev: https://aur.archlinux.org/packages/xorg-server-dev/
-
-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')
-pkgver=1.19.0.99.r15877.g3f9507e
+# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+
+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.r341.gb4231d690
pkgrel=1
arch=('x86_64')
license=('custom')
groups=('xorg')
-url="http://cgit.freedesktop.org/xorg/xserver/"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto'
- 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto'
- 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 'renderproto' 'libpciaccess' 'libxv'
- 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres'
- 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy'
- 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
- 'libxshmfence' 'libunwind' 'systemd' 'wayland-protocols' 'git')
-source=(git://anongit.freedesktop.org/xorg/xserver
+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'
+ '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
xvfb-run
xvfb-run.1)
sha256sums=('SKIP'
@@ -24,233 +33,192 @@ sha256sums=('SKIP'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
pkgver() {
- cd xserver
-
- echo $(git describe --long | cut -d "-" -f3-4 | tr - .).r$(git rev-list HEAD --count).$(git describe --long | cut -d "-" -f5)
+ cd "${_pkgbase}"
+ # cutting off 'foo-' prefix that presents in the git tag
+ git describe --long --tags| sed 's/^xorg.server.//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- cd xserver
-
- msg2 "Starting autoreconf..."
- autoreconf -fvi
+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}
+
+ arch-meson ${_pkgbase} build \
+ -D os_vendor="Arch Linux" \
+ -D ipv6=true \
+ -D dmx=true \
+ -D xvfb=true \
+ -D xnest=true \
+ -D xcsecurity=true \
+ -D xorg=true \
+ -D xephyr=true \
+ -D xwayland=true \
+ -D xwayland_eglstream=true \
+ -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
}
-build() {
- cd xserver
-
- msg2 "Starting ./configure..."
- ./configure --prefix=/usr \
- --enable-ipv6 \
- --enable-dri \
- --enable-dmx \
- --enable-xvfb \
- --enable-xnest \
- --enable-composite \
- --enable-xcsecurity \
- --enable-libunwind \
- --enable-xorg \
- --enable-xephyr \
- --enable-glamor \
- --enable-xwayland \
- --enable-kdrive \
- --enable-kdrive-kbd \
- --enable-kdrive-mouse \
- --enable-config-udev \
- --enable-systemd-logind \
- --enable-suid-wrapper \
- --disable-install-setuid \
- --enable-record \
- --disable-xfbdev \
- --disable-xfake \
- --disable-static \
- --libexecdir=/usr/lib/xorg-server \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --with-xkb-path=/usr/share/X11/xkb \
- --with-xkb-output=/var/lib/xkb \
- --with-fontrootdir=/usr/share/fonts \
- --with-sha1=libgcrypt
-
-# --without-dtrace \
-# --disable-linux-acpi --disable-linux-apm \
-
- msg2 "Starting make..."
- make
-
- # Disable subdirs for make install rule to make splitting easier
- sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
- -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
- -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
- -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
- -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \
- -i hw/Makefile
+_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-git() {
- pkgdesc="Xorg server common files - Git"
- depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap xorg-fonts-misc)
- provides=(xorg-server-common=$pkgver)
- conflicts=(xorg-server-common)
-
- cd xserver
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-
- msg2 "Starting make install-data..."
- make -C xkb DESTDIR="${pkgdir}" install-data
-
- install -m755 -d "${pkgdir}/usr/share/man/man1"
- install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
- install -m755 -d "${pkgdir}/usr/lib/xorg"
- install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
+ _pkgname='xorg-server-common'
+ provides=('xorg-server-common')
+ conflicts=('xorg-server-common')
+ pkgdesc="Xorg server common files (git version)"
+ depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
+
+ _install fakeinstall/usr/lib/xorg/protocol.txt
+ _install fakeinstall/usr/share/man/man1/Xserver.1
+
+ install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase}"/xkb/README.compiled
+ # license
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgbase}"/COPYING
}
package_xorg-server-git() {
- pkgdesc="Xorg X server - Git"
- depends=(libepoxy libxfont2 pixman xorg-server-common-git libunwind dbus libgl xf86-input-libinput
+ _pkgname='xorg-server'
+ pkgdesc="Xorg X server (git version)"
+ depends=(libepoxy libxfont2 pixman xorg-server-common-git libunwind
+ dbus libgl xf86-input-libinput nettle
libpciaccess libdrm libxshmfence) # FS#52949
- # see src/xserver/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-git pkg
- for VAR in VIDEODRV XINPUT EXTENSION; do
- provides+=("X-ABI-${VAR}_VERSION=$(grep -Po "${VAR}_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h |& sed 's/, /./')")
- done
- provides+=("xorg-server=$pkgver" 'x-server')
- conflicts=('xorg-server' 'nvidia-utils<375.26-3' 'glamor-egl' 'xf86-video-modesetting')
+ # 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=('xorg-server' 'X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
+ conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
replaces=('glamor-egl' 'xf86-video-modesetting')
- install=xorg-server-git.install
+ install=xorg-server.install
- cd xserver
+ _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
- msg2 "Starting make install..."
- make DESTDIR="${pkgdir}" install
-
# distro specific files must be installed in /usr/share/X11/xorg.conf.d
install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
- # Needed for non-mesa drivers, libgl will restore it
- mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
- "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
- rm -rf "${pkgdir}/var"
-
- rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
- rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
- rm -rf "${pkgdir}/usr/lib/pkgconfig"
- rm -rf "${pkgdir}/usr/include"
- rm -rf "${pkgdir}/usr/share/aclocal"
+ # license
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgbase}"/COPYING
}
package_xorg-server-xephyr-git() {
- pkgdesc="A nested X server that runs as an X application - Git"
- depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common-git xcb-util-image
- xcb-util-renderutil xcb-util-wm xcb-util-keysyms)
- provides=(xorg-server-xephyr=$pkgver)
- conflicts=(xorg-server-xephyr)
-
- cd xserver/hw/kdrive
-
- msg2 "Starting make install..."
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
+ _pkgname='xorg-server-xephyr'
+ provides=('xorg-server-xephyr')
+ conflicts=('xorg-server-xephyr')
+ pkgdesc="A nested X server that runs as an X application (git version)"
+ depends=(libxfont2 libgl libepoxy libunwind systemd-libs libxv pixman xorg-server-common-git
+ 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
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgbase}"/COPYING
}
package_xorg-server-xvfb-git() {
- pkgdesc="Virtual framebuffer X server - Git"
- depends=(libxfont2 libunwind libsystemd pixman xorg-server-common-git xorg-xauth libgl)
- provides=(xorg-server-xvfb=$pkgver)
- conflicts=(xorg-server-xvfb)
+ _pkgname='org-server-xvfb'
+ provides=('xorg-server-xvfb')
+ conflicts=('xorg-server-xvfb')
+ pkgdesc="Virtual framebuffer X server (git version)"
+ depends=(libxfont2 libunwind pixman xorg-server-common-git xorg-xauth libgl nettle)
- cd xserver/hw/vfb
-
- msg2 "Starting make install..."
- make DESTDIR="${pkgdir}" install
+ _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/"
+ install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" # outda
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
+ # license
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgbase}"/COPYING
}
package_xorg-server-xnest-git() {
- pkgdesc="A nested X server that runs as an X application - Git"
- depends=(libxfont2 libxext libunwind pixman xorg-server-common-git libsystemd)
- provides=(xorg-server-xnest=$pkgver)
- conflicts=(xorg-server-xnest)
-
- cd xserver/hw/xnest
+ _pkgname='xorg-server-xnest'
+ provides=('xorg-server-xnest')
+ conflicts=('xorg-server-xnest')
+ pkgdesc="A nested X server that runs as an X application (git version)"
+ depends=(libxfont2 libxext pixman xorg-server-common-git nettle libtirpc)
- msg2 "Starting make install..."
- make DESTDIR="${pkgdir}" install
+ _install fakeinstall/usr/bin/Xnest
+ _install fakeinstall/usr/share/man/man1/Xnest.1
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
+ # license
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgbase}"/COPYING
}
package_xorg-server-xdmx-git() {
- pkgdesc="Distributed Multihead X Server and utilities - Git"
- depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes libunwind pixman xorg-server-common-git)
- provides=(xorg-server-xdmx=$pkgver)
- conflicts=(xorg-server-xdmx)
-
- cd xserver/hw/dmx
-
- msg2 "Starting make install..."
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
+ _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() {
- pkgdesc="Run X clients under Wayland - Git"
- depends=(libxfont libepoxy libgl pixman xorg-server-common-git)
- provides=(xorg-server-xwayland=$pkgver)
- conflicts=(xorg-server-xwayland)
+ _pkgname='xorg-server-xwayland'
+ provides=('xorg-server-xwayland')
+ conflicts=('xorg-server-xwayland')
+ pkgdesc="run X clients under wayland (git version)"
+ depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common-git
+ nettle libtirpc)
- cd xserver/hw/xwayland
+ _install fakeinstall/usr/bin/Xwayland
- msg2 "Starting make install..."
- make DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xwayland"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xwayland/COPYING"
+ # license
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgbase}"/COPYING
}
package_xorg-server-devel-git() {
- pkgdesc="Development files for the X.Org X server - Git"
- depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
- xproto randrproto renderproto xextproto inputproto kbproto
- fontsproto pixman videoproto xf86driproto glproto
- mesa dri2proto dri3proto xineramaproto libpciaccess
- resourceproto scrnsaverproto presentproto
+ _pkgname='xorg-server-devel'
+ provides=('xorg-server-devel')
+ conflicts=('xorg-server-devel')
+ pkgdesc="Development files for the X.Org X server (git version)"
+ depends=('xorgproto' 'mesa' 'libpciaccess'
# not technically required but almost every Xorg pkg needs it to build
- xorg-util-macros)
- provides=(xorg-server-devel=$pkgver)
- conflicts=(xorg-server-devel)
-
- cd xserver
+ 'xorg-util-macros')
- msg2 "Starting make install..."
- make DESTDIR="${pkgdir}" install
+ _install fakeinstall/usr/include/xorg/*
+ _install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
+ _install fakeinstall/usr/share/aclocal/xorg-server.m4
- rm -rf "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/usr/share/man"
- rm -rf "${pkgdir}/usr/share/doc"
- rm -rf "${pkgdir}/usr/share/X11"
- rm -rf "${pkgdir}/usr/lib/xorg"
- rm -rf "${pkgdir}/usr/lib/xorg-server"
- rm -rf "${pkgdir}/var"
+ # license
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${_pkgname}" "${pkgbase}"/COPYING
- install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
- ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
+ # make sure there are no files left to install
+ find fakeinstall -depth -print0 | xargs -0 rmdir
}
diff --git a/xorg-server.install b/xorg-server.install
new file mode 100644
index 00000000000..46bf5a90ae8
--- /dev/null
+++ b/xorg-server.install
@@ -0,0 +1,18 @@
+post_upgrade() {
+ if (( $(vercmp $2 1.16.0-3) < 0 )); then
+ post_install
+ fi
+}
+
+post_install() {
+ cat <<MSG
+>>> xorg-server has now the ability to run without root rights with
+ the help of systemd-logind. xserver will fail to run if not launched
+ from the same virtual terminal as was used to log in.
+ Without root rights, log files will be in ~/.local/share/xorg/ directory.
+
+ Old behavior can be restored through Xorg.wrap config file.
+ See Xorg.wrap man page (man xorg.wrap).
+MSG
+}
+