Update to 2:1.18.1

2 files changed, 11 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba223f93da35..db779ed75bbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
 # Generated by mksrcinfo v8
-# Fri Apr  1 17:11:41 UTC 2016
+# Fri Apr  1 17:31:44 UTC 2016
 pkgbase = xorg-server-hwcursor-gamma
 	pkgdesc = Xorg X server with patch to apply gamma ramps on hardware cursors
-	pkgver = 1.18.2
+	pkgver = 1.18.1
 	pkgrel = 1
+	epoch = 2
 	url = http://xorg.freedesktop.org
 	arch = i686
 	arch = x86_64
@@ -67,7 +68,7 @@ pkgbase = xorg-server-hwcursor-gamma
 	depends = libxshmfence
 	depends = libgl
 	depends = xf86-input-evdev
-	provides = xorg-server=1.18.2
+	provides = xorg-server=1.18.1
 	provides = X-ABI-VIDEODRV_VERSION=20
 	provides = X-ABI-XINPUT_VERSION=22.1
 	provides = X-ABI-EXTENSION_VERSION=9.0
@@ -78,21 +79,15 @@ pkgbase = xorg-server-hwcursor-gamma
 	conflicts = xf86-video-modesetting
 	replaces = glamor-egl
 	replaces = xf86-video-modesetting
-	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.2.tar.bz2
+	source = http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.18.1.tar.bz2
 	source = xvfb-run
 	source = xvfb-run.1
-	source = 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
-	source = 0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
-	source = 0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch
 	source = 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch
 	source = 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch
 	source = 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch
-	sha256sums = 022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d
+	sha256sums = 85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d
 	sha256sums = ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9
 	sha256sums = 2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776
-	sha256sums = 10c66c10f4f71930e2ac3f6e07881e228ca88542af449d2c69c7744ec87335df
-	sha256sums = 72755a652e72144e3f28c8fa959b4a6df5def838db3cde5077a626e97baab591
-	sha256sums = 70c84bf1f7cbc818692fb56f57c8b8ef2ea057bc05380b2f797ecba742b7ce31
 	sha256sums = bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055
 	sha256sums = be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0
 	sha256sums = 0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081
diff --git a/PKGBUILD b/PKGBUILD
index c3bb4a961ffd..7c78459d0c37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,9 @@
 
 _pkgname=xorg-server
 pkgname=xorg-server-hwcursor-gamma
-pkgver=1.18.2
-pkgrel=1 # 4 in xorg-server
+epoch=2
+pkgver=1.18.1
+pkgrel=1 # 1=2 in xorg-server
 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 libxshmfence libgl xf86-input-evdev)
 provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server')
@@ -24,18 +25,12 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto'
 source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
-        0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
-	0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
-	0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch
 	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=('022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d'
+sha256sums=('85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-	    '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-	    '10c66c10f4f71930e2ac3f6e07881e228ca88542af449d2c69c7744ec87335df'
-	    '72755a652e72144e3f28c8fa959b4a6df5def838db3cde5077a626e97baab591'
-	    '70c84bf1f7cbc818692fb56f57c8b8ef2ea057bc05380b2f797ecba742b7ce31'
+            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
 	    'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055'
 	    'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0'
 	    '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081')
@@ -43,15 +38,6 @@ sha256sums=('022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d'
 prepare() {
   cd "${_pkgname}-${pkgver}"
 
-  msg2 'Fix red tint in Firefox'
-  patch -Np1 -i ../0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch
-
-  msg2 'Fix flooding of Xorg log file'
-  patch -Np1 -i ../0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch
-
-  msg2 'Fix FS#48549'
-  patch -Np1 -i ../0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch
-
   msg2 'Apply hardware cursors gamma adjustments patches'
   patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch
   patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch