Patch xorg-server for xf86-video-siliconmotion to work.

2 files changed, 57 insertions, 3 deletions

diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 5be04a4a5..c2c9c34a2 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
 pkgver=1.11.2
-pkgrel=2
+pkgrel=2.1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -20,7 +20,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
         xvfb-run
         xvfb-run.1
-        10-quirks.conf)
+        10-quirks.conf
+	loongson.patch)
 md5sums=('8796fff441e5435ee36a72579008af24'
          '6c7e87d63ac4b535e19a80c89d0cf091'
          'f8194638ca4872c2b0a67862a70bcebf'
@@ -30,7 +31,8 @@ md5sums=('8796fff441e5435ee36a72579008af24'
          '47f9b979fe38043b42ff86eeee6fd0d0'
          '52fd3effd80d7bc6c1660d4ecf23d31c'
          '376c70308715cd2643f7bff936d9934b'
-         'd4f7dfc6be4ef4e2c6dd7632a9d88abe')
+         'd4f7dfc6be4ef4e2c6dd7632a9d88abe'
+         'd39c2e1a70bb4e400bb688cc74cd15f8')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -55,6 +57,9 @@ build() {
   # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298
   patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch"
 
+  # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
+  patch -Np1 -i "${srcdir}/loongson.patch"
+
   autoreconf -fi
   if [ "$CARCH" = "mips64el" ]; then
   ./configure --prefix=/usr \
diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch
new file mode 100644
index 000000000..b6c9692fc
--- /dev/null
+++ b/extra/xorg-server/loongson.patch
@@ -0,0 +1,49 @@
+diff -ru xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h xorg-server-1.11.2/hw/xfree86/dri/sarea.h
+--- xorg-server-1.11.2.orig/hw/xfree86/dri/sarea.h	2011-12-07 16:47:06.971237310 +0100
++++ xorg-server-1.11.2/hw/xfree86/dri/sarea.h	2011-12-07 16:48:40.132392770 +0100
+@@ -42,6 +42,8 @@
+ /* SAREA area needs to be at least a page */
+ #if defined(__alpha__)
+ #define SAREA_MAX 			0x2000
++#elif defined(__mips__)
++#define SAREA_MAX                      0x4000
+ #elif defined(__ia64__)
+ #define SAREA_MAX			0x10000		/* 64kB */
+ #else
+diff -ru xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
+--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2011-12-07 16:47:06.967237429 +0100
++++ xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c	2011-12-07 16:52:33.200881187 +0100
+@@ -493,9 +493,10 @@
+ Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ 	int fd;
+ 	unsigned int ioBase_phys;
++	extern unsigned int IOPortBase;
+ #endif
+ 
+ 	if (ExtendedEnabled)
+@@ -520,6 +521,21 @@
+ #endif
+ 	}
+ 	close(fd);
++#elif defined(__mips__)
++	fd = open("/dev/mem", O_RDWR);
++	IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++			PROT_READ | PROT_WRITE, MAP_SHARED, fd,
++			0x1fd00000);
++	if (IOPortBase == MAP_FAILED) {
++		xf86Msg(X_WARNING,
++				"xf86EnableIOPorts: Failed to map iobase (%s)\n",
++				strerror(errno));
++		return FALSE;
++	}
++	close(fd);
++	xf86Msg(X_WARNING,
++		"xf86EnableIOPorts: map iobase (%x)\n",
++		IOPortBase);
+ #elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
+         if (ioperm(0, 1024, 1) || iopl(3)) {
+                 if (errno == ENODEV)