summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD110
1 files changed, 48 insertions, 62 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 8d476acd928..ca1e46794b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,35 @@
# Maintainer : Daniel Bermond < gmail-com: danielbermond >
# Contributor: Det <nimetonmaili g-mail>
-# Based on [testing]'s xorg-server
pkgbase=xorg-server-dev
+_srcname=xorg-server
pkgname=('xorg-server-dev' 'xorg-server-xephyr-dev' 'xorg-server-xdmx-dev' 'xorg-server-xvfb-dev' 'xorg-server-xnest-dev'
'xorg-server-xwayland-dev' 'xorg-server-common-dev' 'xorg-server-devel-dev')
-pkgver=1.20.3
-pkgrel=2
+pkgver=1.20.5
+pkgrel=1
arch=('x86_64')
license=('custom')
groups=('xorg')
-pkgdesc="Xorg X server - bleeding edge version"
-url="http://xorg.freedesktop.org"
+pkgdesc='Xorg X server - bleeding edge version'
+url='https://xorg.freedesktop.org'
makedepends=('xorgproto' 'pixman' 'libx11' 'mesa' 'mesa-libgl' '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=(https://xorg.freedesktop.org/releases/individual/xserver/${pkgbase%-dev}-${pkgver}.tar.bz2{,.sig}
+source=("https://xorg.freedesktop.org/releases/individual/xserver/xorg-server-${pkgver}.tar.bz2"{,.sig}
'xwayland-config.h.meson.in::https://cgit.freedesktop.org/xorg/xserver/plain/include/xwayland-config.h.meson.in?id=xorg-server-1.20.0'
- xserver-autobind-hotplug.patch
- 0001-v2-FS-58644.patch
- 0002-fix-libshadow-2.patch
- xvfb-run # with updates from FC master
- xvfb-run.1)
+ 'xserver-autobind-hotplug.patch'
+ '0001-v2-FS-58644.patch'
+ '0002-fix-libshadow-2.patch'
+ 'xvfb-run' # with updates from FC master
+ 'xvfb-run.1')
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011'
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3'
'995ED5C8A6138EB0961F18474C09DD83CAAA50B2')
-sha512sums=('ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba'
+sha512sums=('625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631'
'SKIP'
'd707e0870367de2665c3b82f09564d17ed3f62c9e8b4bd471c11af1fb1e9249e306e92c7961a04e355756eec9f5271bc8e66999e56c73c31bc9da4127ff30a8e'
'd84f4d63a502b7af76ea49944d1b21e2030dfd250ac1e82878935cf631973310ac9ba1f0dfedf10980ec6c7431d61b7daa4b7bbaae9ee477b2c19812c1661a22'
@@ -40,9 +40,9 @@ sha512sums=('ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61
prepare() {
# missing from tarball
- cp xwayland-config.h.meson.in ${pkgbase%-dev}-${pkgver}/include/
+ cp xwayland-config.h.meson.in ${_srcname}-${pkgver}/include/
- cd "${pkgbase%-dev}-${pkgver}"
+ cd "${_srcname}-${pkgver}"
# patch from Fedora, not yet merged
patch -Np1 -i ../xserver-autobind-hotplug.patch
@@ -64,7 +64,7 @@ build() {
export CXXFLAGS=${CXXFLAGS/-fno-plt}
export LDFLAGS=${LDFLAGS/,-z,now}
- arch-meson ${pkgbase%-dev}-$pkgver build \
+ arch-meson ${_srcname}-$pkgver build \
-D os_vendor="Arch Linux" \
-D ipv6=true \
-D dmx=true \
@@ -101,29 +101,27 @@ _install() {
}
package_xorg-server-common-dev() {
- pkgdesc="Xorg server common files - bleeding edge version"
+ pkgdesc="Xorg server common files"
depends=(xkeyboard-config xorg-xkbcomp xorg-setxkbmap)
- provides=("xorg-server-common=${pkgver}")
- conflicts=('xorg-server-common')
_install fakeinstall/usr/lib/xorg/protocol.txt
- _install fakeinstall/usr/share/man/man1/Xserver.1.gz
+ _install fakeinstall/usr/share/man/man1/Xserver.1
- install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${pkgbase%-dev}-${pkgver}"/xkb/README.compiled
+ install -m644 -Dt "${pkgdir}/var/lib/xkb/" "${_srcname}-${pkgver}"/xkb/README.compiled
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
}
package_xorg-server-dev() {
- pkgdesc="Xorg X server - bleeding edge version"
- depends=(libepoxy libxfont2 pixman xorg-server-common-dev libunwind
+ pkgdesc="Xorg X server"
+ depends=(libepoxy libxfont2 pixman xorg-server-common libunwind
dbus libgl xf86-input-libinput nettle
libpciaccess libdrm libxshmfence) # FS#52949
# 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=${pkgver}" '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')
+ provides=('X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server')
+ conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
replaces=('glamor-egl' 'xf86-video-modesetting')
install=xorg-server-dev.install
@@ -132,102 +130,90 @@ package_xorg-server-dev() {
_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.gz
- _install fakeinstall/usr/share/man/man4/{exa,fbdevhw,modesetting}.4.gz
- _install fakeinstall/usr/share/man/man5/{Xwrapper.config,xorg.conf,xorg.conf.d}.5.gz
+ _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
# distro specific files must be installed in /usr/share/X11/xorg.conf.d
install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
}
package_xorg-server-xephyr-dev() {
- pkgdesc="A nested X server that runs as an X application - bleeding edge version"
- depends=(libxfont2 libgl libepoxy libunwind libsystemd libxv pixman xorg-server-common-dev
+ pkgdesc="A nested X server that runs as an X application"
+ depends=(libxfont2 libgl libepoxy libunwind systemd-libs libxv pixman xorg-server-common
xcb-util-image xcb-util-renderutil xcb-util-wm xcb-util-keysyms
nettle libtirpc)
- provides=("xorg-server-xephyr=${pkgver}")
- conflicts=('xorg-server-xephyr')
_install fakeinstall/usr/bin/Xephyr
- _install fakeinstall/usr/share/man/man1/Xephyr.1.gz
+ _install fakeinstall/usr/share/man/man1/Xephyr.1
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
}
package_xorg-server-xvfb-dev() {
- pkgdesc="Virtual framebuffer X server - bleeding edge version"
- depends=(libxfont2 libunwind pixman xorg-server-common-dev xorg-xauth libgl nettle)
- provides=("xorg-server-xvfb=${pkgver}")
- conflicts=('xorg-server-xvfb')
+ pkgdesc="Virtual framebuffer X server"
+ depends=(libxfont2 libunwind pixman xorg-server-common xorg-xauth libgl nettle)
_install fakeinstall/usr/bin/Xvfb
- _install fakeinstall/usr/share/man/man1/Xvfb.1.gz
+ _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/" # outda
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
}
package_xorg-server-xnest-dev() {
- pkgdesc="A nested X server that runs as an X application - bleeding edge version"
- depends=(libxfont2 libxext pixman xorg-server-common-dev nettle libtirpc)
- provides=("xorg-server-xnest=${pkgver}")
- conflicts=('xorg-server-xnest')
+ pkgdesc="A nested X server that runs as an X application"
+ depends=(libxfont2 libxext pixman xorg-server-common nettle libtirpc)
_install fakeinstall/usr/bin/Xnest
- _install fakeinstall/usr/share/man/man1/Xnest.1.gz
+ _install fakeinstall/usr/share/man/man1/Xnest.1
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
}
package_xorg-server-xdmx-dev() {
- pkgdesc="Distributed Multihead X Server and utilities - bleeding edge version"
+ pkgdesc="Distributed Multihead X Server and utilities"
depends=(libxfont2 libxi libxaw libxrender libdmx libxfixes
- pixman xorg-server-common-dev nettle)
- provides=("xorg-server-xdmx=${pkgver}")
- conflicts=('xorg-server-xdmx')
+ pixman xorg-server-common nettle)
_install fakeinstall/usr/bin/{Xdmx,dmx*,vdltodmx,xdmxconfig}
- _install fakeinstall/usr/share/man/man1/{Xdmx,dmxtodmx,vdltodmx,xdmxconfig}.1.gz
+ _install fakeinstall/usr/share/man/man1/{Xdmx,dmxtodmx,vdltodmx,xdmxconfig}.1
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
}
package_xorg-server-xwayland-dev() {
- pkgdesc="run X clients under wayland - bleeding edge version"
- depends=(libxfont2 libepoxy libunwind libsystemd libgl pixman xorg-server-common-dev
+ pkgdesc="run X clients under wayland"
+ depends=(libxfont2 libepoxy libunwind systemd-libs libgl pixman xorg-server-common
nettle libtirpc)
- provides=("xorg-server-xwayland=${pkgver}")
- conflicts=('xorg-server-xwayland')
_install fakeinstall/usr/bin/Xwayland
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
}
package_xorg-server-devel-dev() {
- pkgdesc="Development files for the X.Org X server - bleeding edge version"
+ pkgdesc="Development files for the X.Org X server"
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')
_install fakeinstall/usr/include/xorg/*
_install fakeinstall/usr/lib/pkgconfig/xorg-server.pc
_install fakeinstall/usr/share/aclocal/xorg-server.m4
# license
- install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${pkgbase%-dev}-${pkgver}"/COPYING
+ install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" "${_srcname}-${pkgver}"/COPYING
# make sure there are no files left to install
find fakeinstall -depth -print0 | xargs -0 rmdir