From 8c6c26b8e56e677add2ddc01bf589afb30468a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sun, 13 Mar 2016 20:40:12 +0100
Subject: main/xorg-server: upgrade to 1.18.2

---
 main/xorg-server/APKBUILD | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

(limited to 'main/xorg-server')

diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index eb68b2d010..974f6cef50 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.18.1
+pkgver=1.18.2
 pkgrel=0
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
@@ -81,13 +81,10 @@ source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver
 	20-modules.conf
 	"
 
+_builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
-	cd "$srcdir"/$pkgname-$pkgver
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	cd "$_builddir"
+	default_prepare
 
 	# Fix dbus config path
 	sed -i -e 's/\$(sysconfdir)/\/etc/' config/Makefile.*  || return 1
@@ -95,7 +92,7 @@ prepare() {
 }
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	# xorg modules does not work with the -z now and it seems like we
 	# cannot pass over the linker flag to .so files. so we tweak the
 	# gcc specs.
@@ -141,7 +138,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	chmod u+s "$pkgdir"/usr/bin/Xorg
 
@@ -182,17 +179,17 @@ xnest() {
 	mv "$pkgdir"/usr/bin/Xnest "$subpkgdir"/usr/bin/
 }
 
-md5sums="1b9e85420c3790dd487addd50313f4da  xorg-server-1.18.1.tar.bz2
+md5sums="052fc1b4b12a5df0a3e35a1b46a52db3  xorg-server-1.18.2.tar.bz2
 ea4852dedbb89550f6bc113ca66348a2  autoconfig-nvidia.patch
 825ca99ea9348c66abdf2c479e0af485  autoconfig-sis.patch
 043cbe8fc14729ae1e776788ae7593bf  fix-musl-arm.patch
 77f2e12e577e9d8b67350b960958b7c4  20-modules.conf"
-sha256sums="85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d  xorg-server-1.18.1.tar.bz2
+sha256sums="022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d  xorg-server-1.18.2.tar.bz2
 66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162  autoconfig-nvidia.patch
 7d5d36dd152eb0fab277a4aeba0a08ad77049e591a0dea92f565a4b62f0d0a50  autoconfig-sis.patch
 b210a93b4d6128c0963ade3458925ff293e1c68ac20a15964357fd401f7161e0  fix-musl-arm.patch
 65343949384a88dc75142c9309a24c921baa60b43e0fc245052d220e53a4babb  20-modules.conf"
-sha512sums="4b2db85fe4386329b3d20fc53848556ce8dedeb9553d610afc45962d477c8e7ea887abb6c27ba2701160d15ddff9a500bfaae6deff9cf62a80452c4b18278429  xorg-server-1.18.1.tar.bz2
+sha512sums="c44a1b39150fff3ab673cb252d7b498c8c3bc5b3b2abfb6c358c64fadb9ef97789ac457d6acb8afaece29bbbe66399854fd2db13763cb40e7c63fb4237601da9  xorg-server-1.18.2.tar.bz2
 4dcaa60fbfc61636e7220a24a72bba19984a6dc752061cb40b1bd566c0e614d08927b6c223ffaaaa05636765fddacdc3113fde55d25fd09cd0c786ff44f51447  autoconfig-nvidia.patch
 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200  autoconfig-sis.patch
 b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09  fix-musl-arm.patch
-- 
cgit v1.2.3