diff options
| author | Det | 2015-06-14 04:55:47 +0300 |
|---|---|---|
| committer | Det | 2015-06-14 05:05:14 +0300 |
| commit | b8ecc3d83e856f2165aeb81b0b802d968ffc287f (patch) | |
| tree | 15340f71c6251dd8d680ca559569a47133c171ff | |
| parent | 60068ea156705ab234c7ff969bbafb8fdef0b700 (diff) | |
| download | aur-b8ecc3d83e856f2165aeb81b0b802d968ffc287f.tar.gz | |
Fix Web interface 'Provides' + Loop it in PKGBUILD
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | PKGBUILD | 11 |
2 files changed, 7 insertions, 10 deletions
@@ -78,9 +78,9 @@ pkgname = xorg-server-git depends = xf86-input-evdev depends = libxshmfence depends = libgl - provides = X-ABI-VIDEODRV_VERSION= - provides = X-ABI-XINPUT_VERSION= - provides = X-ABI-EXTENSION_VERSION= + provides = X-ABI-VIDEODRV_VERSION=19.0 + provides = X-ABI-XINPUT_VERSION=22.1 + provides = X-ABI-EXTENSION_VERSION=9.0 provides = x-server provides = xorg-server conflicts = nvidia-utils<=331.20 diff --git a/PKGBUILD b/PKGBUILD index d99fdc5a90cb..80b6dab1b62c 100644..100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -112,13 +112,10 @@ package_xorg-server-git() { depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common-git xf86-input-evdev libxshmfence libgl) # 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 - _ABI_VIDEODRV="$(grep -Po "VIDEODRV_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")" - _ABI_XINPUT="$(grep -Po "XINPUT_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")" - _ABI_EXTENSION="$(grep -Po "EXTENSION_V.*\(\K[^)]*" xserver/hw/xfree86/common/xf86Module.h | sed "s/, /./")" - provides=("X-ABI-VIDEODRV_VERSION=$_ABI_VIDEODRV" - "X-ABI-XINPUT_VERSION=$_ABI_XINPUT" - "X-ABI-EXTENSION_VERSION=$_ABI_EXTENSION" - 'x-server' 'xorg-server') + 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+=('x-server' 'xorg-server') groups=('xorg') conflicts=('nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting' 'xorg-server') replaces=('glamor-egl' 'xf86-video-modesetting') |