the fink patch for xorg

xorg.patch (text/plain), 5.01 KB, created by Michal Suchanek on 2005-12-26 06:13:55 UTC

diff -uNr xc-new/config/cf/darwin.cf xc/config/cf/darwin.cf
--- xc-new/config/cf/darwin.cf	2004-12-14 23:53:05.000000000 -0500
+++ xc/config/cf/darwin.cf	2005-05-17 15:01:40.000000000 -0400
@@ -160,7 +160,7 @@
  * The default cpp-3.3 that ships with Panther inserts spurious #pragmas,
  * so we use the 3.1-based version.
  */
-#if OSMajorVersion >= 7
+#if OSMajorVersion == 7
 # define CppCmd                 /usr/bin/cpp3
 # define StandardCppOptions     -traditional -D__GNUC__
 #else
diff -uNr xc-new/extras/freetype2/builds/unix/detect.mk xc/extras/freetype2/builds/unix/detect.mk
--- xc-new/extras/freetype2/builds/unix/detect.mk	2004-04-28 06:38:58.000000000 -0400
+++ xc/extras/freetype2/builds/unix/detect.mk	2005-05-17 15:01:41.000000000 -0400
@@ -20,7 +20,8 @@
   #
   is_unix := $(strip $(wildcard /sbin/init) \
                      $(wildcard /usr/sbin/init) \
-                     $(wildcard /hurd/auth))
+                     $(wildcard /hurd/auth) \
+                     $(wildcard /sbin/launchd))
   ifneq ($(is_unix),)
 
     PLATFORM := unix
diff -uNr xc-new/extras/freetype2/include/freetype/freetype.h xc/extras/freetype2/include/freetype/freetype.h
--- xc-new/extras/freetype2/include/freetype/freetype.h	2004-04-28 06:38:59.000000000 -0400
+++ xc/extras/freetype2/include/freetype/freetype.h	2005-05-17 15:01:43.000000000 -0400
@@ -17,11 +17,7 @@
 
 
 #ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error "  #include <ft2build.h>"
-#error "  #include FT_FREETYPE_H"
+#include <ft2build.h>
 #endif
 
 
diff -uNr xc-new/extras/freetype2/src/base/ftapi.c xc/extras/freetype2/src/base/ftapi.c
--- xc-new/extras/freetype2/src/base/ftapi.c	2003-11-14 11:48:24.000000000 -0500
+++ xc/extras/freetype2/src/base/ftapi.c	2005-05-17 15:01:43.000000000 -0400
@@ -118,4 +118,18 @@
   }
                    
 
+  FT_BASE_DEF( FT_Short )
+  FT_Get_Short( FT_Stream stream )
+  {
+    return FT_GET_SHORT();
+  }
+
+
+  FT_BASE_DEF( FT_Long )
+  FT_Get_Long( FT_Stream stream )
+  {
+    return FT_GET_LONG();
+  }
+
+
 /* END */
diff -uNr xc-new/extras/freetype2/src/truetype/ttinterp.c xc/extras/freetype2/src/truetype/ttinterp.c
--- xc-new/extras/freetype2/src/truetype/ttinterp.c	2004-04-28 06:39:07.000000000 -0400
+++ xc/extras/freetype2/src/truetype/ttinterp.c	2005-05-17 15:01:43.000000000 -0400
@@ -2474,7 +2474,7 @@
     W = Vx * Vx + Vy * Vy;
 
     /* Now, we want that Sqrt( W ) = 0x4000 */
-    /* Or 0x1000000 <= W < 0x1004000        */
+    /* Or 0x10000000 <= W < 0x10004000        */
 
     if ( Vx < 0 )
     {
@@ -2492,7 +2492,7 @@
     else
       S2 = FALSE;
 
-    while ( W < 0x1000000L )
+    while ( W < 0x10000000L )
     {
       /* We need to increase W by a minimal amount */
       if ( Vx < Vy )
@@ -2503,7 +2503,7 @@
       W = Vx * Vx + Vy * Vy;
     }
 
-    while ( W >= 0x1004000L )
+    while ( W >= 0x10004000L )
     {
       /* We need to decrease W by a minimal amount */
       if ( Vx < Vy )
diff -uNr xc-new/lib/GL/apple/dri_driver.h xc/lib/GL/apple/dri_driver.h
--- xc-new/lib/GL/apple/dri_driver.h	2004-04-23 14:43:09.000000000 -0400
+++ xc/lib/GL/apple/dri_driver.h	2005-05-17 15:02:22.000000000 -0400
@@ -40,6 +40,10 @@
 #include "Xthreads.h"
 #include <CoreGraphics/CoreGraphics.h>
 #include <OpenGL/OpenGL.h>
+#ifndef GL_TYPEDEFS_2_0
+#define GL_TYPEDEFS_2_0
+	typedef char GLchar;
+#endif
 #include <OpenGL/CGLContext.h>
 
 #ifdef GLX_DIRECT_RENDERING
diff -uNr xc-new/lib/GL/apple/dri_glx.c xc/lib/GL/apple/dri_glx.c
--- xc-new/lib/GL/apple/dri_glx.c	2004-07-27 16:23:58.000000000 -0400
+++ xc/lib/GL/apple/dri_glx.c	2005-05-17 15:01:43.000000000 -0400
@@ -51,7 +51,7 @@
 
 /* Apple OpenGL "driver" information. */
 static const char *__driDriverName = "apple";
-static const char __driConfigOptions[] = "";
+const char __driConfigOptions[] = "";
 static const int __driDriverMajor = 1;
 static const int __driDriverMinor = 0;
 static const int __driDriverPatch = 0;
diff -uNr xc-new/programs/Xserver/hw/darwin/darwinKeyboard.c xc/programs/Xserver/hw/darwin/darwinKeyboard.c
--- xc-new/programs/Xserver/hw/darwin/darwinKeyboard.c	2004-04-23 15:06:15.000000000 -0400
+++ xc/programs/Xserver/hw/darwin/darwinKeyboard.c	2005-05-17 15:01:43.000000000 -0400
@@ -64,7 +64,9 @@
 /* Define this to use Alt for Mode_switch. */
 #define ALT_IS_MODE_SWITCH 1
 
-#include <drivers/event_status_driver.h>
+#define __BEGIN_DECLS
+#define __END_DECLS
+#include <IOKit/hidsystem/event_status_driver.h>
 #include <IOKit/hidsystem/ev_keymap.h>
 #include <stdio.h>
 #include <stdlib.h>
diff -uNr xc-new/programs/Xserver/hw/darwin/quartz/applewmExt.h xc/programs/Xserver/hw/darwin/quartz/applewmExt.h
--- xc-new/programs/Xserver/hw/darwin/quartz/applewmExt.h	2004-04-23 15:15:17.000000000 -0400
+++ xc/programs/Xserver/hw/darwin/quartz/applewmExt.h	2005-05-17 15:01:43.000000000 -0400
@@ -59,8 +59,6 @@
     FrameDrawProc FrameDraw;
 } AppleWMProcsRec, *AppleWMProcsPtr;
 
-extern AppleWMProcsPtr appleWMProcs;
-
 void AppleWMExtensionInit(
     AppleWMProcsPtr procsPtr
 );