update Xorg to 7.7

7 files changed, 73 insertions, 75 deletions

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 5abcdd562..2f172e6cb 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.9.3
+PKG_VERSION:=		1.12.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b8e364bffd87291b593726696d39b4b5
+PKG_MD5SUM:=		a95c896fbe8322c3c8d518a13eb74c7a
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11/server
 PKG_DEPENDS:=		libopenssl libxfont pixman libpciaccess libxkbfile
diff --git a/package/xorg-server/patches/patch-fb_fb_h b/package/xorg-server/patches/patch-fb_fb_h
index 39d271d5a..9118bec68 100644
--- a/package/xorg-server/patches/patch-fb_fb_h
+++ b/package/xorg-server/patches/patch-fb_fb_h
@@ -1,8 +1,8 @@
 	Fix for xf86-video-siliconmotion in 16bpp with XAA, see:
 	http://groups.google.com/group/loongson-dev/browse_thread/thread/570549e3d7894fef/5f04b3d9370adfd2
---- xorg-server-1.9.3.orig/fb/fb.h	2010-12-13 20:42:27.000000000 +0100
-+++ xorg-server-1.9.3/fb/fb.h	2012-10-01 13:23:55.000000000 +0200
-@@ -71,7 +71,7 @@
+--- xorg-server-1.12.2.orig/fb/fb.h	2012-05-29 22:04:19.000000000 +0200
++++ xorg-server-1.12.2/fb/fb.h	2013-04-30 10:33:00.000000000 +0200
+@@ -70,7 +70,7 @@
  #define FBPREFIX(x) fb##x
  #define WRITE(ptr, val) (*(ptr) = (val))
  #define READ(ptr) (*(ptr))
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
index ebf414b0d..8a5f29ebd 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
+++ b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
@@ -1,55 +1,58 @@
-	Caller side code changes regarding memory mapped IO. This patch applies
-	for mips architectures and is used by xf86-video-siliconmotion.
---- xorg-server-1.9.3.orig/hw/xfree86/common/compiler.h	2010-09-30 09:27:11.000000000 +0200
-+++ xorg-server-1.9.3/hw/xfree86/common/compiler.h	2012-10-01 13:23:55.000000000 +0200
-@@ -714,42 +714,43 @@ xf86WriteMmio32LeNB(__volatile__ void *b
- #     define PORT_SIZE short
- #    endif
- 
--_X_EXPORT unsigned int IOPortBase;  /* Memory mapped I/O port area */
+--- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h	2012-05-17 19:09:03.000000000 +0200
++++ xorg-server-1.12.2/hw/xfree86/common/compiler.h	2013-04-30 10:52:21.000000000 +0200
+@@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
+ #define PORT_SIZE short
+ #endif
+ 
+-_X_EXPORT unsigned int IOPortBase;      /* Memory mapped I/O port area */
 +_X_EXPORT volatile unsigned char *ioBase;  /* Memory mapped I/O port area */
-+
  
  static __inline__ void
  outb(unsigned PORT_SIZE port, unsigned char val)
  {
--	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-+	*(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase) = val;
+-    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
  }
  
  static __inline__ void
  outw(unsigned PORT_SIZE port, unsigned short val)
  {
--	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-+	*(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase) = val;
+-    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
  }
  
  static __inline__ void
  outl(unsigned PORT_SIZE port, unsigned int val)
  {
--	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase) = val;
-+	*(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase) = val;
+-    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
++    *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
+         val;
  }
  
- static __inline__ unsigned int
+@@ -737,21 +737,21 @@ static __inline__ unsigned int
  inb(unsigned PORT_SIZE port)
  {
--	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-+	return *(volatile unsigned char*)(((unsigned PORT_SIZE)(port))+ioBase);
+     return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
+-                                        IOPortBase);
++                                        ioBase);
  }
  
  static __inline__ unsigned int
  inw(unsigned PORT_SIZE port)
  {
--	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-+	return *(volatile unsigned short*)(((unsigned PORT_SIZE)(port))+ioBase);
+     return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
+-                                         IOPortBase);
++                                         ioBase);
  }
  
  static __inline__ unsigned int
  inl(unsigned PORT_SIZE port)
  {
--	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+IOPortBase);
-+	return *(volatile unsigned int*)(((unsigned PORT_SIZE)(port))+ioBase);
+     return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
+-                                       IOPortBase);
++                                       ioBase);
  }
  
