Merge branch 'master' of git://git.alpinelinux.org/aports

author: Fabian Affolter <fabian@affolter-engineering.ch> 2012-03-28 16:59:39 +0000
committer: Fabian Affolter <fabian@affolter-engineering.ch> 2012-03-28 16:59:39 +0000
commit: ac8282d739f045c1dd9d4d9d437d004625c7d3de (patch)
tree: a55f98fee9d18d679207cda627c22ba13d6338db
parent: 69d4f8eefbd56b7e430981437d1a4ce927547b39 (diff)
parent: 8a303f51142efa5684ac6741d3c6e61ea0556d7e (diff)
download: aports-ac8282d739f045c1dd9d4d9d437d004625c7d3de.tar.bz2
aports-ac8282d739f045c1dd9d4d9d437d004625c7d3de.tar.xz
84 files changed, 2626 insertions, 639 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 3511d99ff..18bc8a4bf 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.2.5
+pkgver=2.3.0
 pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static lua-apk:luaapk"
@@ -54,4 +54,4 @@ luaapk() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
 }
 
-md5sums="2fe7da29606c98d21f2067686fc49959  apk-tools-2.2.5.tar.bz2"
+md5sums="f87882b3ddad44282459ee40b143ad1a  apk-tools-2.3.0.tar.bz2"
diff --git a/main/bigreqsproto/APKBUILD b/main/bigreqsproto/APKBUILD
index 00fa31e4e..64937e21c 100644
--- a/main/bigreqsproto/APKBUILD
+++ b/main/bigreqsproto/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bigreqsproto
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=0
 pkgdesc="X11 Big Requests extension wire protocol"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
@@ -20,4 +20,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="6f6c24436c2b3ab235eb14a85b9aaacf  bigreqsproto-1.1.1.tar.bz2"
+md5sums="1a05fb01fa1d5198894c931cf925c025  bigreqsproto-1.1.2.tar.bz2"
diff --git a/main/cairo/APKBUILD b/main/cairo/APKBUILD
index f5dee0501..a41926f15 100644
--- a/main/cairo/APKBUILD
+++ b/main/cairo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cairo
 pkgver=1.10.2
-pkgrel=9
+pkgrel=10
 pkgdesc="Cairo vector graphics library"
 url="http://cairographics.org/"
 arch="all"
@@ -30,7 +30,7 @@ build() {
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la
+	rm "$pkgdir"/usr/lib/*.la "$pkgdir"/usr/lib/*/*.la
 }
 
 gobject() {
diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index 665df657a..ba15b6fb9 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=coova-chilli
 pkgver=1.2.9
-pkgrel=0
+pkgrel=1
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 arch="all"
diff --git a/main/coova-chilli/chilli.post-install b/main/coova-chilli/coova-chilli.post-install
index 10dfc9576..10dfc9576 100644
--- a/main/coova-chilli/chilli.post-install
+++ b/main/coova-chilli/coova-chilli.post-install
diff --git a/main/coova-chilli/chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 37be034ee..37be034ee 100644
--- a/main/coova-chilli/chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
diff --git a/main/cyrus-sasl/APKBUILD b/main/cyrus-sasl/APKBUILD
index 4e695a98d..e5e321b37 100644
--- a/main/cyrus-sasl/APKBUILD
+++ b/main/cyrus-sasl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=cyrus-sasl
 pkgver=2.1.23
-pkgrel=13
+pkgrel=14
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL)"
 url="http://cyrusimap.web.cmu.edu/downloads.html#sasl"
 arch="all"
@@ -49,7 +49,7 @@ build() {
 package() {
 	cd "$srcdir"/cyrus-sasl-$pkgver
 	make -j1 DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la || return 1
+	find "$pkgdir"/usr/lib -name *.la -delete
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 
 	install -Dm755 ../saslauthd.initd "$pkgdir"/etc/init.d/saslauthd
diff --git a/main/eboard/APKBUILD b/main/eboard/APKBUILD
index 452bde516..d9ede84bd 100644
--- a/main/eboard/APKBUILD
+++ b/main/eboard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=eboard
 pkgver=1.1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Chess board interface for ICS"
 url="http://www.bergo.eng.br/eboard"
 arch="all"
@@ -30,6 +30,7 @@ build() {
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--man-prefix=/usr/share/man \
+		--extra-libs=dl \
 		|| return 1
 	make || return 1
 }
diff --git a/main/fontsproto/APKBUILD b/main/fontsproto/APKBUILD
index 7c4d1cea8..1ea7040bf 100644
--- a/main/fontsproto/APKBUILD
+++ b/main/fontsproto/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fontsproto
-pkgver=2.1.1
+pkgver=2.1.2
 pkgrel=0
 pkgdesc="X11 font extension wire protocol"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
@@ -20,4 +20,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="37102ffcaa73f77d700acd6f7a25d8f0  fontsproto-2.1.1.tar.bz2"
+md5sums="c5f4f1fb4ba7766eedbc9489e81f3be2  fontsproto-2.1.2.tar.bz2"
diff --git a/main/kbproto/APKBUILD b/main/kbproto/APKBUILD
index 3e91d8aba..6d5baee5b 100644
--- a/main/kbproto/APKBUILD
+++ b/main/kbproto/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kbproto
-pkgver=1.0.5
+pkgver=1.0.6
 pkgrel=0
 pkgdesc="X11 XKB extension wire protocol"
 url="http://xorg.freedesktop.org/"
@@ -20,4 +20,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="e7edb59a3f54af15f749e8f3e314ee62  kbproto-1.0.5.tar.bz2"
+md5sums="677ea8523eec6caca86121ad2dca0b71  kbproto-1.0.6.tar.bz2"
diff --git a/main/libx11/APKBUILD b/main/libx11/APKBUILD
index 0e5607940..3752b3145 100644
--- a/main/libx11/APKBUILD
+++ b/main/libx11/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libx11
-pkgver=1.4.99.1
+pkgver=1.4.99.901
 pkgrel=0
 pkgdesc="X11 client-side library"
 url="http://xorg.freedesktop.org/"
@@ -28,4 +28,4 @@ package() {
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums="0e6e25d99cfb18c6631c6dc4ac411c69  libX11-1.4.99.1.tar.bz2"
+md5sums="520376557363da2df412beec9b4be749  libX11-1.4.99.901.tar.bz2"
diff --git a/main/libxslt/APKBUILD b/main/libxslt/APKBUILD
index 8e1b72f7f..01e9cc454 100644
--- a/main/libxslt/APKBUILD
+++ b/main/libxslt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxslt
 pkgver=1.1.26
-pkgrel=8
+pkgrel=9
 pkgdesc="XML stylesheet transformation library"
 url="http://xmlsoft.org/XSLT/"
 arch="all"
@@ -20,7 +20,7 @@ build() {
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
-	rm "$pkgdir"/usr/lib/*.la
+	find "$pkgdir"/usr -name '*.la' -delete
 
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
diff --git a/main/libxt/APKBUILD b/main/libxt/APKBUILD
index 7f1aef155..3e5c6686e 100644
--- a/main/libxt/APKBUILD
+++ b/main/libxt/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libxt
-pkgver=1.1.2
+pkgver=1.1.3
 pkgrel=0
 pkgdesc="X11 toolkit intrinsics library"
 url="http://xorg.freedesktop.org/"
@@ -26,4 +26,4 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install || return 1
 	rm "$pkgdir"/usr/lib/*.la || return 1
 }
-md5sums="c4f7f149559320f378d93b835d38ad6f  libXt-1.1.2.tar.bz2"
+md5sums="a6f137ae100e74ebe3b71eb4a38c40b3  libXt-1.1.3.tar.bz2"
diff --git a/main/mtdev/APKBUILD b/main/mtdev/APKBUILD
new file mode 100644
index 000000000..63daeca54
--- /dev/null
+++ b/main/mtdev/APKBUILD
@@ -0,0 +1,50 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=mtdev
+pkgver=1.1.2
+pkgrel=0
+pkgdesc="Multitouch Protocol Translation Library Development Package"
+url="http://bitmath.org/code/mtdev/"
+arch="all"
+license="MIT"
+depends=""
+depends_dev=""
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev"
+source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz"
+
+_builddir="$srcdir"/mtdev-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+dev() {
+	default_dev
+	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+}
+
+md5sums="ee2474587ca4c4762f08388668fdab20  mtdev-1.1.2.tar.gz"
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index 17d846c2d..4f5d86005 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openssh
 pkgver=5.9_p1
 _myver=${pkgver%_*}${pkgver#*_}
-pkgrel=1
+pkgrel=2
 pkgdesc="Port of OpenBSD's free SSH release"
 url="http://www.openssh.org/portable.html"
 arch="all"
@@ -13,6 +13,7 @@ subpackages="$pkgname-doc $pkgname-client"
 source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz
 	openssh${pkgver%_*}-dynwindow_noneswitch.diff
 	openssh${pkgver%_*}-peaktput.diff
+	openssh-fix-openssl-abi.diff
 	sshd.initd
 	sshd.confd
 	"
@@ -89,5 +90,6 @@ client() {
 md5sums="afe17eee7e98d3b8550cc349834a85d0  openssh-5.9p1.tar.gz
 f3db05e57e7af4cb2b55b85117652ed3  openssh5.9-dynwindow_noneswitch.diff
 949ff348573438163240c60d6c3618eb  openssh5.9-peaktput.diff
+c6f0728f19a80f680b0ee3922f3084cf  openssh-fix-openssl-abi.diff
 cb0dd08c413fad346f0c594107b4a2e0  sshd.initd
 b35e9f3829f4cfca07168fcba98749c7  sshd.confd"
diff --git a/main/openssh/openssh-fix-openssl-abi.diff b/main/openssh/openssh-fix-openssl-abi.diff
new file mode 100644
index 000000000..2b4a4cc93
--- /dev/null
+++ b/main/openssh/openssh-fix-openssl-abi.diff
@@ -0,0 +1,20 @@
+--- openssh-5.9p1/entropy.c.orig
++++ openssh-5.9p1/entropy.c
+@@ -206,6 +206,7 @@
+ void
+ seed_rng(void)
+ {
++	u_long mask;
+ #ifndef OPENSSL_PRNG_ONLY
+ 	unsigned char buf[RANDOM_SEED_SIZE];
+ #endif
+@@ -213,7 +214,8 @@
+ 	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
+ 	 * We match major, minor, fix and status (not patch)
+ 	 */
+-	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L)
++	mask = (OPENSSL_VERSION_NUMBER >= 0x10000000) ? 0xffff0L : 0xff0L;
++	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~mask)
+ 		fatal("OpenSSL version mismatch. Built against %lx, you "
+ 		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());
+ 
diff --git a/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch b/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch
deleted file mode 100644
index d292ad9bc..000000000
--- a/main/openssl/0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch
+++ /dev/null
@@ -1,392 +0,0 @@
-From ca1f332fbadc20d53d807d542fb37988a5508d32 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 3 Jun 2010 09:02:13 +0300
-Subject: [PATCH 2/5] apps/speed: fix digest speed measurement and add hmac-sha1 test
-
-Merge the common code of testing digest speed, and make it reuse
-existing context. Context creation can be heavy operation, and it's
-speed depends on if engine is used or not. As we are measuring the
-digest speed, the context creation overhead should not be included
-like hmac tests do.
-
-This also adds test for hmac-sha1 speed.
----
- apps/speed.c |  243 +++++++++++++++++++++-------------------------------------
- 1 files changed, 86 insertions(+), 157 deletions(-)
-
-diff --git a/apps/speed.c b/apps/speed.c
-index 539bfff..f64289e 100644
---- a/apps/speed.c
-+++ b/apps/speed.c
-@@ -214,7 +214,7 @@ static void print_result(int alg,int run_no,int count,double time_used);
- static int do_multi(int multi);
- #endif
- 
--#define ALGOR_NUM	29
-+#define ALGOR_NUM	30
- #define SIZE_NUM	5
- #define RSA_NUM		4
- #define DSA_NUM		3
-@@ -229,9 +229,11 @@ static const char *names[ALGOR_NUM]={
-   "aes-128 cbc","aes-192 cbc","aes-256 cbc",
-   "camellia-128 cbc","camellia-192 cbc","camellia-256 cbc",
-   "evp","sha256","sha512","whirlpool",
--  "aes-128 ige","aes-192 ige","aes-256 ige"};
-+  "aes-128 ige","aes-192 ige","aes-256 ige","hmac(sha1)"};
- static double results[ALGOR_NUM][SIZE_NUM];
- static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
-+static unsigned char *buf=NULL,*buf2=NULL;
-+static long c[ALGOR_NUM][SIZE_NUM];
- #ifndef OPENSSL_NO_RSA
- static double rsa_results[RSA_NUM][2];
- #endif
-@@ -329,6 +331,66 @@ static void *KDF1_SHA1(const void *in, size_t inlen, void *out, size_t *outlen)
- 	}
- #endif	/* OPENSSL_NO_ECDH */
- 
-+#ifndef SIGALRM
-+#define COND(d)	(count < (d))
-+#else
-+#define COND(c)	(run)
-+#endif /* SIGALRM */
-+
-+static void Test_Digest(int digest, const EVP_MD *type)
-+{
-+	unsigned char md[EVP_MAX_MD_SIZE];
-+	int j, count;
-+	double d=0.0;
-+	EVP_MD_CTX ctx;
-+
-+	EVP_MD_CTX_init(&ctx);
-+	EVP_MD_CTX_set_flags(&ctx,EVP_MD_CTX_FLAG_ONESHOT);
-+
-+	for (j=0; j<SIZE_NUM; j++)
-+		{
-+		print_message(names[digest],c[digest][j],lengths[j]);
-+		Time_F(START);
-+		for (count=0,run=1; COND(c[digest][j]); count++)
-+			{
-+			EVP_DigestInit_ex(&ctx, type, NULL);
-+			EVP_DigestUpdate(&ctx, buf, (unsigned long)lengths[j]);
-+			EVP_DigestFinal_ex(&ctx, md, NULL);
-+			}
-+		d=Time_F(STOP);
-+		print_result(digest,j,count,d);
-+		}
-+
-+	EVP_MD_CTX_cleanup(&ctx);
-+}
-+
-+static void Test_HMAC(int digest, const EVP_MD *type)
-+{
-+	unsigned char md[EVP_MAX_MD_SIZE];
-+	HMAC_CTX hctx;
-+	int j, count;
-+	double d=0.0;
-+
-+	HMAC_CTX_init(&hctx);
-+	HMAC_CTX_set_flags(&hctx, EVP_MD_CTX_FLAG_ONESHOT);
-+	HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...",
-+		16,type, NULL);
-+
-+	for (j=0; j<SIZE_NUM; j++)
-+		{
-+		print_message(names[digest],c[digest][j],lengths[j]);
-+		Time_F(START);
-+		for (count=0,run=1; COND(c[digest][j]); count++)
-+			{
-+			HMAC_Init_ex(&hctx,NULL,0,NULL,NULL);
-+			HMAC_Update(&hctx,buf,lengths[j]);
-+			HMAC_Final(&hctx,md,NULL);
-+			}
-+		d=Time_F(STOP);
-+		print_result(digest,j,count,d);
-+		}
-+	HMAC_CTX_cleanup(&hctx);
-+}
- 
- int MAIN(int, char **);
- 
-@@ -337,7 +399,6 @@ int MAIN(int argc, char **argv)
- 
- int MAIN(int argc, char **argv)
- 	{
--	unsigned char *buf=NULL,*buf2=NULL;
- 	int mret=1;
- 	long count=0,save_count=0;
- 	int i,j,k;
-@@ -348,34 +409,6 @@ int MAIN(int argc, char **argv)
- 	unsigned rsa_num;
- #endif
- 	unsigned char md[EVP_MAX_MD_SIZE];
--#ifndef OPENSSL_NO_MD2
--	unsigned char md2[MD2_DIGEST_LENGTH];
--#endif
--#ifndef OPENSSL_NO_MDC2
--	unsigned char mdc2[MDC2_DIGEST_LENGTH];
--#endif
--#ifndef OPENSSL_NO_MD4
--	unsigned char md4[MD4_DIGEST_LENGTH];
--#endif
--#ifndef OPENSSL_NO_MD5
--	unsigned char md5[MD5_DIGEST_LENGTH];
--	unsigned char hmac[MD5_DIGEST_LENGTH];
--#endif
--#ifndef OPENSSL_NO_SHA
--	unsigned char sha[SHA_DIGEST_LENGTH];
--#ifndef OPENSSL_NO_SHA256
--	unsigned char sha256[SHA256_DIGEST_LENGTH];
--#endif
--#ifndef OPENSSL_NO_SHA512
--	unsigned char sha512[SHA512_DIGEST_LENGTH];
--#endif
--#endif
--#ifndef OPENSSL_NO_WHIRLPOOL
--	unsigned char whirlpool[WHIRLPOOL_DIGEST_LENGTH];
--#endif
--#ifndef OPENSSL_NO_RIPEMD
--	unsigned char rmd160[RIPEMD160_DIGEST_LENGTH];
--#endif
- #ifndef OPENSSL_NO_RC4
- 	RC4_KEY rc4_ks;
- #endif
-@@ -473,8 +506,8 @@ int MAIN(int argc, char **argv)
- #define D_IGE_128_AES   26
- #define D_IGE_192_AES   27
- #define D_IGE_256_AES   28
-+#define D_HMAC_SHA1	29
- 	double d=0.0;
--	long c[ALGOR_NUM][SIZE_NUM];
- #define	R_DSA_512	0
- #define	R_DSA_1024	1
- #define	R_DSA_2048	2
-@@ -783,6 +816,8 @@ int MAIN(int argc, char **argv)
- 							doit[D_SHA256]=1,
- 							doit[D_SHA512]=1;
- 		else
-+			if (strcmp(*argv,"hmac-sha1") == 0) doit[D_HMAC_SHA1]=1;
-+		else
- #ifndef OPENSSL_NO_SHA256
- 			if (strcmp(*argv,"sha256") == 0) doit[D_SHA256]=1;
- 		else
-@@ -1000,6 +1035,9 @@ int MAIN(int argc, char **argv)
- #endif
- #ifndef OPENSSL_NO_SHA1
- 			BIO_printf(bio_err,"sha1     ");
-+#ifndef OPENSSL_NO_HMAC
-+			BIO_printf(bio_err,"hmac-sha1 ");
-+#endif
- #endif
- #ifndef OPENSSL_NO_SHA256
- 			BIO_printf(bio_err,"sha256   ");
-@@ -1270,6 +1308,7 @@ int MAIN(int argc, char **argv)
- 	c[D_IGE_128_AES][0]=count;
- 	c[D_IGE_192_AES][0]=count;
- 	c[D_IGE_256_AES][0]=count;
-+	c[D_HMAC_SHA1][0]=count;
- 
- 	for (i=1; i<SIZE_NUM; i++)
- 		{
-@@ -1283,6 +1322,7 @@ int MAIN(int argc, char **argv)
- 		c[D_SHA256][i]=c[D_SHA256][0]*4*lengths[0]/lengths[i];
- 		c[D_SHA512][i]=c[D_SHA512][0]*4*lengths[0]/lengths[i];
- 		c[D_WHIRLPOOL][i]=c[D_WHIRLPOOL][0]*4*lengths[0]/lengths[i];
-+		c[D_HMAC_SHA1][i]=c[D_HMAC_SHA1][0]*4*lengths[0]/lengths[i];
- 		}
- 	for (i=1; i<SIZE_NUM; i++)
- 		{
-@@ -1457,15 +1497,11 @@ int MAIN(int argc, char **argv)
- 		}
- #endif
- 
--#define COND(d)	(count < (d))
--#define COUNT(d) (d)
- #else
- /* not worth fixing */
- # error "You cannot disable DES on systems without SIGALRM."
- #endif /* OPENSSL_NO_DES */
- #else
--#define COND(c)	(run)
--#define COUNT(d) (count)
- #ifndef _WIN32
- 	signal(SIGALRM,sig_done);
- #endif
-@@ -1473,161 +1509,54 @@ int MAIN(int argc, char **argv)
- 
- #ifndef OPENSSL_NO_MD2
- 	if (doit[D_MD2])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_MD2],c[D_MD2][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_MD2][j]); count++)
--				EVP_Digest(buf,(unsigned long)lengths[j],&(md2[0]),NULL,EVP_md2(),NULL);
--			d=Time_F(STOP);
--			print_result(D_MD2,j,count,d);
--			}
--		}
-+		Test_Digest(D_MD2, EVP_md2());
- #endif
- #ifndef OPENSSL_NO_MDC2
- 	if (doit[D_MDC2])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_MDC2],c[D_MDC2][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_MDC2][j]); count++)
--				EVP_Digest(buf,(unsigned long)lengths[j],&(mdc2[0]),NULL,EVP_mdc2(),NULL);
--			d=Time_F(STOP);
--			print_result(D_MDC2,j,count,d);
--			}
--		}
-+		Test_Digest(D_MDC2, EVP_mdc2());
- #endif
- 
- #ifndef OPENSSL_NO_MD4
- 	if (doit[D_MD4])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_MD4],c[D_MD4][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_MD4][j]); count++)
--				EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md4[0]),NULL,EVP_md4(),NULL);
--			d=Time_F(STOP);
--			print_result(D_MD4,j,count,d);
--			}
--		}
-+		Test_Digest(D_MD4, EVP_md4());
- #endif
- 
- #ifndef OPENSSL_NO_MD5
- 	if (doit[D_MD5])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_MD5],c[D_MD5][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_MD5][j]); count++)
--				EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md5[0]),NULL,EVP_get_digestbyname("md5"),NULL);
--			d=Time_F(STOP);
--			print_result(D_MD5,j,count,d);
--			}
--		}
-+		Test_Digest(D_MD5, EVP_md5());
- #endif
- 
- #if !defined(OPENSSL_NO_MD5) && !defined(OPENSSL_NO_HMAC)
- 	if (doit[D_HMAC])
--		{
--		HMAC_CTX hctx;
--
--		HMAC_CTX_init(&hctx);
--		HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...",
--			16,EVP_md5(), NULL);
--
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_HMAC],c[D_HMAC][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_HMAC][j]); count++)
--				{
--				HMAC_Init_ex(&hctx,NULL,0,NULL,NULL);
--				HMAC_Update(&hctx,buf,lengths[j]);
--				HMAC_Final(&hctx,&(hmac[0]),NULL);
--				}
--			d=Time_F(STOP);
--			print_result(D_HMAC,j,count,d);
--			}
--		HMAC_CTX_cleanup(&hctx);
--		}
-+		Test_HMAC(D_HMAC, EVP_md5());
-+#endif
-+#if !defined(OPENSSL_NO_SHA1) && !defined(OPENSSL_NO_HMAC)
-+	if (doit[D_HMAC_SHA1])
-+		Test_HMAC(D_HMAC_SHA1, EVP_sha1());
- #endif
- #ifndef OPENSSL_NO_SHA
- 	if (doit[D_SHA1])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_SHA1],c[D_SHA1][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_SHA1][j]); count++)
--				EVP_Digest(buf,(unsigned long)lengths[j],&(sha[0]),NULL,EVP_sha1(),NULL);
--			d=Time_F(STOP);
--			print_result(D_SHA1,j,count,d);
--			}
--		}
-+		Test_Digest(D_SHA1, EVP_sha1());
- 
- #ifndef OPENSSL_NO_SHA256
- 	if (doit[D_SHA256])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_SHA256],c[D_SHA256][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_SHA256][j]); count++)
--				SHA256(buf,lengths[j],sha256);
--			d=Time_F(STOP);
--			print_result(D_SHA256,j,count,d);
--			}
--		}
-+		Test_Digest(D_SHA256, EVP_sha256());
- #endif
- 
- #ifndef OPENSSL_NO_SHA512
- 	if (doit[D_SHA512])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_SHA512],c[D_SHA512][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_SHA512][j]); count++)
--				SHA512(buf,lengths[j],sha512);
--			d=Time_F(STOP);
--			print_result(D_SHA512,j,count,d);
--			}
--		}
-+		Test_Digest(D_SHA512, EVP_sha512());
- #endif
- #endif
- 
- #ifndef OPENSSL_NO_WHIRLPOOL
- 	if (doit[D_WHIRLPOOL])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_WHIRLPOOL],c[D_WHIRLPOOL][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_WHIRLPOOL][j]); count++)
--				WHIRLPOOL(buf,lengths[j],whirlpool);
--			d=Time_F(STOP);
--			print_result(D_WHIRLPOOL,j,count,d);
--			}
--		}
-+		Test_Digest(D_WHIRLPOOL, EVP_whirlpool());
- #endif
- 
- #ifndef OPENSSL_NO_RIPEMD
- 	if (doit[D_RMD160])
--		{
--		for (j=0; j<SIZE_NUM; j++)
--			{
--			print_message(names[D_RMD160],c[D_RMD160][j],lengths[j]);
--			Time_F(START);
--			for (count=0,run=1; COND(c[D_RMD160][j]); count++)
--				EVP_Digest(buf,(unsigned long)lengths[j],&(rmd160[0]),NULL,EVP_ripemd160(),NULL);
--			d=Time_F(STOP);
--			print_result(D_RMD160,j,count,d);
--			}
--		}
-+		Test_Digest(D_RMD160, EVP_ripemd160());
- #endif
- #ifndef OPENSSL_NO_RC4
- 	if (doit[D_RC4])
--- 
-1.7.0.4
-
diff --git a/main/openssl/0005-crypto-engine-autoload-padlock-dynamic-engine.patch b/main/openssl/0005-crypto-engine-autoload-padlock-dynamic-engine.patch
index 3c72ce26a..770160ec0 100644
--- a/main/openssl/0005-crypto-engine-autoload-padlock-dynamic-engine.patch
+++ b/main/openssl/0005-crypto-engine-autoload-padlock-dynamic-engine.patch
@@ -25,9 +25,9 @@ index 22c1204..827e447 100644
 +		}
 +	}
 +#endif
