From 51bf6ea3989decd51fcf1affd0dff16c43774cd4 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Mar 2010 21:08:10 +0100
Subject: update to latest stable upstream, add a mips specific patch

---
 package/xorg-server/Makefile                       | 12 +++++++----
 .../patch-hw_xfree86_os-support_linux_lnx_video_c  | 25 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c

(limited to 'package/xorg-server')

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 35b7597a6..977710c4f 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
-PKG_VERSION:=		1.7.1
-PKG_RELEASE:=		2
-PKG_MD5SUM:=		913a672cbd6da516de15965d594e20b9
+PKG_VERSION:=		1.7.5
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		866917789c71e7616a016ad256fe9b8f
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile \
@@ -18,7 +18,7 @@ PKG_BUILDDEP+=		libX11 randrproto renderproto fixesproto damageproto \
 			compositeproto evieext libxkbfile libXfont pixman \
 			libpciaccess openssl xf86dgaproto
 PKG_URL:=		http://www.x.org
-PKG_SITES:=		${MASTER_SITE_XORG}
+PKG_SITES:=		http://xorg.freedesktop.org/archive/individual/xserver/
 
 CFLINE_XORG_SERVER:=	depends on ADK_TARGET_WITH_VGA
 
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=	\
 			--enable-dga \
 			--enable-xorg \
 			--enable-xv \
+			--enable-xaa \
 			--disable-aiglx \
 			--disable-config-hal \
 			--disable-dpms \
@@ -56,6 +57,7 @@ CONFIGURE_ARGS+=	\
 			--with-vendor-web="http://openadk.org"
 
 post-install:
+	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
@@ -72,5 +74,7 @@ post-install:
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
 	${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
+	-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
+		$(IDIR_XORG_SERVER)/etc/X11
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
new file mode 100644
index 000000000..d28b1e4e4
--- /dev/null
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
@@ -0,0 +1,25 @@
+--- xorg-server-1.7.5.orig/hw/xfree86/os-support/linux/lnx_video.c	2010-02-16 01:24:23.000000000 +0100
++++ xorg-server-1.7.5/hw/xfree86/os-support/linux/lnx_video.c	2010-03-07 16:38:06.000000000 +0100
+@@ -497,7 +497,7 @@ volatile unsigned char *ioBase = NULL;
+ Bool
+ xf86EnableIO(void)
+ {
+-#if defined(__powerpc__)
++#if defined(__powerpc__) || defined(__mips__)
+ 	int fd;
+ 	unsigned int ioBase_phys;
+ #endif
+@@ -537,6 +537,13 @@ xf86EnableIO(void)
+ 	ioperm(0x40,4,0); /* trap access to the timer chip */
+ 	ioperm(0x60,4,0); /* trap access to the keyboard controller */
+ # endif
++#else
++	fd = open("/dev/mem", O_RDWR);
++	if (IOPortBase == NULL) {
++		IOPortBase = (volatile unsigned char *)mmap(0, 0x20000,
++			PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0x1fd00000);
++	}
++	close(fd);
+ #endif
+ 	ExtendedEnabled = TRUE;
+ 
-- 
cgit v1.2.3