From 5b63f0cc1accbcbd05f1348ee61fa04181e732cd Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Thu, 5 Feb 2015 12:05:06 +0100
Subject: update xorg-server-hwcursor-gamma
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 xorg-server-hwcursor-gamma/PKGBUILD | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'xorg-server-hwcursor-gamma/PKGBUILD')

diff --git a/xorg-server-hwcursor-gamma/PKGBUILD b/xorg-server-hwcursor-gamma/PKGBUILD
index f28105c..3d74e69 100644
--- a/xorg-server-hwcursor-gamma/PKGBUILD
+++ b/xorg-server-hwcursor-gamma/PKGBUILD
@@ -4,13 +4,13 @@
 
 _pkgname=xorg-server
 pkgname=xorg-server-hwcursor-gamma
-pkgver=1.16.3
-pkgrel=2
+pkgver=1.17.0
+pkgrel=1
 pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors"
 depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl)
-provides=('xorg-server=1.16.0' 'X-ABI-VIDEODRV_VERSION=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server')
-conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl')
-replaces=('glamor-egl')
+provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=19' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
+conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting')
+replaces=('glamor-egl' 'xf86-video-modesetting')
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -19,7 +19,8 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto'
              'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' '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-wm' 'xcb-util-keysyms' 'dri3proto' 'libxshmfence') 
+             'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
+	     'libxshmfence') 
 source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2
         autoconfig-sis.patch
 	nvidia-drm-outputclass.conf
@@ -28,7 +29,7 @@ source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2
 	0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch
 	0002-Fix-for-full-and-semi-transparency-under-negative-im.patch
 	0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch)
-sha256sums=('5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb'
+sha256sums=('4e8548bae163129d2fc8f8e1f3b6071fe9d62821e3d5617507ccd2f589526166'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
@@ -76,7 +77,7 @@ build() {
       --disable-xfbdev \
       --disable-xfake \
       --disable-static \
-      --libexecdir=/usr/bin \
+      --libexecdir=/usr/lib/xorg-server \
       --sysconfdir=/etc \
       --localstatedir=/var \
       --with-xkb-path=/usr/share/X11/xkb \
-- 
cgit v1.2.3-70-g09d2