+	ENGINE_register_all_complete();
  	}
  
- #if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
 -- 
 1.7.0.4
 
diff --git a/main/openssl/APKBUILD b/main/openssl/APKBUILD
index f6d5b6447..e66ac0a8d 100644
--- a/main/openssl/APKBUILD
+++ b/main/openssl/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=openssl
-pkgver=1.0.0h
+pkgver=1.0.1
 pkgrel=0
 pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
 url="http://openssl.org"
@@ -16,7 +16,6 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
 	fix-manpages.patch
 	openssl-bb-basename.patch
 	0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
-	0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch
 	0003-engines-e_padlock-backport-cvs-head-changes.patch
 	0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
 	0005-crypto-engine-autoload-padlock-dynamic-engine.patch
@@ -69,11 +68,10 @@ libssl() {
 	done
 }
 
-md5sums="a5bc483c570f2ac3758ce5c19b667fab  openssl-1.0.0h.tar.gz
+md5sums="134f168bc2a8333f19f81d684841710b  openssl-1.0.1.tar.gz
 115c481cd59b3dba631364e8fb1778f5  fix-manpages.patch
 c6a9857a5dbd30cead0404aa7dd73977  openssl-bb-basename.patch
 1f607b8e11347e56a0906756f3d6928a  0001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
-16424fe5fb494804559f01c7ec7e64f4  0002-apps-speed-fix-digest-speed-measurement-and-add-hmac.patch
 53fbd01733b488717575e04a5aaf6664  0003-engines-e_padlock-backport-cvs-head-changes.patch
 beea8819faeefb9ab19ef90f00c53782  0004-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
-8bc7a427f6005158585386b9837f700c  0005-crypto-engine-autoload-padlock-dynamic-engine.patch"
+7820941f69acf58f05cccb33faf4ee70  0005-crypto-engine-autoload-padlock-dynamic-engine.patch"
diff --git a/main/perl-class-container/APKBUILD b/main/perl-class-container/APKBUILD
index 2254ad500..0b5149b0c 100644
--- a/main/perl-class-container/APKBUILD
+++ b/main/perl-class-container/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-class-container
 _pkgreal=Class-Container
 pkgver=0.12
-pkgrel=0
+pkgrel=1
 pkgdesc="Glues object frameworks together transparently"
 url="http://search.cpan.org/dist/Class-Container/"
 arch="noarch"
@@ -12,7 +12,7 @@ license="GPL PerlArtistic"
 cpandepends="perl-params-validate"
 cpanmakedepends=""
 depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+makedepends="perl-dev perl-module-implementation $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-html-mason-psgihandler/APKBUILD b/main/perl-html-mason-psgihandler/APKBUILD
index bed4fbed5..c6377c8de 100644
--- a/main/perl-html-mason-psgihandler/APKBUILD
+++ b/main/perl-html-mason-psgihandler/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-html-mason-psgihandler
 _pkgreal=HTML-Mason-PSGIHandler
 pkgver=0.52
-pkgrel=0
+pkgrel=1
 pkgdesc="PSGI handler for HTML::Mason"
 url="http://search.cpan.org/dist/HTML-Mason-PSGIHandler/"
 arch="noarch"
@@ -12,7 +12,7 @@ license="GPL PerlArtistic"
 cpandepends="perl-cgi-psgi perl-html-mason"
 cpanmakedepends=""
 depends="$cpandepends"
-makedepends="perl-dev perl-plack $cpanmakedepends"
+makedepends="perl-dev perl-module-implementation perl-plack $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/A/AB/ABH/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-html-mason/APKBUILD b/main/perl-html-mason/APKBUILD
index 74944ed92..b821ad49c 100644
--- a/main/perl-html-mason/APKBUILD
+++ b/main/perl-html-mason/APKBUILD
@@ -4,7 +4,7 @@
 pkgname=perl-html-mason
 _pkgreal=HTML-Mason
 pkgver=1.45
-pkgrel=0
+pkgrel=1
 pkgdesc="High-performance, dynamic web site authoring system"
 url="http://search.cpan.org/dist/HTML-Mason/"
 arch="noarch"
@@ -12,7 +12,7 @@ license="GPL PerlArtistic"
 cpandepends="perl-html-parser perl-class-container perl-params-validate perl-log-any perl-cache-cache perl-test-deep perl-exception-class"
 cpanmakedepends=""
 depends="$cpandepends"
-makedepends="perl-dev $cpanmakedepends"
+makedepends="perl-dev perl-module-implementation $cpanmakedepends"
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
 
diff --git a/main/perl-log-dispatch/APKBUILD b/main/perl-log-dispatch/APKBUILD
index 00684f0b5..5c3d0f6c1 100644
--- a/main/perl-log-dispatch/APKBUILD
+++ b/main/perl-log-dispatch/APKBUILD
@@ -1,33 +1,32 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Automatically generated by apkbuild-cpan, template 1
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=perl-log-dispatch
-pkgver=2.27
+_pkgreal=Log-Dispatch
+pkgver=2.29
 pkgrel=0
 pkgdesc="Dispatches messages to one or more outputs"
 url="http://search.cpan.org/dist/Log-Dispatch/"
 arch="noarch"
-license="Artistic 2.0"
-depends="perl perl-params-validate"
-makedepends="perl-dev"
-install=""
+license="Artistic-2"
+cpandepends="perl-params-validate"
+cpanmakedepends="   "
+depends="$cpandepends"
+makedepends="perl-dev perl-module-implementation $cpanmakedepends"
 subpackages="$pkgname-doc"
-source="http://www.cpan.org/authors/id/D/DR/DROLSKY/Log-Dispatch-$pkgver.tar.gz"
+source="http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/$_pkgreal-$pkgver.tar.gz"
+
+_builddir="$srcdir/$_pkgreal-$pkgver"
 
