Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339,

Harold L. Hunt II, Alexander Gottwald).
Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao,
    David Dawes).
Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson).
HP-PA build fix (Bug #828, Guy Martin, Paul Anderson).
Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine).
Fix attempt to read video ROM before enabling it (Bug #843, Ivan
    Kokshaysky, Mike A. Harris).
Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A.
    Harris).
Clarify xset man page description of how to use the keyboard repeat rate
    settings (Bug #846, Mike A. Harris).
Fix problem where print-screen key would get remapped to sys-req in certain
    keymaps, which broke GNOME printscreen functionality (Bug #847, Owen
    Taylor).
Fix several render problems:
- MMIO mode support
- Hang on IGP chips
- VT switching hang
- 3D render corruption (Bug #922, Hui Yu).

GL/glx/glxcmds.c

@@ -657,7 +657,8 @@ int DoMakeCurrent( __GLXclientState *cl,
 
     if (prevglxc) {
 	if (prevglxc->drawPixmap) {
-	    if (prevglxc->drawPixmap != prevglxc->readPixmap) {
+	    if (prevglxc->readPixmap &&
+		prevglxc->drawPixmap != prevglxc->readPixmap) {
 		/*
 		** The previous drawable was a glx pixmap, release it.
 		*/

hw/xfree86/common/xf86pciBus.c

@@ -424,7 +424,7 @@ FindPCIVideoInfo(void)
 	    if ((pcrp->pci_command & PCI_CMD_MEM_ENABLE) &&
 		(num == 1 ||
 		 ((info->class == PCI_CLASS_DISPLAY) &&
-		  (info->subclass == PCI_SUBCLASS_DISPLAY_MISC)))) {
+		  (info->subclass == PCI_SUBCLASS_DISPLAY_VGA)))) {
 		if (primaryBus.type == BUS_NONE) {
 		    primaryBus.type = BUS_PCI;
 		    primaryBus.id.pci.bus = pcrp->busnum;

include/servermd.h

@@ -153,7 +153,7 @@ SOFTWARE.
 
 #endif /* __arm32__ */
 
-#if defined (hpux)
+#if defined (hpux) || defined __hppa__
 
 #define IMAGE_BYTE_ORDER	MSBFirst
 #define BITMAP_BIT_ORDER	MSBFirst
@@ -165,7 +165,7 @@ SOFTWARE.
 #define LARGE_INSTRUCTION_CACHE
 #define PLENTIFUL_REGISTERS
 
-#endif /* hpux */
+#endif /* hpux || __hppa__ */
 
 #if defined(__powerpc__)