xorg-server rebuild, removed evdev reference. Now can be used with evdev or libinput

This commit is contained in:
AlmAck 2015-11-19 22:21:44 +01:00
parent ddc6be6f5c
commit 2ea5329235

View File

@ -3,7 +3,7 @@
pkgbase=xorg-server 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') 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 pkgver=1.17.4
pkgrel=3 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild pkgrel=5 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
arch=('x86_64') arch=('x86_64')
license=('custom') license=('custom')
url="http://xorg.freedesktop.org" url="http://xorg.freedesktop.org"
@ -74,7 +74,6 @@ build() {
--enable-xwayland \ --enable-xwayland \
--enable-glx-tls \ --enable-glx-tls \
--enable-kdrive \ --enable-kdrive \
--enable-kdrive-evdev \
--enable-kdrive-kbd \ --enable-kdrive-kbd \
--enable-kdrive-mouse \ --enable-kdrive-mouse \
--enable-config-udev \ --enable-config-udev \
@ -127,7 +126,7 @@ package_xorg-server-common() {
package_xorg-server() { package_xorg-server() {
pkgdesc="Xorg X 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 xf86-input-driver libxshmfence libgl)
# see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on # 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 # 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=19' 'X-ABI-XINPUT_VERSION=21.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
@ -158,6 +157,7 @@ package_xorg-server() {
rm -rf "${pkgdir}/usr/lib/pkgconfig" rm -rf "${pkgdir}/usr/lib/pkgconfig"
rm -rf "${pkgdir}/usr/include" rm -rf "${pkgdir}/usr/include"
rm -rf "${pkgdir}/usr/share/aclocal" rm -rf "${pkgdir}/usr/share/aclocal"
# this is now part of xorg-input-evdev # this is now part of xorg-input-evdev
rm -rf "${pkgdir}/usr/share/X11/xorg.conf.d/10-evdev.conf" rm -rf "${pkgdir}/usr/share/X11/xorg.conf.d/10-evdev.conf"
} }