-_builddir="$srcdir"/Log-Dispatch-$pkgver
 prepare() {
-	local i
 	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
 
 build() {
 	cd "$_builddir"
-	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1
-	make && make test || return 1
+	export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
+	make && make test
 }
 
 package() {
@@ -36,4 +35,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-md5sums="6bd3420ef0df39f2e32fbbe6b57a1db8  Log-Dispatch-2.27.tar.gz"
+md5sums="781a4b5a9db2b617d2487dadecf65081  Log-Dispatch-2.29.tar.gz"
diff --git a/main/perl-mail-clamav/APKBUILD b/main/perl-mail-clamav/APKBUILD
index 4c6bd0bb3..c48a1b645 100644
--- a/main/perl-mail-clamav/APKBUILD
+++ b/main/perl-mail-clamav/APKBUILD
@@ -3,13 +3,13 @@
 pkgname=perl-mail-clamav
 _realname=Mail-ClamAV
 pkgver=0.29
-pkgrel=5
+pkgrel=6
 pkgdesc="Perl extension for the clamav virus scanner"
 url="http://search.cpan.org/~converter/Mail-ClamAV-0.29/"
 arch="all"
 license="Unknown"
 depends="perl clamav"
-makedepends="perl-dev perl-inline perl-parse-recdescent clamav-dev zlib-dev"
+makedepends="bzip2-dev  perl-dev perl-inline perl-parse-recdescent clamav-dev zlib-dev"
 install=
 subpackages="$pkgname-doc"
 source="http://search.cpan.org/CPAN/authors/id/C/CO/CONVERTER/$_realname-$pkgver.tar.gz"
diff --git a/main/py-gobject/APKBUILD b/main/py-gobject/APKBUILD
index 7a6ed7fd8..7868258eb 100644
--- a/main/py-gobject/APKBUILD
+++ b/main/py-gobject/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=py-gobject
-pkgver=2.28.4
-pkgrel=2
+pkgver=2.28.6
+pkgrel=0
 pkgdesc="Python bindings for the GObject library"
 url="http://www.pygtk.org/"
 arch="all"
 license="GPL"
 depends=
 depends_dev="libffi-dev glib-dev"
-makedepends="$depends_dev python-dev py-cairo-dev gobject-introspection-dev"
+makedepends="$depends_dev python-dev py-cairo-dev"
 install=
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://ftp.gnome.org/pub/GNOME/sources/pygobject/${pkgver%.*}/pygobject-$pkgver.tar.bz2"
@@ -25,6 +25,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--disable-introspection \
 		|| return 1
 	make || return 1
 }
@@ -35,4 +36,4 @@ package() {
 	find $pkgdir -name "*.la" -print0 | xargs -0 rm -f
 }
 
-md5sums="14e700d5f4b8af00a68a6bcdd65a8db9  pygobject-2.28.4.tar.bz2"
+md5sums="a43d783228dd32899e6908352b8308f3  pygobject-2.28.6.tar.bz2"
diff --git a/main/recordproto/APKBUILD b/main/recordproto/APKBUILD
index f978ea045..9df8736fd 100644
--- a/main/recordproto/APKBUILD
+++ b/main/recordproto/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=recordproto
-pkgver=1.14.1
+pkgver=1.14.2
 pkgrel=0
 pkgdesc="X11 Record extension wire protocol"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
@@ -21,4 +21,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -D -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums="24541a30b399213def35f48efd926c63  recordproto-1.14.1.tar.bz2"
+md5sums="1b4e5dede5ea51906f1530ca1e21d216  recordproto-1.14.2.tar.bz2"
diff --git a/main/scrnsaverproto/APKBUILD b/main/scrnsaverproto/APKBUILD
index cb01d2e20..8d4f5fd22 100644
--- a/main/scrnsaverproto/APKBUILD
+++ b/main/scrnsaverproto/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=scrnsaverproto
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=0
 pkgdesc="X11 Screen Saver extension wire protocol"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
@@ -22,4 +22,4 @@ package() {
 	install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
 	install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/ || return 1
 }
-md5sums="6af0f2e3369f5f74e69345e214f5fd0d  scrnsaverproto-1.2.1.tar.bz2"
+md5sums="edd8a73775e8ece1d69515dd17767bfb  scrnsaverproto-1.2.2.tar.bz2"
diff --git a/main/vanessa_adt/APKBUILD b/main/vanessa_adt/APKBUILD
index b7c8ee691..938e7ff53 100644
--- a/main/vanessa_adt/APKBUILD
+++ b/main/vanessa_adt/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=vanessa_adt
 pkgver=0.0.8
-pkgrel=1
+pkgrel=3
 pkgdesc="Library of abstract data types"
 url="http://horms.net/projects/perdition/"
 arch="all"
@@ -22,6 +22,7 @@ prepare() {
 }
 
 build() {
+	export LDFLAGS="$LDFLAGS -lvanessa_logger"
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
diff --git a/main/vanessa_socket/APKBUILD b/main/vanessa_socket/APKBUILD
index 4b62f179f..a49474c22 100644
--- a/main/vanessa_socket/APKBUILD
+++ b/main/vanessa_socket/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=vanessa_socket
 pkgver=0.0.10
-pkgrel=1
+pkgrel=3
 pkgdesc="User space TCP/IP pipe"
 url="http://horms.net/projects/perdition/"
 arch="all"
@@ -22,6 +22,7 @@ prepare() {
 }
 
 build() {
+	export LDFLAGS="$LDFLAGS -lvanessa_logger"
 	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
diff --git a/main/wireshark/APKBUILD b/main/wireshark/APKBUILD
index c4f27635d..aec0cbd19 100644
--- a/main/wireshark/APKBUILD
+++ b/main/wireshark/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=wireshark
-pkgver=1.6.5
+pkgver=1.6.6
 pkgrel=0
 pkgdesc="network protocol analyzer - GTK version"
 url="http://www.wireshark.org"
@@ -76,6 +76,6 @@ tshark() {
 	mv "$pkgdir"/usr/bin/tshark "$subpkgdir"/usr/bin/tshark
 }
 
-md5sums="794948a10d387fc8e37d824ea11dbac9  wireshark-1.6.5.tar.bz2
+md5sums="61145ccd7684b3cfb159fc902fedfecf  wireshark-1.6.6.tar.bz2
 504ede44c02b2a52f6cbd3bffdf93b8d  wireshark.desktop
 e771800a8c977fe223583a453bc27397  wireshark.png"
diff --git a/main/xcb-proto/APKBUILD b/main/xcb-proto/APKBUILD
index 06c3df4a5..bd7b2f82b 100644
--- a/main/xcb-proto/APKBUILD
+++ b/main/xcb-proto/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xcb-proto
-pkgver=1.7
+pkgver=1.7.1
 pkgrel=0
 pkgdesc="XML-XCB protocol descriptions"
 url="http://xcb.freedesktop.org/"
@@ -22,4 +22,4 @@ package() {
 	install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
 	install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums="f5d73ec841ed055f5e80535819f18400  xcb-proto-1.7.tar.bz2"
+md5sums="948fec39dd42f3694edd5d9689735ec4  xcb-proto-1.7.1.tar.bz2"
diff --git a/main/xcmiscproto/APKBUILD b/main/xcmiscproto/APKBUILD
index 5788eabef..6f4aa429e 100644
--- a/main/xcmiscproto/APKBUILD
+++ b/main/xcmiscproto/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xcmiscproto
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=0
 pkgdesc="X11 XC-Miscellaneous extension wire protocol"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
@@ -20,4 +20,4 @@ package() {
 	cd "$srcdir"/$pkgname-$pkgver
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="cd7372cd827bfd7ca7e9238f2ce274b1  xcmiscproto-1.2.1.tar.bz2"
+md5sums="5f4847c78e41b801982c8a5e06365b24  xcmiscproto-1.2.2.tar.bz2"
diff --git a/main/xextproto/APKBUILD b/main/xextproto/APKBUILD
index b9d32a669..daf511942 100644
--- a/main/xextproto/APKBUILD
+++ b/main/xextproto/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xextproto
-pkgver=7.2.0
+pkgver=7.2.1
 pkgrel=0
 pkgdesc="X11 various extension wire protocol"
 url="http://xorg.freedesktop.org/"
@@ -21,4 +21,4 @@ package() {
 	make -j1 DESTDIR=""$pkgdir"" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="220732210ceffb01bf1caf970e3b1bfb  xextproto-7.2.0.tar.bz2"
+md5sums="eaac343af094e6b608cf15cfba0f77c5  xextproto-7.2.1.tar.bz2"
diff --git a/main/xf86-input-evdev/APKBUILD b/main/xf86-input-evdev/APKBUILD
index 14098dc16..e66472b90 100644
--- a/main/xf86-input-evdev/APKBUILD
+++ b/main/xf86-input-evdev/APKBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-evdev
-pkgver=2.6.0
-pkgrel=2
+pkgver=2.7.0
+pkgrel=0
 pkgdesc="X.org evdev input driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 subpackages="$pkgname-doc"
 depends=
-makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
+makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
+	udev-dev"
 source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
@@ -25,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="f33fe9413bde68936d8909206a13e8a1  xf86-input-evdev-2.6.0.tar.bz2"
+md5sums="4449b2e94900e98d2f41c2f46dd0397e  xf86-input-evdev-2.7.0.tar.bz2"
diff --git a/main/xf86-input-keyboard/APKBUILD b/main/xf86-input-keyboard/APKBUILD
index 2c4265257..116991e03 100644
--- a/main/xf86-input-keyboard/APKBUILD
+++ b/main/xf86-input-keyboard/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-keyboard
 pkgver=1.6.1
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org keyboard input driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-input-mouse/APKBUILD b/main/xf86-input-mouse/APKBUILD
index e8a4997e6..6d250d4db 100644
--- a/main/xf86-input-mouse/APKBUILD
+++ b/main/xf86-input-mouse/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-mouse
-pkgver=1.7.1
-pkgrel=1
+pkgver=1.7.2
+pkgrel=0
 pkgdesc="X.org mouse input driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -24,4 +24,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/input/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="13276d780b8ef3a82088f009185bf42b  xf86-input-mouse-1.7.1.tar.bz2"
+md5sums="871c828b88e9c973f1457724b35576fb  xf86-input-mouse-1.7.2.tar.bz2"
diff --git a/main/xf86-input-synaptics/APKBUILD b/main/xf86-input-synaptics/APKBUILD
index c6e4b3798..b48488f93 100644
--- a/main/xf86-input-synaptics/APKBUILD
+++ b/main/xf86-input-synaptics/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-synaptics
-pkgver=1.5.0
+pkgver=1.5.99.902
 pkgrel=0
 pkgdesc="X.org synaptics input driver"
 url="http://xorg.freedesktop.org/"
@@ -8,7 +8,8 @@ arch="all"
 license="custom"
 subpackages="$pkgname-doc"
 depends=
-makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev"
+makedepends="pkgconfig libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
+	mtdev-dev libxtst-dev"
 source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 build() {
@@ -24,4 +25,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/input/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="41ee749ecbfef98f7fba708cb2afae87  xf86-input-synaptics-1.5.0.tar.bz2"
+md5sums="3e57a18839aad7e8633e19afdabd6b49  xf86-input-synaptics-1.5.99.902.tar.bz2"
diff --git a/main/xf86-input-vmmouse/APKBUILD b/main/xf86-input-vmmouse/APKBUILD
index f7a7544b3..bf5b911df 100644
--- a/main/xf86-input-vmmouse/APKBUILD
+++ b/main/xf86-input-vmmouse/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-input-vmmouse
-pkgver=12.7.0
-pkgrel=1
+pkgver=12.8.0
+pkgrel=0
 pkgdesc="X.org VMware mouse input driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -24,4 +24,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="dc77181330f983c7d0ec1ea1592c2ca7  xf86-input-vmmouse-12.7.0.tar.bz2"
+md5sums="15fce165117706cd5e774a8aa58122ce  xf86-input-vmmouse-12.8.0.tar.bz2"
diff --git a/main/xf86-video-apm/APKBUILD b/main/xf86-video-apm/APKBUILD
index a60d5a2b6..e72957da9 100644
--- a/main/xf86-video-apm/APKBUILD
+++ b/main/xf86-video-apm/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-apm
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Alliance ProMotion video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,7 +11,18 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	apm-1.2.3-git.patch
+	"
+
+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
+}
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -27,4 +38,5 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="a3743a971b3acb7de3d2eefc8b1a4834  xf86-video-apm-1.2.3.tar.bz2"
+md5sums="a3743a971b3acb7de3d2eefc8b1a4834  xf86-video-apm-1.2.3.tar.bz2
+53d71f20d5683443d5a72a817c37209d  apm-1.2.3-git.patch"
diff --git a/main/xf86-video-apm/apm-1.2.3-git.patch b/main/xf86-video-apm/apm-1.2.3-git.patch
new file mode 100644
index 000000000..1c6afb29d
--- /dev/null
+++ b/main/xf86-video-apm/apm-1.2.3-git.patch
@@ -0,0 +1,34 @@
+diff --git a/src/apm.h b/src/apm.h
+index bc66714..86c7663 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -109,7 +109,7 @@ typedef struct {
+     char		*MemMap;
+     pointer		BltMap;
+     Bool		UnlockCalled;
+-    IOADDRESS		iobase, xport, xbase;
++    unsigned long	iobase, xport, xbase;
+     unsigned char	savedSR10;
+     CARD8		MiscOut;
+     CARD8		c9, d9, db, Rush;
+diff --git a/src/apm_driver.c b/src/apm_driver.c
+index f172bab..f77bb2b 100644
+--- a/src/apm_driver.c
++++ b/src/apm_driver.c
+@@ -418,8 +418,14 @@ ApmPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+     hwp = VGAHWPTR(pScrn);
+     vgaHWGetIOBase(hwp);
+-    pApm->iobase = hwp->PIOOffset;
+-    pApm->xport = hwp->PIOOffset + 0x3C4;
++#if ABI_VIDEODRV_VERSION < 12
++#define PIOOFFSET hwp->PIOOffset
++#else
++/* FIXME reintroduce domain support */
++#define PIOOFFSET 0
++#endif
++    pApm->iobase = PIOOFFSET;
++    pApm->xport = PIOOFFSET + 0x3C4;
+ 
+     /* Set pScrn->monitor */
+     pScrn->monitor = pScrn->confScreen->monitor;
diff --git a/main/xf86-video-ark/APKBUILD b/main/xf86-video-ark/APKBUILD
index 417f9bc37..c9cbb611e 100644
--- a/main/xf86-video-ark/APKBUILD
+++ b/main/xf86-video-ark/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ark
-pkgver=0.7.3
-pkgrel=2
+pkgver=0.7.4
+pkgrel=1
 pkgdesc="X.Org driver for ark cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="ff0cb9cb0a7f36cc6f556deed7327798  xf86-video-ark-0.7.3.tar.bz2"
+md5sums="21f5db0beca2d3d99aae739174d5b44f  xf86-video-ark-0.7.4.tar.bz2"
diff --git a/main/xf86-video-ast/APKBUILD b/main/xf86-video-ast/APKBUILD
index dc3360ed5..a673bbfd5 100644
--- a/main/xf86-video-ast/APKBUILD
+++ b/main/xf86-video-ast/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ast
-pkgver=0.93.9
+pkgver=0.93.10
 pkgrel=0
 pkgdesc="X.Org driver for ASpeedTech cards"
 url="http://xorg.freedesktop.org/"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/drivers/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="e25c6a55e9d07cc6054d6affc1231296  xf86-video-ast-0.93.9.tar.bz2"
+md5sums="de0bf8e0c8ab67be42c14f07ca427271  xf86-video-ast-0.93.10.tar.bz2"
diff --git a/main/xf86-video-ati/APKBUILD b/main/xf86-video-ati/APKBUILD
index 7d3d543c5..37d10581b 100644
--- a/main/xf86-video-ati/APKBUILD
+++ b/main/xf86-video-ati/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-ati
 pkgver=6.14.3
-pkgrel=1
+pkgrel=2
 pkgdesc="ATI video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -10,10 +10,23 @@ subpackages="$pkgname-doc"
 depends="mesa-dri-ati"
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto libdrm-dev xf86driproto glproto mesa-dev
-	xineramaproto udev-dev pixman-dev
+	xineramaproto udev-dev pixman-dev util-macros
+	autoconf automake libtool
 	"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	xf86-video-ati-6.14.3-xorg-server-1.12.patch
+	"
+
+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
+	aclocal && autoreconf
+}
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -32,4 +45,5 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="19126c8421a05d9605883dcf7498d876  xf86-video-ati-6.14.3.tar.bz2"
+md5sums="19126c8421a05d9605883dcf7498d876  xf86-video-ati-6.14.3.tar.bz2
+ff01b935d15ab799d3e3f415a810d0fe  xf86-video-ati-6.14.3-xorg-server-1.12.patch"
diff --git a/main/xf86-video-ati/xf86-video-ati-6.14.3-xorg-server-1.12.patch b/main/xf86-video-ati/xf86-video-ati-6.14.3-xorg-server-1.12.patch
new file mode 100644
index 000000000..43fa945f9
--- /dev/null
+++ b/main/xf86-video-ati/xf86-video-ati-6.14.3-xorg-server-1.12.patch
@@ -0,0 +1,118 @@
+From c66ae235700f5efe64eb168327551b8f1d153c9c Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Mon, 13 Feb 2012 09:43:58 +0000
+Subject: Handle new xorg_list API.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=45937
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 29f129a..0083325 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,10 +234,18 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ 	      [#include "xorg-server.h"])
+ 
+ AC_CHECK_HEADERS([list.h],
+-		 [], [],
++		 [have_list_h="yes"], [have_list_h="no"],
+ 		 [#include <X11/Xdefs.h>
+ 		  #include "xorg-server.h"])
+ 
++if test "x$have_list_h" = xyes; then
++    AC_CHECK_DECL(xorg_list_init,
++		  [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [],
++		  [#include <X11/Xdefs.h>
++		   #include "xorg-server.h"
++		   #include "list.h"])
++fi
++
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
+diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
+index 835575f..cf905a1 100644
+--- a/src/radeon_dri2.c
++++ b/src/radeon_dri2.c
+@@ -40,6 +40,13 @@
+ 
+ #if HAVE_LIST_H
+ #include "list.h"
++#if !HAVE_XORG_LIST
++#define xorg_list			list
++#define xorg_list_init			list_init
++#define xorg_list_add			list_add
++#define xorg_list_del			list_del
++#define xorg_list_for_each_entry	list_for_each_entry
++#endif
+ #endif
+ 
+ #ifdef RADEON_DRI2
+@@ -515,11 +522,11 @@ typedef struct _DRI2FrameEvent {
+ 
+     Bool valid;
+ 
+-    struct list link;
++    struct xorg_list link;
+ } DRI2FrameEventRec, *DRI2FrameEventPtr;
+ 
+ typedef struct _DRI2ClientEvents {
+-    struct list   reference_list;
++    struct xorg_list   reference_list;
+ } DRI2ClientEventsRec, *DRI2ClientEventsPtr;
+ 
+ #if HAS_DEVPRIVATEKEYREC
+@@ -538,7 +545,7 @@ DevPrivateKey DRI2ClientEventsPrivateKey = &DRI2ClientEventsPrivateKeyIndex;
+     dixLookupPrivate(&(pClient)->devPrivates, DRI2ClientEventsPrivateKey))
+ 
+ static int
+-ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
++ListAddDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
+ {
+     DRI2ClientEventsPtr pClientPriv;
+     pClientPriv = GetDRI2ClientEvents(client);
+@@ -547,12 +554,12 @@ ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
+         return BadAlloc;
+     }
+ 
+-    list_add(entry, &pClientPriv->reference_list);
++    xorg_list_add(entry, &pClientPriv->reference_list);
+     return 0;
+ }
+ 
+ static void
+-ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
++ListDelDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
+ {
+     DRI2ClientEventsPtr pClientPriv;
+     pClientPriv = GetDRI2ClientEvents(client);
+@@ -560,7 +567,7 @@ ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
+     if (!pClientPriv) {
+         return;
+     }
+-    list_del(entry);
++    xorg_list_del(entry);
+ }
+ 
+ static void
+@@ -574,7 +581,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
+ 
+     switch (pClient->clientState) {
+     case ClientStateInitial:
+-        list_init(&pClientEventsPriv->reference_list);
++        xorg_list_init(&pClientEventsPriv->reference_list);
+         break;
+     case ClientStateRunning:
+         break;
+@@ -582,7 +589,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
+     case ClientStateRetained:
+     case ClientStateGone:
+         if (pClientEventsPriv) {
+-            list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
++            xorg_list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
+                 ref->valid = FALSE;
+             }
+         }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/main/xf86-video-chips/APKBUILD b/main/xf86-video-chips/APKBUILD
index a030d714f..01c05a77b 100644
--- a/main/xf86-video-chips/APKBUILD
+++ b/main/xf86-video-chips/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-chips
 pkgver=1.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Chips and Technologies video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,8 +11,17 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	chips-1.2.4-git.patch"
 
+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
+}
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
@@ -26,4 +35,5 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="7aed07116e56c0630f62d7d34d7526e1  xf86-video-chips-1.2.4.tar.bz2"
+md5sums="7aed07116e56c0630f62d7d34d7526e1  xf86-video-chips-1.2.4.tar.bz2
+458dcf84d477e5d289428f7b39ccf2a7  chips-1.2.4-git.patch"
diff --git a/main/xf86-video-chips/chips-1.2.4-git.patch b/main/xf86-video-chips/chips-1.2.4-git.patch
new file mode 100644
index 000000000..9d8e856a3
--- /dev/null
+++ b/main/xf86-video-chips/chips-1.2.4-git.patch
@@ -0,0 +1,912 @@
+diff --git a/configure.ac b/configure.ac
+index 225e516..c0ed508 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,9 +44,6 @@ XORG_DEFAULT_OPTIONS
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+ 
+-# Checks for programs.
+-AM_PROG_CC_C_O
+-
+ AH_TOP([#include "xorg-server.h"])
+ 
+ # Define a configure option for an alternate module directory
+diff --git a/man/chips.man b/man/chips.man
+index 740af38..0c022ee 100644
+--- a/man/chips.man
++++ b/man/chips.man
+@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off
+ Force driver to leave centering and stretching registers alone. This
+ can fix some laptop suspend/resume problems. Default: off
+ .TP
+-.BI "Option \*qOverlay\*q"
+-Enable 8+24 overlay mode.  Only appropriate for depth 24.  Default: off.
+-.TP
+ .BI "Option \*qColorKey\*q \*q" integer \*q
+ Set the colormap index used for the transparency key for the depth 8 plane
+ when operating in 8+16 overlay mode.  The value must be in the range
+diff --git a/src/ct_accel.c b/src/ct_accel.c
+index 3920b0a..4b5776a 100644
+--- a/src/ct_accel.c
++++ b/src/ct_accel.c
+@@ -428,19 +428,7 @@ chips_imagewrite:
+         infoPtr->ImageWriteFlags |= NO_PLANEMASK;
+ #endif
+ 
+-
+-#ifdef CHIPS_HIQV
+-    if (XAAInit(pScreen, infoPtr)) {
+-	if (cPtr->Flags & ChipsOverlay8plus16)      
+-	    return(XAAInitDualFramebufferOverlay(pScreen,
+-						 CTNAME(DepthChange)));
+-	else
+-	    return TRUE;
+-    } else
+-	return FALSE;
+-#else
+     return(XAAInit(pScreen, infoPtr));
+-#endif
+ }
+ 
+ #ifdef CHIPS_HIQV
+@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn,
+ #endif
+     w *= cAcl->BytesPerPixel;
+     ctBLTWAIT;
+-#ifdef CHIPS_HIQV
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) &&
+-	    (pScrn->depth == 8))
+-	ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes);
+-#endif
+     ctSETSRCADDR(srcaddr);
+     ctSETDSTADDR(destaddr);
+ #ifdef CHIPS_HIQV
+@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+     patternaddr = (paty * pScrn->displayWidth + 
+ 		   (patx & ~0x3F)) * cAcl->BytesPerPixel;
+     cAcl->patternyrot = (patx & 0x3F) >> 3;
+-#ifdef CHIPS_HIQV
+-    if (cPtr->Flags & ChipsOverlay8plus16)
+-	patternaddr += cPtr->FbOffset16;
+-#endif
+ 
+     ctBLTWAIT;
+     ctSETPATSRCADDR(patternaddr);
+@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty,
+ 
+ #ifdef CHIPS_HIQV
+     patternaddr = paty * pScrn->displayWidth + patx;
+-    if (cPtr->Flags & ChipsOverlay8plus16)
+-	patternaddr = patternaddr * 2 + cPtr->FbOffset16;
+-    else
+-	patternaddr *= cAcl->BytesPerPixel;
++    patternaddr *= cAcl->BytesPerPixel;
+ #else
+     patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel;
+ #endif
+@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+     dwords = (((skipleft  + bytesPerLine + 0x7) & ~0x7)) >> 2;
+     destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+     destpitch = pScrn->displayWidth * (bpp >> 3);
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	destaddr += cPtr->FbOffset16;
+-    else
+-	destaddr += cAcl->FbOffset;
++    destaddr += cAcl->FbOffset;
+ 
+     ctBLTWAIT;
+ 
+@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ 	y++;
+ 
+ 	destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+-	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    destaddr += cPtr->FbOffset16;
+-	else
+-	    destaddr += cAcl->FbOffset;
++	destaddr += cAcl->FbOffset;
+ 
+ 	ctBLTWAIT;
+ 	ctSETDSTADDR(destaddr);
+@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+     dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2;
+     srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+     srcpitch = pScrn->displayWidth * (bpp >> 3);
+-    if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	srcaddr += cPtr->FbOffset16;
+-    else
+-	srcaddr += cAcl->FbOffset;
++    srcaddr += cAcl->FbOffset;
+ 
+     ctBLTWAIT;
+     ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | 
+@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h,
+ 	dst += dstwidth;
+ 	y++;
+ 	srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3);
+-	if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    srcaddr += cPtr->FbOffset16;
+-	else
+-	    srcaddr += cAcl->FbOffset;
++	srcaddr += cAcl->FbOffset;
+ 	ctBLTWAIT;
+ 	ctSETSRCADDR(srcaddr);
+ 	ctSETHEIGHTWIDTHGO(h, bytesPerLine);
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 6624b79..a2e5c94 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -949,7 +949,7 @@ CHIPSProbe(DriverPtr drv, int flags)
+ 		}
+ 
+ 	    }
+-	    xfree(usedChips);
++	    free(usedChips);
+ 	}
+     }
+ 
+@@ -981,12 +981,12 @@ CHIPSProbe(DriverPtr drv, int flags)
+ 		pScrn->ValidMode     = CHIPSValidMode;
+ 		foundScreen = TRUE;
+ 	    }
+-	    xfree(usedChips);
++	    free(usedChips);
+ 	}
+     }
+ #endif
+     
+-    xfree(devSections);
++    free(devSections);
+     return foundScreen;
+ }
+ #endif
+@@ -1446,7 +1446,12 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ 
+     hwp = VGAHWPTR(pScrn);
+     vgaHWGetIOBase(hwp);
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     cPtr->PIOBase = hwp->PIOOffset;
++#else
++    cPtr->PIOBase = 0;
++#endif
++
+     /*
+      * Must allow ensure that storage for the 2nd set of vga registers is
+      * allocated for dual channel cards
+@@ -1639,55 +1644,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+ 	}
+     }
+     
+-    if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) {
+-	if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) {
+-	  if (pScrn->bitsPerPixel == 16) {
+-	    if (cPtr->Flags & ChipsLinearSupport) {
+-		cPtr->Flags |= ChipsOverlay8plus16;
+-		if(!xf86GetOptValInteger(
+-			cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey)))
+-		    pScrn->colorKey = TRANSPARENCY_KEY;
+-		pScrn->overlayFlags = OVERLAY_8_16_DUALFB;
+-		xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, 
+-			   "PseudoColor overlay enabled.\n");
+-		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH))
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                             - Forcing option \"Stretch\" \"ON\".\n");
+-		if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER))
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                             - Forcing option \"LcdCenter\" \"OFF\".\n");
+-		if (cPtr->Flags & ChipsShadowFB) {
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+-		           "                             - Disabling \"Shadow Framebuffer\".\n");
+-		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-			   "                               Not support with option \"8Plus16\".\n");
+-		    cPtr->Flags &= ~ChipsShadowFB;
+-		    cPtr->Rotate = 0;
+-		}
+-	    } else {
+-		xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n");
+-	    }
+-	  } else {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-		"Option \"Overlay\" is not supported in this configuration\n");
+-	  }
+-	} else {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING, 
+-		"\"%s\" is not a valid value for Option \"Overlay\"\n", s); 
+-	}
+-    }
+-
+-    if (!(cPtr->Flags & ChipsOverlay8plus16)) {
+-	if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
+-		&(cPtr->videoKey))) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
++    if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY,
++	&(cPtr->videoKey))) {
++         xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n",
+ 		cPtr->videoKey);
+-	} else {
+-	    cPtr->videoKey =  (1 << pScrn->offset.red) | 
++    } else {
++       cPtr->videoKey =  (1 << pScrn->offset.red) | 
+ 			(1 << pScrn->offset.green) |
+ 			(((pScrn->mask.blue >> pScrn->offset.blue) - 1)
+ 			<< pScrn->offset.blue); 
+-	}
+     }
+ 
+     if (cPtr->Flags & ChipsShadowFB) {
+@@ -2335,28 +2300,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags)
+     /* and 32bits on the others. Thus multiply by a suitable factor      */  
+     if (cPtr->Flags & Chips64BitMemory) {
+ 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+-	    if (cPtr->Flags & ChipsOverlay8plus16 )
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock,
+ 			     MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1));
+ 	else
+-	    if (cPtr->Flags & ChipsOverlay8plus16)
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock, 
+ 			     MemClk->Clk * 8 * 0.7 / bytesPerPixel);
+     } else {
+ 	if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD))
+-	    if (cPtr->Flags & ChipsOverlay8plus16 )
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock,
+ 			     MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1));
+ 	else
+-	    if (cPtr->Flags & ChipsOverlay8plus16)
+-		cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3);
+-	    else
+ 		cPtr->MaxClock = min(cPtr->MaxClock, 
+ 			     MemClk->Clk * 4 * 0.7 / bytesPerPixel);
+     }
+@@ -3736,8 +3689,7 @@ CHIPSEnterVT(int scrnIndex, int flags)
+     /* Should we re-save the text mode on each VT enter? */
+     if(!chipsModeInit(pScrn, pScrn->currentMode))
+       return FALSE;
+-    if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
+-	&& (cPtr->Flags & ChipsVideoSupport)
++    if ((cPtr->Flags & ChipsVideoSupport)
+ 	&& (cPtr->Flags & ChipsLinearSupport)) 
+         CHIPSResetVideo(pScrn); 
+ 
+@@ -3788,8 +3740,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors,
+     int i, index, shift ;
+     CHIPSEntPtr cPtrEnt;    
+ 
+-    shift = ((pScrn->depth == 15) && 
+-	     (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0;
++    shift = (pScrn->depth == 15) ? 3 : 0;
+ 
+     if (cPtr->UseDualChannel) {
+         cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0],
+@@ -3895,18 +3846,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices,
+     hwp->disablePalette(hwp);
+ }
+ 
+-static Bool
+-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8,
+-                  int xsize, int ysize, int dpix, int dpiy,
+-                  int width16, int width8)
+-{
+-    return
+-        (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize,
+-                              dpix, dpiy, width16, width8, 16, 8) &&
+-         fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize,
+-                                   dpix, dpiy, width16, width8, 16, 8, 16, 8));
+-}
+-
+ /* Mandatory */
+ static Bool
+ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+@@ -3947,22 +3886,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     if (!chipsMapMem(pScrn))
+ 	return FALSE;
+ 
+-    /* Setup a pointer to the overlay if needed */
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY;
+-	cPtr->FbSize16 =  (pScrn->displayWidth << 1) * pScrn->virtualY;
+-	if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		   "Too little memory for overlay. Disabling.\n");
+-	    cPtr->Flags &= ~ChipsOverlay8plus16;
+-	}
+-	if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) {
+-	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+-		   "Max overlay Width/Height 1024 pixels. Disabling.\n");
+-	    cPtr->Flags &= ~ChipsOverlay8plus16;
+-	}
+-    }
+-
+     /* Setup the MMIO register access functions if need */
+     if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) {
+ 	CHIPSSetMmioExtFuncs(cPtr);
+@@ -4035,18 +3958,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     miClearVisualTypes();
+ 
+     /* Setup the visuals we support. */
+-    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){
+-	if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask,
+-			      pScrn->rgbBits, PseudoColor))
+-		return FALSE;
+-	if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor))
+-		return FALSE;
+-    } else {
+-      if (!miSetVisualTypes(pScrn->depth,
++    if (!miSetVisualTypes(pScrn->depth,
+ 			    miGetDefaultVisualMask(pScrn->depth),
+ 			    pScrn->rgbBits, pScrn->defaultVisual))
+-	return FALSE;
+-    }
++        return FALSE;
+     miSetPixmapDepths ();
+ 
+     /*
+@@ -4090,13 +4005,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	break;
+ #endif
+     case 16:
+-      if (cPtr->Flags & ChipsOverlay8plus16) {
+-	  ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + 
+-				  cPtr->FbOffset16, FBStart, width, 
+-				  height, pScrn->xDpi, pScrn->yDpi,
+-				  displayWidth, displayWidth);
+-	  break;
+-      }
+     default:
+ 	ret = fbScreenInit(pScreen, FBStart,
+  		        width,height,
+@@ -4223,7 +4131,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	}
+ 	if (!miInitializeBanking(pScreen, pScrn->virtualX, pScrn->virtualY,
+ 				 pScrn->displayWidth, pBankInfo)) {
+-	    xfree(pBankInfo);
++	    free(pBankInfo);
+ 	    pBankInfo = NULL;
+ 	    return FALSE;
+ 	}
+@@ -4244,9 +4152,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	if (pScrn->bitsPerPixel < 8)
+ 	    freespace = allocatebase - pScrn->displayWidth * 
+ 		    pScrn->virtualY / 2;
+-	else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16))
+-	    freespace = allocatebase - pScrn->displayWidth * 
+-		    pScrn->virtualY - cPtr->FbSize16;
+ 	else	
+ 	    freespace = allocatebase - pScrn->displayWidth * 
+ 		    pScrn->virtualY * (pScrn->bitsPerPixel >> 3);
+@@ -4369,9 +4274,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	    AvailFBArea.y2 = cAcl->CacheEnd /
+ 		(pScrn->displayWidth * (pScrn->bitsPerPixel >> 3));
+ 
+-	    if (!(cPtr->Flags & ChipsOverlay8plus16)) {     
+-		xf86InitFBManager(pScreen, &AvailFBArea); 
+-	    }
++	    xf86InitFBManager(pScreen, &AvailFBArea); 
+ 	}
+ 	if (cPtr->Flags & ChipsAccelSupport) {
+ 	    if (IS_HiQV(cPtr)) {
+@@ -4425,16 +4328,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+     if (!miCreateDefColormap(pScreen))
+ 	return FALSE;
+     
+-    if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) {
+-	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette,
+-		NULL, CMAP_RELOAD_ON_MODE_SWITCH))
+-	    return FALSE;
+-    } else {
+-	if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
++    if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits,
+ 		(pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette),
+ 		NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
+-	    return FALSE;
+-    }
++	return FALSE;
+     
+ #ifndef XSERVER_LIBPCIACCESS
+     racflag = RAC_COLORMAP;
+@@ -4448,8 +4345,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	xf86SetSilkenMouse(pScreen);
+ #endif
+ 
+-	if ((!(cPtr->Flags & ChipsOverlay8plus16)) 
+-	    && (cPtr->Flags & ChipsVideoSupport)
++	if ((cPtr->Flags & ChipsVideoSupport)
+ 	    && (cPtr->Flags & ChipsLinearSupport)) {
+ 	    CHIPSInitVideo(pScreen);
+     }
+@@ -4522,10 +4418,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ 	Base >>= 3;
+ 	break;
+     case 16:
+-	if (!(cPtr->Flags & ChipsOverlay8plus16))
+-	   Base >>= 1;
+-	else
+-	   Base >>= 2;
++	Base >>= 1;
+ 	break;
+     case 24:
+ 	if (!IS_HiQV(cPtr))
+@@ -4581,14 +4474,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags)
+ 	cPtr->writeMSS(cPtr, hwp, MSS);
+     }
+ 
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	Base = (Base << 3) & ~(unsigned long)0xF;
+-
+-	cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8);
+-	cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF);
+-	cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF);
+-    }
+-
+ }
+ 
+ /* Mandatory */
+@@ -4652,13 +4537,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
+     ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+     CHIPSPtr cPtr = CHIPSPTR(pScrn);
+ 
+-    if (flags & MODECHECK_FINAL) {
+-    /* Don't subtract FrambufferSize here as it should be subtracted already */
+-    if ((cPtr->Flags & ChipsOverlay8plus16) 
+-      && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY 
+-	  < 0))
+-	return MODE_MEM;
+-    }
+     /* The tests here need to be expanded */
+     if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD))
+ 	return MODE_NO_INTERLACE;
+@@ -5544,12 +5422,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     } else {
+ 	ChipsStd->Attribute[0x10] = 0x01;   /* mode */
+     }
+-    if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) {
+-	/* Make sure that the overlay isn't visible in the overscan region */
+-	if (ChipsStd->Attribute[0x11] == pScrn->colorKey)
+-	    ChipsStd->Attribute[0x11] = pScrn->colorKey - 1;
+-    } else
+-	ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
++    ChipsStd->Attribute[0x11] = 0x00;   /* overscan (border) color */
+     ChipsStd->Attribute[0x12] = 0x0F;   /* enable all color planes */
+     ChipsStd->Attribute[0x13] = 0x00;   /* horiz pixel panning 0 */
+ 
+@@ -5558,8 +5431,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     /* set virtual screen width */
+     tmp = pScrn->displayWidth >> 3;
+     if (pScrn->bitsPerPixel == 16) {
+-	if (!(cPtr->Flags & ChipsOverlay8plus16))
+-	    tmp <<= 1;		       /* double the width of the buffer */
++	tmp <<= 1;		       /* double the width of the buffer */
+     } else if (pScrn->bitsPerPixel == 24) {
+ 	tmp += tmp << 1;
+     } else if (pScrn->bitsPerPixel == 32) {
+@@ -5688,8 +5560,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 
+     /* centering/stretching */
+     if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) {
+-	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) ||
+-	(cPtr->Flags & ChipsOverlay8plus16)) {
++	if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) {
+ 	    ChipsNew->FR[0x40] &= 0xDF;    /* Disable Horizontal stretching */
+ 	    ChipsNew->FR[0x48] &= 0xFB;    /* Disable vertical stretching */
+ 	    ChipsNew->XR[0xA0] = 0x10;     /* Disable cursor stretching */
+@@ -5709,8 +5580,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 	}
+     }
+ 
+-    if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE))
+-		|| (cPtr->Flags & ChipsOverlay8plus16)) {
++    if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) {
+ 	ChipsNew->FR[0x40] |= 0x3;    /* Enable Horizontal centering */
+ 	ChipsNew->FR[0x48] |= 0x3;    /* Enable Vertical centering */
+     } else {
+@@ -5723,8 +5593,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+ 	ChipsNew->XR[0x82] |=0x02;
+ 
+     /* software mode flag */
+-    ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ?
+-	8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
++    ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ?
+ 	min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) :
+ 	mode->CrtcHDisplay, mode->CrtcVDisplay);
+ #ifdef DEBUG
+@@ -5762,7 +5631,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     	}
+     }	    
+     /* bpp depend */
+-    if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) {
++    if (pScrn->bitsPerPixel == 16) {
+ 	ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4;
+ 	if (cPtr->Flags & ChipsGammaSupport)
+ 	    ChipsNew->XR[0x82] |= 0x0C;
+@@ -5915,60 +5784,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode)
+     /* Turn off multimedia by default as it degrades performance */
+     ChipsNew->XR[0xD0] &= 0x0f;	 
+     
+-    /* Setup the video/overlay */
+-    if (cPtr->Flags & ChipsOverlay8plus16) {
+-	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
+-#ifdef SAR04
+-	ChipsNew->XR[0x4F] = 0x2A;	/* SAR04 >352 pixel overlay width */
+-#endif
+-	ChipsNew->MR[0x1E] &= 0xE0;	/* Set Zoom and Direction */
+-	if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE))
+-	    ChipsNew->MR[0x1E] |= 0x10;	/* Interlace */
+-	ChipsNew->MR[0x1F] &= 0x14;	/* Mask reserved bits */
+-	ChipsNew->MR[0x1F] |= 0x08;	/* RGB 16bpp */
+-	if (pScrn->weight.green == 5)
+-	    ChipsNew->MR[0x1F] |= 0x01;	/* RGB 15bpp */
+-
+-	ChipsNew->MR[0x20] &= 0x03;	/* Mask reserved bits */
+-	ChipsNew->MR[0x20] |= 0x80;	/* Auto Centre, Use mem ptr1 */
+-	ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 1 */
+-	ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF;
+-	ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF;
+-	ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8;	/* Setup Pointer 2 */
+-	ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF;
+-	ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF;
+-	ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ 
+-	ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1;
+-
+-	/* Left Edge of Overlay */
+-	ChipsNew->MR[0x2A] = cPtr->OverlaySkewX;
+-	ChipsNew->MR[0x2B] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7);
+-	/* Right Edge of Overlay */
+-	ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - 
+-							1) & 0xFF;
+-	ChipsNew->MR[0x2D] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth -
+-							1) >> 8) & 0x07;
+-	/* Top Edge of Overlay */
+-	ChipsNew->MR[0x2E] = cPtr->OverlaySkewY;
+-	ChipsNew->MR[0x2F] &= 0xF8;
+-	ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7);
+-	/* Bottom Edge of Overlay*/
+-	ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF;
+-	ChipsNew->MR[0x31] &= 0xF8;	/* Mask reserved bits */
+-	ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - 
+-							1 ) >> 8) & 0x07;
+-
+-	ChipsNew->MR[0x3C] &= 0x18;	/* Mask reserved bits */
+-	ChipsNew->MR[0x3C] |= 0x07;	/* Enable keyed overlay window */
+-	ChipsNew->MR[0x3D] = 0x00;
+-	ChipsNew->MR[0x3E] = 0x00;
+-	ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */
+-	ChipsNew->MR[0x40] = 0xFF;
+-	ChipsNew->MR[0x41] = 0xFF;
+-	ChipsNew->MR[0x42] = 0x00;
+-    } else if (cPtr->Flags & ChipsVideoSupport) {
++    if (cPtr->Flags & ChipsVideoSupport) {
+ #if 0   /* if we do this even though video isn't playing we kill performance */
+ 	ChipsNew->XR[0xD0] |= 0x10;	/* Force the Multimedia engine on */
+ #endif
+@@ -6877,8 +6693,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs)
+ 	}
+ 
+ 	/* Set SAR04 multimedia register correctly */
+-	if ((cPtr->Flags & ChipsOverlay8plus16)
+-	    || (cPtr->Flags & ChipsVideoSupport)) {
++	if ((cPtr->Flags & ChipsVideoSupport)) {
+ #ifdef SAR04
+ 	    cPtr->writeXR(cPtr, 0x4E, 0x04);
+ 	    if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F])
+diff --git a/src/ct_driver.h b/src/ct_driver.h
+index d8ce228..9033867 100644
+--- a/src/ct_driver.h
++++ b/src/ct_driver.h
+@@ -114,7 +114,6 @@ typedef struct {
+ /* Options flags for the C&T chipsets */
+ #define ChipsHWCursor		0x00001000
+ #define ChipsShadowFB		0x00002000
+-#define ChipsOverlay8plus16	0x00004000
+ #define ChipsUseNewFB		0x00008000
+ 
+ /* Architecture type flags */
+@@ -272,11 +271,13 @@ typedef struct {
+ 
+ typedef struct _CHIPSRec {
+     pciVideoPtr		PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+     PCITAG		PciTag;
++#endif
+     int			Chipset;
+     EntityInfoPtr       pEnt;
+-    IOADDRESS		PIOBase;
+-    CARD32		IOAddress;
++    unsigned long	PIOBase;
++    unsigned long	IOAddress;
+     unsigned long	FbAddress;
+     unsigned int	IOBase;
+     unsigned char *	FbBase;
+diff --git a/src/ct_video.c b/src/ct_video.c
+index a68acb9..c9e5bb4 100644
+--- a/src/ct_video.c
++++ b/src/ct_video.c
+@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen)
+     CHIPSPtr cPtr = CHIPSPTR(pScrn);
+     int num_adaptors;
+ 	
+-    if (!(cPtr->Flags & ChipsOverlay8plus16) &&
+-       (cPtr->Flags & ChipsVideoSupport)) {
++    if ((cPtr->Flags & ChipsVideoSupport)) {
+ 	newAdaptor = CHIPSSetupImageVideo(pScreen);
+ 	CHIPSInitOffscreenImages(pScreen);
+     }
+diff --git a/util/dRegs.c b/util/dRegs.c
+index b7edc8f..0d2f0cb 100644
+--- a/util/dRegs.c
++++ b/util/dRegs.c
+@@ -1,63 +1,8 @@
+-
+-
+-
+-
+-
+-
+-#ifdef __NetBSD__
+-#  include <sys/types.h>
+-#  include <machine/pio.h>
+-#  include <machine/sysarch.h>
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    include <sys/types.h>
+-#    ifdef NCR
+-       /* broken NCR <sys/sysi86.h> */
+-#      define __STDC
+-#      include <sys/sysi86.h>
+-#      undef __STDC
+-#    else
+-#      include <sys/sysi86.h>
+-#    endif
+-#    ifdef SVR4
+-#      if !defined(sun)
+-#        include <sys/seg.h>
+-#      endif
+-#    endif
+-#    include <sys/v86.h>
+-#    if defined(sun)
+-#      include <sys/psw.h>
+-#    endif
+-#  endif
+-#  include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#ifdef __NetBSD__
+-#  define SET_IOPL() i386_iopl(3)
+-#  define RESET_IOPL() i386_iopl(0)
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    ifndef SI86IOPL
+-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-#    else
+-#      define SET_IOPL() sysi86(SI86IOPL,3)
+-#      define RESET_IOPL() sysi86(SI86IOPL,0)
+-#    endif
+-#  else
+-#    ifdef linux
+-#      define SET_IOPL() iopl(3)
+-#      define RESET_IOPL() iopl(0)
+-#    else
+-#      define SET_IOPL() (void)0
+-#      define RESET_IOPL() (void)0
+-#    endif
+-#  endif
+-#endif
++#include "iopl.h"
+ 
+ int main(void)
+ {
+diff --git a/util/iopl.h b/util/iopl.h
+new file mode 100644
+index 0000000..e08207c
+--- /dev/null
++++ b/util/iopl.h
+@@ -0,0 +1,60 @@
++#ifdef __NetBSD__
++#  include <sys/types.h>
++#  include <machine/pio.h>
++#  include <machine/sysarch.h>
++#else
++#  if defined(__linux__)
++/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
++ * #    include <sys/io.h>
++ */
++int iopl(int level);
++#  endif
++#  if defined(SVR4) && defined(i386)
++#    include <sys/types.h>
++#    ifdef NCR
++       /* broken NCR <sys/sysi86.h> */
++#      define __STDC
++#      include <sys/sysi86.h>
++#      undef __STDC
++#    else
++#      include <sys/sysi86.h>
++#    endif
++#    ifdef SVR4
++#      if !defined(sun)
++#        include <sys/seg.h>
++#      endif
++#    endif
++#    include <sys/v86.h>
++#    if defined(sun)
++#      include <sys/psw.h>
++#    endif
++#  endif
++#  include "AsmMacros.h"
++#endif /* NetBSD */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __NetBSD__
++#  define SET_IOPL() i386_iopl(3)
++#  define RESET_IOPL() i386_iopl(0)
++#else
++#  if defined(SVR4) && defined(i386)
++#    ifndef SI86IOPL
++#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
++#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
++#    else
++#      define SET_IOPL() sysi86(SI86IOPL,3)
++#      define RESET_IOPL() sysi86(SI86IOPL,0)
++#    endif
++#  else
++#    ifdef linux
++#      define SET_IOPL() iopl(3)
++#      define RESET_IOPL() iopl(0)
++#    else
++#      define SET_IOPL() (void)0
++#      define RESET_IOPL() (void)0
++#    endif
++#  endif
++#endif
+diff --git a/util/mRegs.c b/util/mRegs.c
+index f359738..843d01d 100644
+--- a/util/mRegs.c
++++ b/util/mRegs.c
+@@ -1,63 +1,8 @@
+-
+-
+-
+-
+-
+-
+-#ifdef __NetBSD__
+-#  include <sys/types.h>
+-#  include <machine/pio.h>
+-#  include <machine/sysarch.h>
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    include <sys/types.h>
+-#    ifdef NCR
+-       /* broken NCR <sys/sysi86.h> */
+-#      define __STDC
+-#      include <sys/sysi86.h>
+-#      undef __STDC
+-#    else
+-#      include <sys/sysi86.h>
+-#    endif
+-#    ifdef SVR4
+-#      if !defined(sun)
+-#        include <sys/seg.h>
+-#      endif
+-#    endif
+-#    include <sys/v86.h>
+-#    if defined(sun)
+-#      include <sys/psw.h>
+-#    endif
+-#  endif
+-#  include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+-#ifdef __NetBSD__
+-#  define SET_IOPL() i386_iopl(3)
+-#  define RESET_IOPL() i386_iopl(0)
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    ifndef SI86IOPL
+-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-#    else
+-#      define SET_IOPL() sysi86(SI86IOPL,3)
+-#      define RESET_IOPL() sysi86(SI86IOPL,0)
+-#    endif
+-#  else
+-#    ifdef linux
+-#      define SET_IOPL() iopl(3)
+-#      define RESET_IOPL() iopl(0)
+-#    else
+-#      define SET_IOPL() (void)0
+-#      define RESET_IOPL() (void)0
+-#    endif
+-#  endif
+-#endif
++#include "iopl.h"
+ 
+ int hex2int(char* str);
+ 
+diff --git a/util/modClock.c b/util/modClock.c
+index 89a291a..45af19b 100644
+--- a/util/modClock.c
++++ b/util/modClock.c
+@@ -1,61 +1,12 @@
+-
+-#ifdef __NetBSD__
+-#  include <sys/types.h>
+-#  include <machine/pio.h>
+-#  include <machine/sysarch.h>
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    include <sys/types.h>
+-#    ifdef NCR
+-       /* broken NCR <sys/sysi86.h> */
+-#      define __STDC
+-#      include <sys/sysi86.h>
+-#      undef __STDC
+-#    else
+-#      include <sys/sysi86.h>
+-#    endif
+-#    ifdef SVR4
+-#      if !defined(sun)
+-#        include <sys/seg.h>
+-#      endif
+-#    endif
+-#    include <sys/v86.h>
+-#    if defined(sun)
+-#      include <sys/psw.h>
+-#    endif
+-#  endif
+-#  include "AsmMacros.h"
+-#endif /* NetBSD */
+-
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++
+ #ifndef Lynx
+ #include <fnmatch.h>
+ #endif
+ 
+-#ifdef __NetBSD__
+-#  define SET_IOPL() i386_iopl(3)
+-#  define RESET_IOPL() i386_iopl(0)
+-#else
+-#  if defined(SVR4) && defined(i386)
+-#    ifndef SI86IOPL
+-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
+-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
+-#    else
+-#      define SET_IOPL() sysi86(SI86IOPL,3)
+-#      define RESET_IOPL() sysi86(SI86IOPL,0)
+-#    endif
+-#  else
+-#    ifdef linux
+-#      define SET_IOPL() iopl(3)
+-#      define RESET_IOPL() iopl(0)
+-#    else
+-#      define SET_IOPL() (void)0
+-#      define RESET_IOPL() (void)0
+-#    endif
+-#  endif
+-#endif
++#include "iopl.h"
+ 
+ #define tolerance 0.01 /* +/- 1% */
+ 
diff --git a/main/xf86-video-cirrus/APKBUILD b/main/xf86-video-cirrus/APKBUILD
index beb1501d1..1b0504f0b 100644
--- a/main/xf86-video-cirrus/APKBUILD
+++ b/main/xf86-video-cirrus/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-cirrus
-pkgver=1.3.2
-pkgrel=6
+pkgver=1.4.0
+pkgrel=0
 pkgdesc="Cirrus Logic video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -36,5 +36,5 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="8195d03ed0be0975c03441e66a9f53b3  xf86-video-cirrus-1.3.2.tar.bz2
+md5sums="1e449789da866f974dbf6cbe3c8cc7bf  xf86-video-cirrus-1.4.0.tar.bz2
 b3bd556766fcd0fee51ae0c286f75f05  qemu.patch"
diff --git a/main/xf86-video-dummy/APKBUILD b/main/xf86-video-dummy/APKBUILD
index 4b9e05143..7fec2164a 100644
--- a/main/xf86-video-dummy/APKBUILD
+++ b/main/xf86-video-dummy/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-dummy
-pkgver=0.3.4
-pkgrel=3
+pkgver=0.3.5
+pkgrel=0
 pkgdesc="X.Org driver for dummy cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="1cf99415c998994f2e88575f942b364c  xf86-video-dummy-0.3.4.tar.bz2"
+md5sums="89701f372eed9ed541cf00d57c78e7ef  xf86-video-dummy-0.3.5.tar.bz2"
diff --git a/main/xf86-video-fbdev/APKBUILD b/main/xf86-video-fbdev/APKBUILD
index b930003a4..4472b554e 100644
--- a/main/xf86-video-fbdev/APKBUILD
+++ b/main/xf86-video-fbdev/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-fbdev
 pkgver=0.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc="video driver for framebuffer device"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-geode/APKBUILD b/main/xf86-video-geode/APKBUILD
index e183d90ae..77afeb6fd 100644
--- a/main/xf86-video-geode/APKBUILD
+++ b/main/xf86-video-geode/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-geode
-pkgver=2.11.12
-pkgrel=2
+pkgver=2.11.13
+pkgrel=0
 pkgdesc="AMD Geode GX and LX video driver"
 url="http://xorg.freedesktop.org/"
 arch="x86"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="a99c521db731c2f1df309057a8465e4c  xf86-video-geode-2.11.12.tar.bz2"
+md5sums="0c5a3cac3531aec0eae7f5f6b3212eb4  xf86-video-geode-2.11.13.tar.bz2"
diff --git a/main/xf86-video-glint/APKBUILD b/main/xf86-video-glint/APKBUILD
index 575b2cc10..fa8621369 100644
--- a/main/xf86-video-glint/APKBUILD
+++ b/main/xf86-video-glint/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-glint
-pkgver=1.2.6
-pkgrel=1
+pkgver=1.2.7
+pkgrel=0
 pkgdesc="GLINT/Permedia video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -27,4 +27,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="a8458d1b6331c142c8377298c6fecddd  xf86-video-glint-1.2.6.tar.bz2"
+md5sums="c4edb998485020debffeafc491ea759e  xf86-video-glint-1.2.7.tar.bz2"
diff --git a/main/xf86-video-i128/APKBUILD b/main/xf86-video-i128/APKBUILD
index 72d313277..f6a5af0b9 100644
--- a/main/xf86-video-i128/APKBUILD
+++ b/main/xf86-video-i128/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i128
-pkgver=1.3.4
-pkgrel=2
+pkgver=1.3.5
+pkgrel=0
 pkgdesc="Number 9 I128 video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="103316abb2dc466219c027afc5a71691  xf86-video-i128-1.3.4.tar.bz2"
+md5sums="392c4ffd3c752af6f92e71e1efd68c66  xf86-video-i128-1.3.5.tar.bz2"
diff --git a/main/xf86-video-i740/APKBUILD b/main/xf86-video-i740/APKBUILD
index 22434a5bf..907d9ef09 100644
--- a/main/xf86-video-i740/APKBUILD
+++ b/main/xf86-video-i740/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-i740
 pkgver=1.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="Intel i740 video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-intel/APKBUILD b/main/xf86-video-intel/APKBUILD
index 5b7fd6306..2cb874530 100644
--- a/main/xf86-video-intel/APKBUILD
+++ b/main/xf86-video-intel/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-intel
-pkgver=2.17.0
-pkgrel=1
+pkgver=2.18.0
+pkgrel=0
 pkgdesc="X.Org driver for Intel cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -29,4 +29,4 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="6d7b1f199dba5820f250888b136186ff  xf86-video-intel-2.17.0.tar.bz2"
+md5sums="34f3987ffe86e30c57abc33b7f8030e9  xf86-video-intel-2.18.0.tar.bz2"
diff --git a/main/xf86-video-mach64/APKBUILD b/main/xf86-video-mach64/APKBUILD
index c809ad3d7..d490efd81 100644
--- a/main/xf86-video-mach64/APKBUILD
+++ b/main/xf86-video-mach64/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-mach64
-pkgver=6.9.0
-pkgrel=2
+pkgver=6.9.1
+pkgrel=0
 pkgdesc="ATI Mach64 video driver"
 url="http://xorg.freedesktop.org/"
 arch=""
@@ -28,4 +28,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="ae62936e11af4fc0fac9f2db601a844f  xf86-video-mach64-6.9.0.tar.bz2"
+md5sums="8484c18f08e77564a56ccbf226694038  xf86-video-mach64-6.9.1.tar.bz2"
diff --git a/main/xf86-video-newport/APKBUILD b/main/xf86-video-newport/APKBUILD
index 6bd08b5c1..3da4088cf 100644
--- a/main/xf86-video-newport/APKBUILD
+++ b/main/xf86-video-newport/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-newport
 pkgver=0.2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Newport video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-nouveau/APKBUILD b/main/xf86-video-nouveau/APKBUILD
index 6ec795b75..625cbb4d5 100644
--- a/main/xf86-video-nouveau/APKBUILD
+++ b/main/xf86-video-nouveau/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=xf86-video-nouveau
 _gitdate=20111010
 pkgver=0.0.16_git20120106
-pkgrel=0
+pkgrel=1
 pkgdesc="Open-source X.org drivers for nVidia video cards"
 url="http://nouveau.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-nv/APKBUILD b/main/xf86-video-nv/APKBUILD
index 768e00aea..dff40b1af 100644
--- a/main/xf86-video-nv/APKBUILD
+++ b/main/xf86-video-nv/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-nv
 pkgver=2.1.18
-pkgrel=2
+pkgrel=3
 pkgdesc="Nvidia video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-openchrome/APKBUILD b/main/xf86-video-openchrome/APKBUILD
index a4387df67..a9bcc1a37 100644
--- a/main/xf86-video-openchrome/APKBUILD
+++ b/main/xf86-video-openchrome/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-openchrome
 pkgver=0.2.905
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org driver for VIA/S3G cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-r128/APKBUILD b/main/xf86-video-r128/APKBUILD
index fbcf87066..774b722fb 100644
--- a/main/xf86-video-r128/APKBUILD
+++ b/main/xf86-video-r128/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-r128
-pkgver=6.8.1
-pkgrel=8
+pkgver=6.8.2
+pkgrel=0
 pkgdesc="ATI Rage128 video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 subpackages="$pkgname-doc"
-depends="mesa-dri-r128"
+depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto xineramaproto libdrm-dev xf86driproto glproto
 	mesa-dev expat-dev
@@ -30,4 +30,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="2b90854a62a4d45d652062f582dc8d13  xf86-video-r128-6.8.1.tar.bz2"
+md5sums="31e0358b5d1189e3f30f5b11e9b86865  xf86-video-r128-6.8.2.tar.bz2"
diff --git a/main/xf86-video-radeonhd/APKBUILD b/main/xf86-video-radeonhd/APKBUILD
index 5c3ed7e98..2e903d2c7 100644
--- a/main/xf86-video-radeonhd/APKBUILD
+++ b/main/xf86-video-radeonhd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-radeonhd
 pkgver=1.3.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Experimental Radeon HD video driver."
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-rendition/APKBUILD b/main/xf86-video-rendition/APKBUILD
index 4d996b960..9fad41311 100644
--- a/main/xf86-video-rendition/APKBUILD
+++ b/main/xf86-video-rendition/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-rendition
 pkgver=4.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Rendition video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,7 +11,17 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	rendition-4.2.4-git.patch"
+
+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
+}
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -26,4 +36,5 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="75cc28125077acb7344955294545553b  xf86-video-rendition-4.2.4.tar.bz2"
+md5sums="75cc28125077acb7344955294545553b  xf86-video-rendition-4.2.4.tar.bz2
+817a3bcfb4d5bb187bf2b2723febb0c1  rendition-4.2.4-git.patch"
diff --git a/main/xf86-video-rendition/rendition-4.2.4-git.patch b/main/xf86-video-rendition/rendition-4.2.4-git.patch
new file mode 100644
index 000000000..26cff2fd3
--- /dev/null
+++ b/main/xf86-video-rendition/rendition-4.2.4-git.patch
@@ -0,0 +1,809 @@
+diff --git a/configure.ac b/configure.ac
+index 5091e50..f74b912 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,45 +20,45 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-rendition],
+-        4.2.4,
++        [4.2.4],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-        xf86-video-rendition)
+-
++        [xf86-video-rendition])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+-XORG_MACROS_VERSION(1.3)
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir,
+-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
++            AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+ 
+ # Checks for libraries.
+@@ -78,17 +78,16 @@ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+ # Checks for header files.
+-AC_HEADER_STDC
+ AC_CHECK_HEADERS([elf.h] [elf_abi.h])
+ 
+-AC_SUBST([XORG_CFLAGS])
+ AC_SUBST([moduledir])
+ 
+ DRIVER_NAME=rendition
+ AC_SUBST([DRIVER_NAME])
+ 
+-AC_OUTPUT([
+-	Makefile
+-	src/Makefile
+-	man/Makefile
++AC_CONFIG_FILES([
++                Makefile
++                src/Makefile
++                man/Makefile
+ ])
++AC_OUTPUT
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 8f2454b..b3688ce 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+-
+-# Strings to replace in man pages
+-XORGRELSTRING = @PACKAGE_STRING@
+-  XORGMANNAME = X Version 11
+-
+-MAN_SUBSTS = \
+-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xservername__|Xorg|g' \
+-	-e 's|__xconfigfile__|xorg.conf|g' \
+-	-e 's|__projectroot__|$(prefix)|g' \
+-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
++
++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
++
+ 
+ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+-	sed $(MAN_SUBSTS) < $< > $@
++	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+diff --git a/man/rendition.man b/man/rendition.man
+index 3658ab0..afeee91 100644
+--- a/man/rendition.man
++++ b/man/rendition.man
+@@ -1,4 +1,3 @@
+-.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $ 
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH RENDITION __drivermansuffix__ __vendorversion__
+diff --git a/src/accelX.c b/src/accelX.c
+index a499c56..ed4964e 100644
+--- a/src/accelX.c
++++ b/src/accelX.c
+@@ -289,7 +289,7 @@ int
+ RENDITIONInitUcode(ScrnInfoPtr pScreenInfo)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob = pRendition->board.io_base;
++    unsigned long iob = pRendition->board.io_base;
+ 
+     if (0 == verite_getstride(pScreenInfo, NULL,
+ 			 &pRendition->board.mode.stride0, 
+@@ -367,7 +367,7 @@ void
+ RENDITIONRestoreUcode(ScrnInfoPtr pScreenInfo)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob = pRendition->board.io_base;
++    unsigned long iob = pRendition->board.io_base;
+ 
+     vu8 memend;
+ 
+@@ -410,7 +410,7 @@ void
+ RENDITIONSaveUcode(ScrnInfoPtr pScreenInfo)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob = pRendition->board.io_base;
++    unsigned long iob = pRendition->board.io_base;
+     vu8 memend;
+ 
+ #ifdef DEBUG
+@@ -445,7 +445,7 @@ void
+ RENDITIONSyncV1000(ScrnInfoPtr pScreenInfo)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob = pRendition->board.io_base;
++    unsigned long iob = pRendition->board.io_base;
+ 
+     int c;
+ 
+@@ -555,7 +555,7 @@ RENDITIONSubsequentScreenToScreenCopy(ScrnInfoPtr pScreenInfo,
+ 					   int w, int h)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob = pRendition->board.io_base;
++    unsigned long iob = pRendition->board.io_base;
+ 
+ 
+ #ifdef DEBUG
+@@ -607,7 +607,7 @@ RENDITIONSubsequentSolidFillRect(ScrnInfoPtr pScreenInfo,
+ 				      int x, int y, int w, int h)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob = pRendition->board.io_base;
++    unsigned long iob = pRendition->board.io_base;
+ 
+ 
+ #ifdef DEBUG
+@@ -639,7 +639,7 @@ RENDITIONSubsequentTwoPointLine(ScrnInfoPtr pScreenInfo,
+ 				     int bias)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob = pRendition->board.io_base;
++    unsigned long iob = pRendition->board.io_base;
+ 
+ 
+ #ifdef DEBUG
+diff --git a/src/rendition.c b/src/rendition.c
+index 7a9e18b..3202b49 100644
+--- a/src/rendition.c
++++ b/src/rendition.c
+@@ -330,7 +330,7 @@ renditionProbe(DriverPtr drv, int flags)
+                     renditionChipsets, renditionPCIchipsets, 
+                     devSections, numDevSections, drv, &usedChips);
+ 
+-	xfree(devSections);
++	free(devSections);
+ 	if (numUsed <= 0)
+ 	    return FALSE;
+ 
+@@ -359,7 +359,7 @@ renditionProbe(DriverPtr drv, int flags)
+ 		foundScreen=TRUE;
+ 	    }
+         }
+-	xfree(usedChips);
++	free(usedChips);
+     }
+     return foundScreen;
+ }
+@@ -400,7 +400,7 @@ renditionGetRec(ScrnInfoPtr pScreenInfo)
+     sleep(1);
+ #endif
+     if (!pScreenInfo->driverPrivate)
+-        pScreenInfo->driverPrivate=xcalloc(sizeof(renditionRec), 1);
++        pScreenInfo->driverPrivate=calloc(sizeof(renditionRec), 1);
+ 
+     /* perhaps some initialization? <ml> */
+ 
+@@ -421,7 +421,7 @@ renditionFreeRec(ScrnInfoPtr pScreenInfo)
+ #endif
+     if (xf86LoaderCheckSymbol("vgaHWFreeHWRec"))
+ 	vgaHWFreeHWRec(pScreenInfo);
+-    xfree(pScreenInfo->driverPrivate);
++    free(pScreenInfo->driverPrivate);
+     pScreenInfo->driverPrivate=NULL;
+ 
+ #ifdef DEBUG
+@@ -596,7 +596,7 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
+     /* collect all of the options flags and process them */
+ 
+     xf86CollectOptions(pScreenInfo, NULL);
+-    if (!(pRendition->Options = xalloc(sizeof(renditionOptions))))
++    if (!(pRendition->Options = malloc(sizeof(renditionOptions))))
+ 	return FALSE;
+     memcpy(pRendition->Options, renditionOptions, sizeof(renditionOptions));
+     xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options, 
+@@ -663,7 +663,11 @@ renditionPreInit(ScrnInfoPtr pScreenInfo, int flags)
+     vgaHWGetIOBase(pvgaHW);             /* Get VGA I/O base */
+ 
+     pRendition->board.accel=0;
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+     pRendition->board.vgaio_base = pvgaHW->PIOOffset;
++#else
++    pRendition->board.vgaio_base = 0;
++#endif
+     pRendition->board.io_base = pRendition->board.vgaio_base 
+ #ifdef XSERVER_LIBPCIACCESS
+ 	+ pRendition->PciInfo->regions[1].base_addr;
+@@ -1167,7 +1171,7 @@ renditionScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 	pRendition->board.shadowPitch 
+ 	    = BitmapBytePad(pScreenInfo->bitsPerPixel * width);
+ 	pRendition->board.shadowPtr 
+-	    = xalloc(pRendition->board.shadowPitch * height);
++	    = malloc(pRendition->board.shadowPitch * height);
+ 	displayWidth = pRendition->board.shadowPitch 
+ 	    / (pScreenInfo->bitsPerPixel >> 3);
+ 	FBBase = pRendition->board.shadowPtr;
+@@ -1484,7 +1488,7 @@ static xf86MonPtr
+ renditionDDC (ScrnInfoPtr pScreenInfo)
+ {
+   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-  IOADDRESS iob=pRendition->board.io_base;
++  unsigned long iob=pRendition->board.io_base;
+   vu32 temp;
+ 
+   xf86MonPtr MonInfo = NULL;
+@@ -1517,7 +1521,7 @@ static unsigned int
+ renditionDDC1Read (ScrnInfoPtr pScreenInfo)
+ {
+   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-  IOADDRESS iob=pRendition->board.io_base;
++  unsigned long iob=pRendition->board.io_base;
+   vu32 value = 0;
+ 
+   /* wait for Vsync */
+diff --git a/src/v1krisc.c b/src/v1krisc.c
+index 2554263..9b7b4e2 100644
+--- a/src/v1krisc.c
++++ b/src/v1krisc.c
+@@ -83,20 +83,20 @@
+  * local function prototypes
+  */
+ 
+-static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask);
+-static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask);
++static void verite_iopoll(unsigned long port, vu32 data, vu32 mask);
++static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask);
+ 
+-static vu32 readRF(IOADDRESS io_base, vu8 index);
+-static void writeRF(IOADDRESS io_base, vu8 index, vu32 data);
++static vu32 readRF(unsigned long io_base, vu8 index);
++static void writeRF(unsigned long io_base, vu8 index, vu32 data);
+ 
+-static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type);
+-static void risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type);
++static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type);
++static void risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type);
+ 
+ #if 0
+-static void risc_step(IOADDRESS io_base, vu32 count);
++static void risc_step(unsigned long io_base, vu32 count);
+ #endif
+-static void risc_forcestep(IOADDRESS io_base, vu32 instruction);
+-static void risc_continue(IOADDRESS io_base);
++static void risc_forcestep(unsigned long io_base, vu32 instruction);
++static void risc_continue(unsigned long io_base);
+ 
+ 
+ 
+@@ -113,7 +113,7 @@ void
+ v1k_start(ScrnInfoPtr pScreenInfo, vu32 pc)
+ {
+   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-  IOADDRESS io_base=pRendition->board.io_base;
++  unsigned long io_base=pRendition->board.io_base;
+ 
+   v1k_stop(pScreenInfo);
+   risc_forcestep(io_base, NOP_INSTR);
+@@ -152,7 +152,7 @@ v1k_stop(ScrnInfoPtr pScreenInfo)
+ {
+   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+   vu8	debugreg, statusreg;
+-  IOADDRESS io_base=pRendition->board.io_base;
++  unsigned long io_base=pRendition->board.io_base;
+   vu16 STATUS = 0x4A;   /* v2x00 io register offset */
+   int c;
+ 
+@@ -207,7 +207,7 @@ v1k_flushicache(ScrnInfoPtr pScreenInfo)
+ {
+   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+   vu32 c, p1, p2;
+-  IOADDRESS io_base=pRendition->board.io_base;
++  unsigned long io_base=pRendition->board.io_base;
+ 
+   /* first flush store accumulation buffers so data is all in memory */
+   p1=risc_readmem(io_base, 0, READ_WORD);
+@@ -255,7 +255,7 @@ void
+ v1k_softreset(ScrnInfoPtr pScreenInfo)
+ {
+   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-  IOADDRESS io_base=pRendition->board.io_base;
++  unsigned long io_base=pRendition->board.io_base;
+ 
+   verite_out8(io_base+DEBUGREG, SOFTRESET|HOLDRISC);
+   verite_out8(io_base+STATEINDEX, STATEINDEX_PC);
+@@ -300,12 +300,12 @@ v1k_getriscprocs(verite_board_desc *boardDesc)
+  */
+ 
+ /* 
+- * static void verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
++ * static void verite_iopoll(unsigned long port, vu32 data, vu32 mask)
+  *
+  * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
+  */
+ static void
+-verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
++verite_iopoll(unsigned long port, vu32 data, vu32 mask)
+ {
+   vu32 c;
+ 
+@@ -320,12 +320,12 @@ verite_iopoll(IOADDRESS port, vu32 data, vu32 mask)
+ 
+ 
+ /* 
+- * static void verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
++ * static void verite_iopoll8(unsigned long port, vu8 data, vu8 mask)
+  *
+  * Loop on IO read until expected data is read or VERITE_MAX_POLLS is reached.
+  */
+ static void
+-verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
++verite_iopoll8(unsigned long port, vu8 data, vu8 mask)
+ {
+   vu32 c;
+ 
+@@ -340,12 +340,12 @@ verite_iopoll8(IOADDRESS port, vu8 data, vu8 mask)
+ 
+ 
+ /*
+- * static vu32 readRF(IOADDRESS io_base, vu8 index)
++ * static vu32 readRF(unsigned long io_base, vu8 index)
+  *
+  * Reads data from register file.
+  */
+ static vu32
+-readRF(IOADDRESS io_base, vu8 index)
++readRF(unsigned long io_base, vu8 index)
+ {
+   vu32 data, instr;
+   vu8 debug, stateindex;
+@@ -378,12 +378,12 @@ readRF(IOADDRESS io_base, vu8 index)
+ 
+ 
+ /*
+- * static void writeRF(IOADDRESS io_base, vu8 index, vu32 data)
++ * static void writeRF(unsigned long io_base, vu8 index, vu32 data)
+  *
+  * Set RF register, being careful on how to set regs below 64.
+  */
+ static void
+-writeRF(IOADDRESS io_base, vu8 index, vu32 data)
++writeRF(unsigned long io_base, vu8 index, vu32 data)
+ {
+   vu8 special=0;
+ 
+@@ -417,12 +417,12 @@ writeRF(IOADDRESS io_base, vu8 index, vu32 data)
+ 
+ 
+ /*
+- * static vu32 risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
++ * static vu32 risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type)
+  *
+  * NOTE: Assumes RISC is in hold mode.
+  */
+ static vu32
+-risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
++risc_readmem(unsigned long io_base, vu32 addr, vu8 read_type)
+ {
+   vu32 data;
+ 
+@@ -445,12 +445,12 @@ risc_readmem(IOADDRESS io_base, vu32 addr, vu8 read_type)
+ 
+ 
+ /*
+- * static vu32 risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
++ * static vu32 risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type)
+  *
+  * NOTE: Assumes RISC is in hold mode.
+  */
+ static void
+-risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
++risc_writemem(unsigned long io_base, vu32 addr, vu32 data, vu8 write_type)
+ {
+   writeRF(io_base, RISC_RA, addr);          /* point to memory */
+   writeRF(io_base, RISC_FP, data);          /* set data */
+@@ -466,12 +466,12 @@ risc_writemem(IOADDRESS io_base, vu32 addr, vu32 data, vu8 write_type)
+ 
+ #if 0
+ /*
+- * static void risc_step(IOADDRESS io_base, vu32 count)
++ * static void risc_step(unsigned long io_base, vu32 count)
+  *
+  * Single step the RISC. NOTE: Do not force instruction into RISCIR!
+  */
+ static void
+-risc_step(IOADDRESS io_base, vu32 count)
++risc_step(unsigned long io_base, vu32 count)
+ {
+   vu32 c, d;
+   vu8 debugreg;
+@@ -494,12 +494,12 @@ risc_step(IOADDRESS io_base, vu32 count)
+ 
+ 
+ /*
+- * static void risc_forcestep(IOADDRESS io_base, vu32 instruction)
++ * static void risc_forcestep(unsigned long io_base, vu32 instruction)
+  *
+  * Single step RISC; force instruction; assumes RISC held.
+  */
+ static void
+-risc_forcestep(IOADDRESS io_base, vu32 instruction)
++risc_forcestep(unsigned long io_base, vu32 instruction)
+ {
+   vu32 c;
+   vu8 debugreg, stateindex;
+@@ -525,12 +525,12 @@ risc_forcestep(IOADDRESS io_base, vu32 instruction)
+ 
+ 
+ /*
+- * static void risc_continue(IOADDRESS io_base)
++ * static void risc_continue(unsigned long io_base)
+  *
+  * Turn off hold bit.    
+  */
+ static void
+-risc_continue(IOADDRESS io_base)
++risc_continue(unsigned long io_base)
+ {
+   vu8 debugreg;
+ 
+diff --git a/src/vboard.c b/src/vboard.c
+index 49499e2..622715f 100644
+--- a/src/vboard.c
++++ b/src/vboard.c
+@@ -38,7 +38,7 @@ verite_initboard(ScrnInfoPtr pScreenInfo)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+ 
+-    IOADDRESS iob=pRendition->board.io_base;
++    unsigned long iob=pRendition->board.io_base;
+     vu8 *vmb;
+     vu32 offset;
+     vu8 memendian;
+@@ -207,7 +207,7 @@ void
+ verite_check_csucode(ScrnInfoPtr pScreenInfo)
+ {
+   renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-  IOADDRESS iob=pRendition->board.io_base;
++  unsigned long iob=pRendition->board.io_base;
+   vu8 *vmb;
+   vu32 offset;
+   int c;
+diff --git a/src/vgafont-std.data b/src/vgafont-std.data
+index db63ea8..c47983f 100644
+--- a/src/vgafont-std.data
++++ b/src/vgafont-std.data
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-std.data,v 1.3 1999/10/13 04:21:22 dawes Exp $ */
+ #ifndef __VGAFONT_STD__
+ #define __VGAFONT_STD__
+ 
+diff --git a/src/vgafont-vrx.data b/src/vgafont-vrx.data
+index ad34582..23b5908 100644
+--- a/src/vgafont-vrx.data
++++ b/src/vgafont-vrx.data
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgafont-vrx.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
+ #ifndef __VGAFONT_VRX__
+ #define __VGAFONT_VRX__
+ 
+diff --git a/src/vgapalette.data b/src/vgapalette.data
+index 5267608..106028d 100644
+--- a/src/vgapalette.data
++++ b/src/vgapalette.data
+@@ -1,4 +1,3 @@
+-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vgapalette.data,v 1.3 1999/10/13 04:21:23 dawes Exp $ */
+ #ifndef __VGAPALETTE__
+ #define __VGAPALETTE__
+ 
+diff --git a/src/vloaduc.c b/src/vloaduc.c
+index 67bf901..5c6aab0 100644
+--- a/src/vloaduc.c
++++ b/src/vloaduc.c
+@@ -103,7 +103,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
+   sz=SW16(ehdr.e_phentsize);
+   num=SW16(ehdr.e_phnum);
+   if (0!=sz && 0!=num) {
+-	orig_pphdr=pphdr=(Elf32_Phdr *)xalloc(sz*num);
++	orig_pphdr=pphdr=(Elf32_Phdr *)malloc(sz*num);
+ 	if (!pphdr) {
+ 	  ErrorF("RENDITION: Cannot allocate global memory (1)\n"); 
+ 	  close(fd);
+@@ -125,7 +125,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
+     sz=SW16(ehdr.e_shentsize);
+     num=SW16(ehdr.e_shnum);
+     if (0!=sz && 0!=num) {
+-      orig_pshdr=pshdr=(Elf32_Shdr *)xalloc(sz*num);
++      orig_pshdr=pshdr=(Elf32_Shdr *)malloc(sz*num);
+       if (!pshdr) {
+         ErrorF("RENDITION: Cannot allocate global memory (2)\n"); 
+         close(fd);
+@@ -148,7 +148,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
+         loadSegment2board(pScreenInfo, fd, pphdr);
+         pphdr=(Elf32_Phdr *)(((char *)pphdr)+sz);
+       } while (--num);
+-      xfree(orig_pphdr);
++      free(orig_pphdr);
+   }
+   else {
+     do {
+@@ -158,7 +158,7 @@ verite_load_ucfile(ScrnInfoPtr pScreenInfo, char *file_name)
+         loadSection2board(pScreenInfo, fd, pshdr);
+ 	  pshdr=(Elf32_Shdr *)(((char *)pshdr)+sz);
+ 	} while (--num) ;
+-	xfree(orig_pshdr);
++	free(orig_pshdr);
+   }
+   close(fd);
+ 
+@@ -195,7 +195,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
+     return;
+   }
+ 
+-  data=(vu8 *)xalloc(size);
++  data=(vu8 *)malloc(size);
+   if (NULL == data){
+ 	ErrorF("RENDITION: GlobalAllocPtr couldn't allocate %lx bytes",
+ 		(unsigned long)size);
+@@ -210,7 +210,7 @@ loadSegment2board(ScrnInfoPtr pScreenInfo, int fd, Elf32_Phdr *phdr)
+ 
+   mmve(pScreenInfo, size, data, physAddr);
+ 
+-  xfree(data);
++  free(data);
+ }
+ 
+ 
+diff --git a/src/vmodes.c b/src/vmodes.c
+index c0bd0df..f2dae0b 100644
+--- a/src/vmodes.c
++++ b/src/vmodes.c
+@@ -20,6 +20,7 @@
+ #include "v1kregs.h"
+ #include "v2kregs.h"
+ 
++#include <unistd.h>
+ 
+ #undef DEBUG
+ 
+@@ -201,7 +202,7 @@ struct V1000ClocksStr {
+  * local function prototypes
+  */
+ 
+-static void set_PLL(IOADDRESS iob, vu32 value);
++static void set_PLL(unsigned long iob, vu32 value);
+ static double V1000CalcClock(double target, int *M, int *N, int *P);
+ static double V2200CalcClock(double target, int *m, int *n, int *p);
+ 
+@@ -509,13 +510,13 @@ verite_getstride(ScrnInfoPtr pScreenInfo, int *width,
+  */
+ 
+ /*
+- * void set_PLL(IOADDRESS iob, vu32 value)
++ * void set_PLL(unsigned long iob, vu32 value)
+  *
+  * Set PLL clock to desired frequency for the V1000.
+  */
+ 
+ void
+-set_PLL(IOADDRESS iob, vu32 value)
++set_PLL(unsigned long iob, vu32 value)
+ {
+     vu32 ulD;
+     int b;
+diff --git a/src/vos.h b/src/vos.h
+index 7b55f77..999c870 100644
+--- a/src/vos.h
++++ b/src/vos.h
+@@ -23,18 +23,18 @@
+ /*
+  * function prototypes
+  */
+-#define /*void*/ verite_out8(/*IOADDRESS*/ port, /*vu8*/ data) \
++#define /*void*/ verite_out8(/*unsigned long*/ port, /*vu8*/ data) \
+                    outb(port, data)
+ 
+-#define /*void*/ verite_out16(/*IOADDRESS*/ port, /*vu16*/ data) \
++#define /*void*/ verite_out16(/*unsigned long*/ port, /*vu16*/ data) \
+                    outw(port, data)
+ 
+-#define /*void*/ verite_out32(/*IOADDRESS*/ port, /*vu32*/ data) \
++#define /*void*/ verite_out32(/*unsigned long*/ port, /*vu32*/ data) \
+                    outl(port, data)
+ 
+-#define /*vu8*/  verite_in8(/*IOADDRESS*/ io_base)  ((vu8)inb(io_base))
+-#define /*vu16*/ verite_in16(/*IOADDRESS*/ io_base) ((vu16)inw(io_base))
+-#define /*vu32*/ verite_in32(/*IOADDRESS*/ io_base) ((vu32)inl(io_base))
++#define /*vu8*/  verite_in8(/*unsigned long*/ io_base)  ((vu8)inb(io_base))
++#define /*vu16*/ verite_in16(/*unsigned long*/ io_base) ((vu16)inw(io_base))
++#define /*vu32*/ verite_in32(/*unsigned long*/ io_base) ((vu32)inl(io_base))
+ 
+ /* memory accesses */
+ #define verite_read_memory32(base, offset) MMIO_IN32(base, offset)
+diff --git a/src/vramdac.c b/src/vramdac.c
+index 7c8acbd..21c1df7 100644
+--- a/src/vramdac.c
++++ b/src/vramdac.c
+@@ -93,11 +93,11 @@
+  * local function prototypes
+  */
+ 
+-static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data);
+-static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data);
++static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data);
++static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data);
+ #if 0
+-static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask);
+-static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask);
++static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask);
++static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask);
+ #endif
+ 
+ /*
+@@ -159,7 +159,7 @@ int
+ verite_initdac(ScrnInfoPtr pScreenInfo, vu8 bpp, vu8 doubleclock)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
++    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
+     vu8 cmd0,cmd1,cmd2;
+     vu8 cmd3_data=0;
+ 
+@@ -271,7 +271,7 @@ verite_enablecursor(ScrnInfoPtr pScreenInfo, int type, int size)
+                       BT485_3_COLOR_CURSOR, BT485_X_WINDOW_CURSOR };
+     static vu8 csizes[]={ BT485_32_BY_32_CURSOR, BT485_64_BY_64_CURSOR };
+   
+-    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
++    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
+ 
+ #ifdef DEBUG
+     ErrorF ("Rendition: Debug verite_enablecursor called type=0x%x\n",type);
+@@ -304,7 +304,7 @@ void
+ verite_movecursor(ScrnInfoPtr pScreenInfo, vu16 x, vu16 y, vu8 xo, vu8 yo)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
++    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
+ 
+     x+=Cursor_size-xo;
+     y+=Cursor_size-yo;
+@@ -327,7 +327,7 @@ void
+ verite_setcursorcolor(ScrnInfoPtr pScreenInfo, vu32 fg, vu32 bg)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
++    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
+ 
+ #ifdef DEBUG
+     ErrorF ("Rendition: Debug verite_setcursorcolor called FG=0x%x BG=0x%x\n",
+@@ -374,7 +374,7 @@ verite_loadcursor(ScrnInfoPtr pScreenInfo, vu8 size, vu8 *cursorimage)
+     int c, bytes, row;
+     vu8 *src = cursorimage;
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob=pRendition->board.io_base+RAMDACBASEADDR;
++    unsigned long iob=pRendition->board.io_base+RAMDACBASEADDR;
+     vu8 tmp;
+     vu8 memend; /* Added for byte-swap fix */
+ 
+@@ -454,7 +454,7 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
+ 		LOCO *colors, VisualPtr pVisual)
+ {
+     renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+-    IOADDRESS iob=pRendition->board.io_base;
++    unsigned long iob=pRendition->board.io_base;
+     vu32 crtc_status;
+     int i, index;
+ 
+@@ -485,12 +485,12 @@ verite_setpalette(ScrnInfoPtr pScreenInfo, int numColors, int *indices,
+  */
+ 
+ /*
+- * static void Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
++ * static void Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data)
+  *
+  *
+  */
+ static void
+-Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
++Bt485_write_masked(unsigned long port, vu8 reg, vu8 mask, vu8 data)
+ {
+     vu8 tmp;
+ 
+@@ -501,12 +501,12 @@ Bt485_write_masked(IOADDRESS port, vu8 reg, vu8 mask, vu8 data)
+ 
+ 
+ /*
+- * static void Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
++ * static void Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data)
+  *
+  *
+  */
+ static void
+-Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
++Bt485_write_cmd3_masked(unsigned long port, vu8 mask, vu8 data)
+ {
+ /*
+  *   Bt485_write_masked(port, BT485_COMMAND_REG_0, 0x7f, 0x80);
+@@ -522,24 +522,24 @@ Bt485_write_cmd3_masked(IOADDRESS port, vu8 mask, vu8 data)
+ 
+ #if 0
+ /*
+- * static vu8 Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask)
++ * static vu8 Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask)
+  *
+  *
+  */
+ static vu8
+-Bt485_read_masked(IOADDRESS port, vu8 reg, vu8 mask)
++Bt485_read_masked(unsigned long port, vu8 reg, vu8 mask)
+ {
+     return verite_in8(port+reg)&mask;
+ }
+ 
+ 
+ /*
+- * static vu8 Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask)
++ * static vu8 Bt485_read_cmd3_masked(unsigned long port, vu8 mask)
+  *
+  *
+  */
+ static vu8
+-Bt485_read_cmd3_masked(IOADDRESS port, vu8 mask)
++Bt485_read_cmd3_masked(unsigned long port, vu8 mask)
+ {
+     vu8 value;
+ 
+diff --git a/src/vtypes.h b/src/vtypes.h
+index 257870b..e4ad468 100644
+--- a/src/vtypes.h
++++ b/src/vtypes.h
+@@ -123,7 +123,7 @@ struct verite_board_t {
+     vu16  chip;
+ 
+     /* */
+-    IOADDRESS io_base, vgaio_base;
++    unsigned long io_base, vgaio_base;
+     vu32 mmio_base;
+     vu32 vmmio_base;
+     vu32 mem_size;
diff --git a/main/xf86-video-s3/APKBUILD b/main/xf86-video-s3/APKBUILD
index 2c21c5f07..e3cb9c9fb 100644
--- a/main/xf86-video-s3/APKBUILD
+++ b/main/xf86-video-s3/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3
 pkgver=0.6.3
-pkgrel=5
+pkgrel=6
 pkgdesc="X.Org driver for s3 cards"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-s3virge/APKBUILD b/main/xf86-video-s3virge/APKBUILD
index 4e1046780..aaf833703 100644
--- a/main/xf86-video-s3virge/APKBUILD
+++ b/main/xf86-video-s3virge/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-s3virge
 pkgver=1.10.4
-pkgrel=4
+pkgrel=5
 pkgdesc="S3 ViRGE video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,8 +11,17 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	s3virge-1.10.4-vga.patch"
 
+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
+}
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
@@ -26,4 +35,5 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="6517bbbf808c700502d51acdc44662f8  xf86-video-s3virge-1.10.4.tar.bz2"
+md5sums="6517bbbf808c700502d51acdc44662f8  xf86-video-s3virge-1.10.4.tar.bz2
+45c7d912734c9f7dfc1f42077827cb8e  s3virge-1.10.4-vga.patch"
diff --git a/main/xf86-video-s3virge/s3virge-1.10.4-vga.patch b/main/xf86-video-s3virge/s3virge-1.10.4-vga.patch
new file mode 100644
index 000000000..3fb1fd6cf
--- /dev/null
+++ b/main/xf86-video-s3virge/s3virge-1.10.4-vga.patch
@@ -0,0 +1,76 @@
+From 92b4671ca75022a56ad9e85b347f81c12157c98f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 16 Nov 2011 19:58:29 +0000
+Subject: Adapt to missing PIOOffset in videoabi 12
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/s3v_driver.c b/src/s3v_driver.c
+index 2ced9ac..0f754dd 100644
+--- a/src/s3v_driver.c
++++ b/src/s3v_driver.c
+@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   S3VPtr ps3v;
+   IOADDRESS vgaCRIndex, vgaCRReg;
+   unsigned char val;
+-  
++  unsigned int PIOOffset = 0;
++
+   PVERB5("	S3VEnableMmio\n");
+   
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
++
++#if ABI_VIDEODRV_VERSION < 12
++  PIOOffset = hwp->PIOOffset;
++#endif
++  
+   /*
+    * enable chipset (seen on uninitialized secondary cards)
+    * might not be needed once we use the VGA softbooter
+@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+    * to be set correctly already and MMIO _has_ to be
+    * enabled.
+    */
+-  val = inb(hwp->PIOOffset + 0x3C3);               /*@@@EE*/
+-  outb(hwp->PIOOffset + 0x3C3, val | 0x01);
++  val = inb(PIOOffset + 0x3C3);               /*@@@EE*/
++  outb(PIOOffset + 0x3C3, val | 0x01);
+   /*
+    * set CR registers to color mode
+    * in mono mode extended CR registers
+    * are not accessible. (EE 05/04/99)
+    */
+-  val = inb(hwp->PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
+-  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
++  val = inb(PIOOffset + VGA_MISC_OUT_R);      /*@@@EE*/
++  outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
+   vgaHWGetIOBase(hwp);             	/* Get VGA I/O base */
+-  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
++  vgaCRIndex = PIOOffset + hwp->IOBase + 4;
+   vgaCRReg = vgaCRIndex + 1;
+ #if 1
+   /*
+@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
+   			      	/* Enable new MMIO, if TRIO mmio is already */
+ 				/* enabled, then it stays enabled. */
+   outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
+-  outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
++  outb(PIOOffset + VGA_MISC_OUT_W, val);
+   if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
+     outb(vgaCRIndex, 0x40);
+     val = inb(vgaCRReg);
+@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
+   hwp = VGAHWPTR(pScrn);
+   ps3v = S3VPTR(pScrn);
+ 
+-  vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
++  vgaCRIndex = hwp->IOBase + 4;
++#if ABI_VIDEODRV_VERSION < 12
++  vgaCRIndex += hwp->PIOOffset;
++#endif
+   vgaCRReg = vgaCRIndex + 1;
+   outb(vgaCRIndex, 0x53);
+ 				/* Restore register's original state */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/main/xf86-video-savage/APKBUILD b/main/xf86-video-savage/APKBUILD
index a107f90d4..038cc9e2b 100644
--- a/main/xf86-video-savage/APKBUILD
+++ b/main/xf86-video-savage/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-savage
-pkgver=2.3.3
-pkgrel=2
+pkgver=2.3.4
+pkgrel=0
 pkgdesc="S3 Savage video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 subpackages="$pkgname-doc"
-depends="mesa-dri-savage"
+depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto
 	"
@@ -27,4 +27,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="4dfb647b1ebeaa42a235362643f5b085  xf86-video-savage-2.3.3.tar.bz2"
+md5sums="664c7d9c93049ebe96af262ec448451f  xf86-video-savage-2.3.4.tar.bz2"
diff --git a/main/xf86-video-siliconmotion/APKBUILD b/main/xf86-video-siliconmotion/APKBUILD
index f263b1680..7ec796dea 100644
--- a/main/xf86-video-siliconmotion/APKBUILD
+++ b/main/xf86-video-siliconmotion/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-siliconmotion
-pkgver=1.7.5
-pkgrel=1
+pkgver=1.7.6
+pkgrel=0
 pkgdesc="Silicon Motion video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="9ca392e16028a2f7c3ebc57f0aa4c1aa  xf86-video-siliconmotion-1.7.5.tar.bz2"
+md5sums="b5acd392d799e2bb67ea702a83feb4a0  xf86-video-siliconmotion-1.7.6.tar.bz2"
diff --git a/main/xf86-video-sis/APKBUILD b/main/xf86-video-sis/APKBUILD
index ea0c9ffde..d2be39980 100644
--- a/main/xf86-video-sis/APKBUILD
+++ b/main/xf86-video-sis/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-sis
-pkgver=0.10.3
-pkgrel=4
+pkgver=0.10.4
+pkgrel=0
 pkgdesc="X.org SiS video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -32,4 +32,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="dd930928b5ed7fcf34e3be4d43202ec7  xf86-video-sis-0.10.3.tar.bz2"
+md5sums="e1dda5365ad28ef3165fd0ed25952d9c  xf86-video-sis-0.10.4.tar.bz2"
diff --git a/main/xf86-video-sunleo/APKBUILD b/main/xf86-video-sunleo/APKBUILD
index bb4fe5237..5a7c1e6e3 100644
--- a/main/xf86-video-sunleo/APKBUILD
+++ b/main/xf86-video-sunleo/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-sunleo
 pkgver=1.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Leo video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-tdfx/APKBUILD b/main/xf86-video-tdfx/APKBUILD
index cf764d7f8..3a7a2fa32 100644
--- a/main/xf86-video-tdfx/APKBUILD
+++ b/main/xf86-video-tdfx/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-tdfx
-pkgver=1.4.3
-pkgrel=7
+pkgver=1.4.4
+pkgrel=0
 pkgdesc="3Dfx video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
 license="custom"
 subpackages="$pkgname-doc"
-depends="mesa-dri-tdfx"
+depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto libdrm-dev xf86driproto mesa-dev glproto
 	"
@@ -27,4 +27,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="8161bbf2b100c21b609163f0010766b3  xf86-video-tdfx-1.4.3.tar.bz2"
+md5sums="890d6c96c12e91e22b4ceaa9ef93b442  xf86-video-tdfx-1.4.4.tar.bz2"
diff --git a/main/xf86-video-tseng/APKBUILD b/main/xf86-video-tseng/APKBUILD
index a9810dedb..e7799eb0a 100644
--- a/main/xf86-video-tseng/APKBUILD
+++ b/main/xf86-video-tseng/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-tseng
 pkgver=1.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Tseng Labs video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -11,7 +11,17 @@ depends=
 makedepends="pkgconfig xorg-server-dev libxi-dev fontsproto randrproto
 	videoproto renderproto"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+	tseng-1.2.4-git.patch"
+
+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
+}
 
 build() {
 	cd "$srcdir"/$pkgname-$pkgver
@@ -26,4 +36,5 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="fa441774f8bf516a5c6331d64231a39d  xf86-video-tseng-1.2.4.tar.bz2"
+md5sums="fa441774f8bf516a5c6331d64231a39d  xf86-video-tseng-1.2.4.tar.bz2
+48a70c20554df04f373db5ed1fe1ae0c  tseng-1.2.4-git.patch"
diff --git a/main/xf86-video-tseng/tseng-1.2.4-git.patch b/main/xf86-video-tseng/tseng-1.2.4-git.patch
new file mode 100644
index 000000000..082b2cb0b
--- /dev/null
+++ b/main/xf86-video-tseng/tseng-1.2.4-git.patch
@@ -0,0 +1,317 @@
+diff --git a/configure.ac b/configure.ac
+index 62cc318..8458c06 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,46 +20,46 @@
+ #
+ # Process this file with autoconf to produce a configure script
+ 
+-AC_PREREQ(2.57)
++# Initialize Autoconf
++AC_PREREQ([2.60])
+ AC_INIT([xf86-video-tseng],
+-        1.2.4,
++        [1.2.4],
+         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+-        xf86-video-tseng)
+-
++        [xf86-video-tseng])
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
++# Initialize Automake
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+-
+ AM_MAINTAINER_MODE
+ 
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+-XORG_MACROS_VERSION(1.3)
++          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.8)
+ XORG_DEFAULT_OPTIONS
+ 
+-# Checks for programs.
++# Initialize libtool
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-AC_PROG_CC
+ 
+ AH_TOP([#include "xorg-server.h"])
+ 
++# Define a configure option for an alternate module directory
+ AC_ARG_WITH(xorg-module-dir,
+-            AC_HELP_STRING([--with-xorg-module-dir=DIR],
++            AS_HELP_STRING([--with-xorg-module-dir=DIR],
+                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+             [moduledir="$withval"],
+             [moduledir="$libdir/xorg/modules"])
+ 
+-# Checks for extensions
++# Store the list of server defined optional extensions in REQUIRED_MODULES
+ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ 
+-# Checks for pkg-config packages
++# Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+ 
+ # Checks for libraries.
+@@ -78,17 +78,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ fi
+ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+ 
+-# Checks for header files.
+-AC_HEADER_STDC
+-
+-AC_SUBST([XORG_CFLAGS])
+ AC_SUBST([moduledir])
+ 
+ DRIVER_NAME=tseng
+ AC_SUBST([DRIVER_NAME])
+ 
+-AC_OUTPUT([
+-	Makefile
+-	src/Makefile
+-	man/Makefile
++AC_CONFIG_FILES([
++                Makefile
++                src/Makefile
++                man/Makefile
+ ])
++AC_OUTPUT
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 8f2454b..b3688ce 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -31,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
+ 
+ CLEANFILES = $(driverman_DATA)
+ 
+-SED = sed
+-
+-# Strings to replace in man pages
+-XORGRELSTRING = @PACKAGE_STRING@
+-  XORGMANNAME = X Version 11
+-
+-MAN_SUBSTS = \
+-	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+-	-e 's|__xservername__|Xorg|g' \
+-	-e 's|__xconfigfile__|xorg.conf|g' \
+-	-e 's|__projectroot__|$(prefix)|g' \
+-	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+-	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+-	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+-	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
++
++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
++
+ 
+ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+ 
+ .man.$(DRIVER_MAN_SUFFIX):
+-	sed $(MAN_SUBSTS) < $< > $@
++	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+diff --git a/man/tseng.man b/man/tseng.man
+index 403782f..984c8e7 100644
+--- a/man/tseng.man
++++ b/man/tseng.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.man,v 1.2 2001/01/27 18:20:55 dawes Exp $ 
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH TSENG __drivermansuffix__ __vendorversion__
+diff --git a/src/tseng_cursor.c b/src/tseng_cursor.c
+index d4fb847..2412b31 100644
+--- a/src/tseng_cursor.c
++++ b/src/tseng_cursor.c
+@@ -159,7 +159,7 @@ TsengSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
+     }
+ }
+ 
+-void 
++static void 
+ TsengLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *bits)
+ {
+     vgaHWPtr hwp = VGAHWPTR(pScrn);
+diff --git a/src/tseng_dga.c b/src/tseng_dga.c
+index 70ebe23..528ba4c 100644
+--- a/src/tseng_dga.c
++++ b/src/tseng_dga.c
+@@ -74,9 +74,9 @@ TsengDGAInit(ScreenPtr pScreen)
+   if (!pTseng->DGAnumModes) {
+     pMode = firstMode = pScrn->modes;
+     while (pMode) {
+-      newmodes = xrealloc(modes, (num + 1) * sizeof (DGAModeRec));
++      newmodes = realloc(modes, (num + 1) * sizeof (DGAModeRec));
+       if (!newmodes) {
+-	xfree(modes);
++	free(modes);
+ 	return FALSE;
+       }
+       modes = newmodes;
+@@ -135,7 +135,7 @@ Tseng_OpenFramebuffer(
+     TsengPtr pTseng = TsengPTR(pScrn);
+ 
+     *name = NULL; 		/* no special device */
+-    *mem = (unsigned char*)pTseng->FbAddress;
++    *mem = (unsigned char*)(uintptr_t)pTseng->FbAddress;
+     *size = pTseng->FbMapSize;
+     *offset = 0;                /* Always */
+     *flags = 0;                 /* Root permissions OS-dependent */
+diff --git a/src/tseng_driver.c b/src/tseng_driver.c
+index 445c17e..d36b62c 100644
+--- a/src/tseng_driver.c
++++ b/src/tseng_driver.c
+@@ -269,9 +269,9 @@ TsengFreeRec(ScrnInfoPtr pScrn)
+     pTseng = TsengPTR(pScrn);
+     
+     if (pTseng->SavedReg.RAMDAC)
+-        xfree(pTseng->SavedReg.RAMDAC);
++        free(pTseng->SavedReg.RAMDAC);
+ 
+-    xfree(pScrn->driverPrivate);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -395,10 +395,10 @@ TsengProbe(DriverPtr drv, int flags)
+                 foundScreen = TRUE;
+             }
+         }
+-        xfree(usedChips);
++        free(usedChips);
+     }
+     
+-    xfree(devSections);
++    free(devSections);
+     return foundScreen;
+ }
+ 
+@@ -806,7 +806,7 @@ TsengProcessOptions(ScrnInfoPtr pScrn)
+     xf86CollectOptions(pScrn, NULL);
+ 
+     /* Process the options */
+-    if (!(pTseng->Options = xalloc(sizeof(TsengOptions))))
++    if (!(pTseng->Options = malloc(sizeof(TsengOptions))))
+ 	return FALSE;
+     memcpy(pTseng->Options, TsengOptions, sizeof(TsengOptions));
+     xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, pTseng->Options);
+@@ -883,7 +883,7 @@ TsengGetFbAddress(ScrnInfoPtr pScrn)
+     PDEBUG("	TsengGetFbAddress\n");
+ 
+     /* base0 is the framebuffer and base1 is the PCI IO space. */
+-    if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
++    if (!PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                    "No valid Framebuffer address in PCI config space;\n");
+         return FALSE;
+diff --git a/src/tseng_mode.c b/src/tseng_mode.c
+index f075226..a3ff87d 100644
+--- a/src/tseng_mode.c
++++ b/src/tseng_mode.c
+@@ -41,7 +41,11 @@ vgaHWWriteBank(vgaHWPtr hwp, CARD8 value)
+     if (hwp->MMIOBase)
+ 	MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK, value);
+     else
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	outb(hwp->PIOOffset + VGA_BANK, value);
++#else
++	pci_io_write8(hwp->io, VGA_BANK, value);
++#endif
+ }
+ 
+ CARD8
+@@ -50,7 +54,11 @@ vgaHWReadBank(vgaHWPtr hwp)
+     if (hwp->MMIOBase)
+ 	return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_BANK);
+     else
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	return inb(hwp->PIOOffset + VGA_BANK);
++#else
++	return pci_io_read8(hwp->io, VGA_BANK);
++#endif
+ }
+ 
+ #define VGA_SEGMENT 0x3CD
+@@ -61,7 +69,11 @@ vgaHWWriteSegment(vgaHWPtr hwp, CARD8 value)
+     if (hwp->MMIOBase)
+ 	MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT, value);
+     else
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	outb(hwp->PIOOffset + VGA_SEGMENT, value);
++#else
++	pci_io_write8(hwp->io, VGA_SEGMENT, value);
++#endif
+ }
+ 
+ CARD8
+@@ -70,7 +82,11 @@ vgaHWReadSegment(vgaHWPtr hwp)
+     if (hwp->MMIOBase)
+ 	return MMIO_IN8(hwp->MMIOBase, hwp->MMIOOffset + VGA_SEGMENT);
+     else
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
+ 	return inb(hwp->PIOOffset + VGA_SEGMENT);
++#else
++	return pci_io_read8(hwp->io, VGA_SEGMENT);
++#endif
+ }
+ 
+ /*
+@@ -84,8 +100,12 @@ vgaHWWriteModeControl(vgaHWPtr hwp, CARD8 value)
+     if (hwp->MMIOBase)
+         MMIO_OUT8(hwp->MMIOBase,
+                   hwp->MMIOOffset + hwp->IOBase + VGA_MODE_CONTROL, value);
+-    else  
+-        outb(hwp->IOBase + hwp->PIOOffset + VGA_MODE_CONTROL, value);
++    else
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
++	outb(hwp->PIOOffset + VGA_MODE_CONTROL, value);
++#else
++	pci_io_write8(hwp->io, VGA_MODE_CONTROL, value);
++#endif
+ }
+ 
+ /*
+@@ -110,14 +130,22 @@ vgaHWHerculesSecondPage(vgaHWPtr hwp, Bool Enable)
+ 
+         MMIO_OUT8(hwp->MMIOBase, hwp->MMIOOffset + VGA_HERCULES, tmp);
+     } else {
+-        tmp = inb(hwp->PIOOffset + VGA_HERCULES);
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
++	tmp = inb(hwp->PIOOffset + VGA_HERCULES);
++#else
++	tmp = pci_io_read8(hwp->io, VGA_HERCULES);
++#endif
+ 
+         if (Enable)
+             tmp |= 0x02;
+         else
+             tmp &= ~0x02;
+ 
+-        outb(hwp->PIOOffset + VGA_HERCULES, tmp);
++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
++	outb(hwp->PIOOffset + VGA_HERCULES, tmp);
++#else
++	pci_io_write8(hwp->io, VGA_HERCULES, tmp);
++#endif
+     }
+ }
+ 
+@@ -1502,7 +1530,7 @@ TsengModeInit(ScrnInfoPtr pScrn, DisplayModePtr OrigMode)
+ 
+     /* clean up */
+     if (new->RAMDAC)
+-        xfree(new->RAMDAC);
++        free(new->RAMDAC);
+ 
+     return TRUE;
+ }
diff --git a/main/xf86-video-v4l/APKBUILD b/main/xf86-video-v4l/APKBUILD
index 02396f130..61c23a06c 100644
--- a/main/xf86-video-v4l/APKBUILD
+++ b/main/xf86-video-v4l/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-v4l
 pkgver=0.2.0
-pkgrel=6
+pkgrel=7
 pkgdesc="video4linux driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xf86-video-vesa/APKBUILD b/main/xf86-video-vesa/APKBUILD
index 343638f68..e677cdf2d 100644
--- a/main/xf86-video-vesa/APKBUILD
+++ b/main/xf86-video-vesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vesa
-pkgver=2.3.0
-pkgrel=4
+pkgver=2.3.1
+pkgrel=0
 pkgdesc="X.org vesa video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
@@ -26,4 +26,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="07fa32958aff9b463dd3af5481ef6626  xf86-video-vesa-2.3.0.tar.bz2"
+md5sums="02e6eacc2d1e07ac893b62481905d6f0  xf86-video-vesa-2.3.1.tar.bz2"
diff --git a/main/xf86-video-vmware/APKBUILD b/main/xf86-video-vmware/APKBUILD
index 6bff82790..075bc3a0f 100644
--- a/main/xf86-video-vmware/APKBUILD
+++ b/main/xf86-video-vmware/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-vmware
-pkgver=11.1.0
+pkgver=12.0.2
 pkgrel=0
 pkgdesc="X.org VMWare video driver"
 url="http://xorg.freedesktop.org/"
@@ -11,12 +11,10 @@ depends=
 makedepends="pkgconfig xorg-server-dev videoproto renderproto xproto libdrm-dev
 	fontsproto xf86dgaproto xineramaproto randrproto xextproto libxi-dev"
 
-source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
-	abi2.patch"
+source="http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
-	patch -Np1 -i "$srcdir/abi2.patch" || return 1
 }
 
 build() {
@@ -33,5 +31,4 @@ package() {
 	rm "$pkgdir"/usr/lib/xorg/modules/*/*.la || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="044b4fc12094f494b1d1148eb76cb2b9  xf86-video-vmware-11.1.0.tar.bz2
-cbc8e0bef13ccec7ceac233cd09233da  abi2.patch"
+md5sums="0743ec7c479603fba60d118858fd5783  xf86-video-vmware-12.0.2.tar.bz2"
diff --git a/main/xf86-video-vmware/abi2.patch b/main/xf86-video-vmware/abi2.patch
deleted file mode 100644
index 29e8ddeb1..000000000
--- a/main/xf86-video-vmware/abi2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up xf86-video-vmware-10.16.7/src/vmware.c.jx xf86-video-vmware-10.16.7/src/vmware.c
---- xf86-video-vmware-10.16.7/src/vmware.c.jx	2009-08-07 16:31:33.000000000 -0400
-+++ xf86-video-vmware-10.16.7/src/vmware.c	2009-08-07 16:32:10.000000000 -0400
-@@ -640,8 +640,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         return FALSE;
-     }
- 
--    xf86LoaderReqSymLists(vgahwSymbols, NULL);
--
-     if (!vgaHWGetHWRec(pScrn)) {
-         return FALSE;
-     }
-@@ -959,7 +957,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-         VMWAREFreeRec(pScrn);
-         return FALSE;
-     }
--    xf86LoaderReqSymLists(fbSymbols, shadowfbSymbols, NULL);
- 
-     /* Need ramdac for hwcursor */
-     if (pVMWARE->hwCursor) {
-@@ -967,7 +964,6 @@ VMWAREPreInit(ScrnInfoPtr pScrn, int fla
-             VMWAREFreeRec(pScrn);
-             return FALSE;
-         }
--        xf86LoaderReqSymLists(ramdacSymbols, NULL);
-     }
- 
-     return TRUE;
-@@ -2051,9 +2047,6 @@ vmwareSetup(pointer module, pointer opts
-         setupDone = TRUE;
-         xf86AddDriver(&VMWARE, module, VMWARE_DRIVER_FUNC);
- 
--        LoaderRefSymLists(vgahwSymbols, fbSymbols, ramdacSymbols,
--                          shadowfbSymbols, NULL);
--
-         return (pointer)1;
-     }
-     if (errmaj) {
diff --git a/main/xf86-video-xgixp/APKBUILD b/main/xf86-video-xgixp/APKBUILD
index 3cc6584cd..bead1180d 100644
--- a/main/xf86-video-xgixp/APKBUILD
+++ b/main/xf86-video-xgixp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xf86-video-xgixp
 pkgver=1.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="X.org XGIXP video driver"
 url="http://xorg.freedesktop.org/"
 arch="all"
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 9990976c6..9e3e64d34 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
-pkgver=1.11.4
-pkgrel=1
+pkgver=1.12.0
+pkgrel=0
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
 arch="all"
@@ -150,5 +150,5 @@ xephyr() {
 	mv "$pkgdir"/usr/bin/Xephyr "$subpkgdir"/usr/bin/
 }
 
-md5sums="256325e9b17dff479d92bed97f6b0adb  xorg-server-1.11.4.tar.bz2
+md5sums="3a3c4281f32c8702749e8f129372a355  xorg-server-1.12.0.tar.bz2
 222de594206d1148a90eddfda4f7a11a  xorg-redhat-die-ugly-pattern-die-die-die.patch"
diff --git a/main/xproto/APKBUILD b/main/xproto/APKBUILD
index d1ebe178b..ccf5429f5 100644
--- a/main/xproto/APKBUILD
+++ b/main/xproto/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xproto
-pkgver=7.0.22
+pkgver=7.0.23
 pkgrel=0
 pkgdesc="X11 core wire protocol and auxiliary headers"
 url="http://xorg.freedesktop.org/"
-arch="all"
+arch="noarch"
 license="custom"
 depends=""
 makedepends=""
@@ -26,4 +26,4 @@ package() {
 	install -D -m644 "$srcdir"/$pkgname-$pkgver/COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
-md5sums="da0b0eb2f432b7cc1d665b05422a0457  xproto-7.0.22.tar.bz2"
+md5sums="d4d241a4849167e4e694fe73371c328c  xproto-7.0.23.tar.bz2"
diff --git a/main/xtrans/APKBUILD b/main/xtrans/APKBUILD
index d052c2903..d5c6cbb68 100644
--- a/main/xtrans/APKBUILD
+++ b/main/xtrans/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xtrans
-pkgver=1.2.6
+pkgver=1.2.7
 pkgrel=0
 pkgdesc="X transport library"
 url="http://xorg.freedesktop.org/"
@@ -21,4 +21,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
-md5sums="c66f9ffd2da4fb012220c6c40ebc7609  xtrans-1.2.6.tar.bz2"
+md5sums="84c66908cf003ad8c272b0eecbdbaee3  xtrans-1.2.7.tar.bz2"
diff --git a/testing/partimage/APKBUILD b/testing/partimage/APKBUILD
index 96896cf61..aacd2d002 100644
--- a/testing/partimage/APKBUILD
+++ b/testing/partimage/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=partimage
-pkgver=0.6.8
+pkgver=0.6.9
 pkgrel=0
 pkgdesc="Saves partitions having a supported filesystem to an image file"
 url="http://www.partimage.org"
@@ -12,14 +12,14 @@ makedepends="bzip2-dev newt-dev zlib-dev gettext-dev slang-dev openssl-dev \
 install=
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/project/$pkgname/stable/$pkgver/$pkgname-$pkgver.tar.bz2
-	partimage-0.6.8-gcc44.patch
+	partimage-0.6.9-zlib-1.2.6.patch
 "
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	cd "$_builddir"
-	patch -p1 -i $srcdir/$pkgname-0.6.8-gcc44.patch || return 1
+	patch -p1 -i $srcdir/$pkgname-0.6.9-zlib-1.2.6.patch || return 1
 }
 
 build() {
@@ -39,5 +39,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="c13c8ede8cdf7745b97ec5827920ece7  partimage-0.6.8.tar.bz2
-a6430cf98c8f236c41dd3addcde1fcb8  partimage-0.6.8-gcc44.patch"
+md5sums="1bc046fd915c5debbafc85729464e513  partimage-0.6.9.tar.bz2
+6139caa49838f71e6b8ac11624252cf7  partimage-0.6.9-zlib-1.2.6.patch"
diff --git a/testing/partimage/partimage-0.6.8-gcc44.patch b/testing/partimage/partimage-0.6.8-gcc44.patch
deleted file mode 100644
index b171dad08..000000000
--- a/testing/partimage/partimage-0.6.8-gcc44.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur partimage-0.6.8/src/client/netclient.h partimage-0.6.8-new/src/client/netclient.h
---- partimage-0.6.8/src/client/netclient.h	2009-09-24 16:21:42.000000000 -0300
-+++ partimage-0.6.8-new/src/client/netclient.h	2009-11-26 09:23:07.000000000 -0200
-@@ -35,7 +35,7 @@
- #ifdef HAVE_SSL
-   SSL_CTX * ctx;
-   X509 * server_cert;
--  SSL_METHOD * meth;
-+  const SSL_METHOD * meth;
- #endif
-   bool m_bUseSSL;
-   bool m_bMustLogin;
-diff -Naur partimage-0.6.8/src/server/netserver.h partimage-0.6.8-new/src/server/netserver.h
---- partimage-0.6.8/src/server/netserver.h	2009-09-12 05:06:22.000000000 -0300
-+++ partimage-0.6.8-new/src/server/netserver.h	2009-11-26 09:32:02.000000000 -0200
-@@ -41,7 +41,7 @@
- #ifdef HAVE_SSL
-   SSL_CTX * ctx;
-   X509 * client_cert;
--  SSL_METHOD * meth; 
-+  const SSL_METHOD * meth; 
-   int err;
- #endif
- 
diff --git a/testing/partimage/partimage-0.6.9-zlib-1.2.6.patch b/testing/partimage/partimage-0.6.9-zlib-1.2.6.patch
new file mode 100644
index 000000000..9922daa81
--- /dev/null
+++ b/testing/partimage/partimage-0.6.9-zlib-1.2.6.patch
@@ -0,0 +1,35 @@
+diff --git a/src/client/imagefile.cpp b/src/client/imagefile.cpp
+index dd83411..62d0f72 100644
+--- a/src/client/imagefile.cpp
++++ b/src/client/imagefile.cpp
+@@ -783,7 +783,7 @@ void CImage::openWriting()
+   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+     {
+       showDebug(1, "open gzip\n");
+-      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
++      m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
+       if (m_gzImageFile == NULL)
+    {
+      showDebug(1, "error:%d %s\n", errno, strerror(errno));
+@@ -1098,7 +1098,7 @@ void CImage::openReading(CVolumeHeader *vh /* = NULL */)
+     }
+   else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+     {
+-      m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
++      m_gzImageFile = gzdopen(m_nFdImage, "rb");
+       if (m_gzImageFile == NULL)
+         THROW(ERR_ERRNO, errno);
+       else
+diff --git a/src/client/imagefile.h b/src/client/imagefile.h
+index 4ba8910..6adb098 100644
+--- a/src/client/imagefile.h
++++ b/src/client/imagefile.h
+@@ -41,7 +41,7 @@ class CImage
+   COptions m_options;
+
+   FILE *m_fImageFile;
+-  gzFile *m_gzImageFile;
++  gzFile m_gzImageFile;
+   BZFILE *m_bzImageFile;
+
+   int m_nFdImage;
author	Fabian Affolter <fabian@affolter-engineering.ch>	2012-03-28 16:59:39 +0000
committer	Fabian Affolter <fabian@affolter-engineering.ch>	2012-03-28 16:59:39 +0000
commit	ac8282d739f045c1dd9d4d9d437d004625c7d3de (patch)
tree	a55f98fee9d18d679207cda627c22ba13d6338db
parent	69d4f8eefbd56b7e430981437d1a4ce927547b39 (diff)
parent	8a303f51142efa5684ac6741d3c6e61ea0556d7e (diff)
download	aports-ac8282d739f045c1dd9d4d9d437d004625c7d3de.tar.bz2 aports-ac8282d739f045c1dd9d4d9d437d004625c7d3de.tar.xz