[arch-commits] Commit in xorg-server/trunk (PKGBUILD)
Andreas Radke
andyrtr at archlinux.org
Tue Nov 10 12:30:59 UTC 2015
Date: Tuesday, November 10, 2015 @ 13:30:58
Author: andyrtr
Revision: 250530
prepare next release
Modified:
xorg-server/trunk/PKGBUILD
----------+
PKGBUILD | 26 ++++++++------------------
1 file changed, 8 insertions(+), 18 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-10 12:26:05 UTC (rev 250529)
+++ PKGBUILD 2015-11-10 12:30:58 UTC (rev 250530)
@@ -4,8 +4,8 @@
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.17.4
-pkgrel=2
+pkgver=1.18.0
+pkgrel=1
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -15,32 +15,24 @@
'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')
+ 'libxshmfence' 'libunwind')
source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
nvidia-drm-outputclass.conf
xvfb-run
xvfb-run.1
- 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
- 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
0001-systemd-logind-do-not-rely-on-directed-signals.patch)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011'
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457'
+sha256sums=('195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e'
'SKIP'
'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
- '3dc795002b8763a7d29db94f0af200131da9ce5ffc233bfd8916060f83a8fad7'
- '416a1422eed71efcebb1d893de74e7f27e408323a56c4df003db37f5673b3f96'
'3d7edab3a54d647e7d924b29d29f91b50212f308fcb1853a5aacd3181f58276c')
prepare() {
cd "${pkgbase}-${pkgver}"
- # fix FS#45229, merged upstream
- patch -Np1 -i ../0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
- patch -Np1 -i ../0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
-
# fix VT switching with kdbus; from upstream
patch -Np1 -i ../0001-systemd-logind-do-not-rely-on-directed-signals.patch
@@ -62,9 +54,7 @@
--enable-xephyr \
--enable-glamor \
--enable-xwayland \
- --enable-glx-tls \
--enable-kdrive \
- --enable-kdrive-evdev \
--enable-kdrive-kbd \
--enable-kdrive-mouse \
--enable-config-udev \
@@ -117,10 +107,12 @@
package_xorg-server() {
pkgdesc="Xorg X server"
- depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl)
+ depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl)
+ optdepends=('xf86-input-evdev: suggested input driver')
+
# 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=('X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
+ provides=('X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
groups=('xorg')
conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
replaces=('glamor-egl' 'xf86-video-modesetting')
@@ -148,8 +140,6 @@
rm -rf "${pkgdir}/usr/lib/pkgconfig"
rm -rf "${pkgdir}/usr/include"
rm -rf "${pkgdir}/usr/share/aclocal"
- # this is now part of xorg-input-evdev
- rm -rf "${pkgdir}/usr/share/X11/xorg.conf.d/10-evdev.conf"
}
package_xorg-server-xephyr() {
More information about the arch-commits
mailing list