[arch-commits] Commit in xorg-server/trunk (PKGBUILD)

[Laurent Carlier]

    Date: Sunday, September 21, 2014 @ 13:07:21
  Author: lcarlier
Revision: 222536

upgpkg: xorg-server 1.16.1-1

upstream update 1.16.1

Modified:
  xorg-server/trunk/PKGBUILD

----------+
 PKGBUILD |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-21 10:55:37 UTC (rev 222535)
+++ PKGBUILD	2014-09-21 11:07:21 UTC (rev 222536)
@@ -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.16.0
-pkgrel=6 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
+pkgver=1.16.1
+pkgrel=1 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -18,15 +18,13 @@
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         autoconfig-nvidia.patch
         autoconfig-sis.patch
-        glamor-upstream-fix.patch
         nvidia-drm-outputclass.conf
         xvfb-run
         xvfb-run.1)
-sha256sums=('38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b'
+sha256sums=('f4677c6ec9fb7b59648321737087aeb9963b60bcea50ee3773fe46be1a37e060'
             'SKIP'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'fbd898f0e867c77c9bf918fd2e7956c7776ecb3cc3634c61290fb03513b47987'
             'af1c3d2ea5de7f6a6b5f7c60951a189a4749d1495e5462f3157ae7ac8fe1dc56'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
@@ -39,8 +37,6 @@
   # this means that older drivers (304xx and before) aren't currently supported
   # Use nouveau/nv/nvidia drivers for nvidia devices
   patch -Np1 -i ../autoconfig-nvidia.patch
-  # merged upstream (1.16 branch)
-  patch -Np1 -i ../glamor-upstream-fix.patch
 }
 
 build() {
@@ -111,7 +107,7 @@
 
 package_xorg-server() {
   pkgdesc="Xorg X server"
-  depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence)
+  depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev libxshmfence libgl)
   # 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=18' 'X-ABI-XINPUT_VERSION=21' 'X-ABI-EXTENSION_VERSION=8.0' 'x-server')