- 
+ #if defined(__mips__)
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
index 91c04f1ec..6f45382eb 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
+++ b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
@@ -1,11 +1,11 @@
---- xorg-server-1.7.5.orig/hw/xfree86/dri/sarea.h	2009-02-10 08:23:28.000000000 +0100
-+++ xorg-server-1.7.5/hw/xfree86/dri/sarea.h	2010-03-08 19:21:40.000000000 +0100
-@@ -42,6 +42,8 @@
+--- xorg-server-1.12.2.orig/hw/xfree86/dri/sarea.h	2012-05-17 19:09:03.000000000 +0200
++++ xorg-server-1.12.2/hw/xfree86/dri/sarea.h	2013-04-30 10:33:00.000000000 +0200
+@@ -41,6 +41,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 */
+ #define SAREA_MAX			0x10000 /* 64kB */
  #else
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
index c75c99f14..fd8fcfced 100644
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
+++ b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
@@ -1,6 +1,6 @@
---- xorg-server-1.9.3.orig/hw/xfree86/os-support/linux/lnx_init.c	2010-09-28 19:17:31.000000000 +0200
-+++ xorg-server-1.9.3/hw/xfree86/os-support/linux/lnx_init.c	2012-10-01 16:32:57.000000000 +0200
-@@ -95,8 +95,8 @@ xf86OpenConsole(void)
+--- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_init.c	2012-05-17 19:09:03.000000000 +0200
++++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_init.c	2013-04-30 10:33:00.000000000 +0200
+@@ -75,8 +75,8 @@ xf86OpenConsole(void)
      struct vt_mode VT;
      struct vt_stat vts;
      MessageType from = X_PROBED;
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
index c6cd39636..4dbf01589 100644
--- 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
@@ -1,8 +1,6 @@
-	Enable the ioBase mapping code for mips, too. This is needed by
-	xf86-video-siliconmotion.
---- xorg-server-1.9.3.orig/hw/xfree86/os-support/linux/lnx_video.c	2010-11-23 20:07:26.000000000 +0100
-+++ xorg-server-1.9.3/hw/xfree86/os-support/linux/lnx_video.c	2012-10-01 13:23:55.000000000 +0200
-@@ -480,7 +480,7 @@ unmapVidMem(int ScreenNum, pointer Base,
+--- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_video.c	2012-05-17 19:09:03.000000000 +0200
++++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_video.c	2013-04-30 10:49:01.000000000 +0200
+@@ -472,7 +472,7 @@ unmapVidMem(int ScreenNum, pointer Base,
  /* I/O Permissions section                                                 */
  /***************************************************************************/
  
@@ -11,51 +9,48 @@
  volatile unsigned char *ioBase = NULL;
  
  #ifndef __NR_pciconfig_iobase
-@@ -492,7 +492,7 @@ volatile unsigned char *ioBase = NULL;
+@@ -484,7 +484,7 @@ volatile unsigned char *ioBase = NULL;
  Bool
  xf86EnableIO(void)
  {
 -#if defined(__powerpc__)
 +#if defined(__powerpc__) || defined(__mips__)
- 	int fd;
- 	unsigned int ioBase_phys;
+     int fd;
+     unsigned int ioBase_phys;
  #endif
-@@ -500,8 +500,12 @@ xf86EnableIO(void)
- 	if (ExtendedEnabled)
- 		return TRUE;
+@@ -492,8 +492,12 @@ xf86EnableIO(void)
+     if (ExtendedEnabled)
+         return TRUE;
  
 -#if defined(__powerpc__)
 +#if defined(__powerpc__) || defined(__mips__)
 +#ifdef __powerpc__
- 	ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
+     ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
 +#else
-+	ioBase_phys = 0x1fd00000;
-+#endif
++    ioBase_phys = 0x1fd00000;
++#endif	
  
- 	fd = open("/dev/mem", O_RDWR);
- 	if (ioBase == NULL) {
-@@ -517,9 +521,10 @@ xf86EnableIO(void)
- 		    return FALSE;
- 		}
+     fd = open("/dev/mem", O_RDWR);
+     if (ioBase == NULL) {
+@@ -511,7 +515,7 @@ xf86EnableIO(void)
  #endif
-+		xf86Msg(X_INFO,"ioBase 0x%lx\n", (unsigned long)ioBase);
- 	}
- 	close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__)
-         if (ioperm(0, 1024, 1) || iopl(3)) {
-                 if (errno == ENODEV)
-                         ErrorF("xf86EnableIOPorts: no I/O ports found\n");
-@@ -545,10 +550,10 @@ xf86DisableIO(void)
+     }
+     close(fd);
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
+     if (ioperm(0, 1024, 1) || iopl(3)) {
+         if (errno == ENODEV)
+             ErrorF("xf86EnableIOPorts: no I/O ports found\n");
+@@ -537,10 +541,10 @@ xf86DisableIO(void)
  {
- 	if (!ExtendedEnabled)
- 		return;
+     if (!ExtendedEnabled)
+         return;
 -#if defined(__powerpc__)
 +#if defined(__powerpc__) || defined(__mips__)
- 	munmap(ioBase, 0x20000);
- 	ioBase = NULL;
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__)
- 	iopl(0);
- 	ioperm(0, 1024, 0);
+     munmap(ioBase, 0x20000);
+     ioBase = NULL;
+-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
++#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
+     iopl(0);
+     ioperm(0, 1024, 0);
  #endif
diff --git a/package/xorg-server/patches/patch-ltmain_sh b/package/xorg-server/patches/patch-ltmain_sh
index 14906838e..eedadf67e 100644
--- a/package/xorg-server/patches/patch-ltmain_sh
+++ b/package/xorg-server/patches/patch-ltmain_sh
@@ -1,6 +1,6 @@
---- xorg-server-1.9.3.orig/ltmain.sh	2010-12-13 20:59:07.000000000 +0100
-+++ xorg-server-1.9.3/ltmain.sh	2011-01-24 17:03:34.000000000 +0100
-@@ -5840,7 +5840,7 @@ func_mode_link ()
+--- xorg-server-1.12.2.orig/ltmain.sh	2012-05-29 22:06:05.000000000 +0200
++++ xorg-server-1.12.2/ltmain.sh	2013-04-30 10:33:00.000000000 +0200
+@@ -5853,7 +5853,7 @@ func_mode_link ()
        # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
        -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
        -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \