Ticket #5959: xorg-port.patch

File xorg-port.patch, 7.5 KB (added by michael_six@…, 18 years ago)

Patch to the main xorg folder with the Portfile in it

  • CVS/Entries 

    diff -Naur xorg/CVS/Entries xorg.new/CVS/Entries
    old new  
    1 /Portfile/1.5/Sat Feb 12 05:12:51 2005//
    2 D

  • CVS/Repository 

    diff -Naur xorg/CVS/Repository xorg.new/CVS/Repository
    old new  
    1 proj/darwinports/dports/x11/xorg

  • CVS/Root 

    diff -Naur xorg/CVS/Root xorg.new/CVS/Root
    old new  
    1 :pserver:anonymous@anoncvs.opendarwin.org:/Volumes/src/cvs/od

  • CVS/Template 

    diff -Naur xorg/CVS/Template xorg.new/CVS/Template
    old new  
    1 Bug:           
    2 Submitted by:   
    3 Reviewed by:   
    4 Approved by:   
    5 Obtained from: 
    6 CVS: ----------------------------------------------------------------------
    7 CVS: Bug:             Fill this in if a Bugzilla bug is affected by the change.
    8 CVS: Submitted by:    Fill this in if someone else sent in the change.
    9 CVS: Reviewed by:     Fill this in if someone else reviewed your modification.
    10 CVS: Approved by:     Fill this in if you needed approval for this commit.
    11 CVS: Obtained from:   Fill this in if the change is from third party software.

  • Portfile 

    diff -Naur xorg/Portfile xorg.new/Portfile
    old new  
    44name            xorg
    55version         X11R6.8.2
    66categories      x11
    7 maintainers     waqar@opendarwin.org
     7maintainers     darwinports@opendarwin.org
    88description     The X Window System
    99long_description        \
    1010        X11, or X, is a vendor-neutral, system-architecture neutral     \
    … …  
    2828                sha1 632e25a202bc41bb9b1c5dbc8bbb0d775c6593b0
    2929
    3030worksrcdir      xc
    31 configure       {
    32         set cfpath ${worksrcpath}/config/cf
    33         file copy -force ${cfpath}/xorgsite.def ${cfpath}/host.def
     31patchfiles      xorg.patch
     32configure {
     33                set cfpath ${worksrcpath}/config/cf
     34                file copy -force ${cfpath}/xorgsite.def ${cfpath}/host.def
    3435}
    3536
    3637build.target    World
    37 destroot.target install install.man
     38destroot.target install install.man
    3839
    3940variant darwin  {
    4041        pre-configure {
    … …  
    4950        }
    5051}
    5152
     53platform darwin 8 {
     54        build.env       "CPP=/usr/bin/g++-3.3 \
     55                                CC=/usr/bin/gcc-3.3"
     56        pre-configure {
     57                set hw ${worksrcpath}/programs/Xserver/hw
     58                reinplace "s|/Applications|/Applications/DarwinPorts|g" \
     59                        ${hw}/darwin/quartz/Imakefile   \
     60                        ${hw}/darwin/quartz/XDarwinStartup.man \
     61                        ${hw}/xfree86/doc/README.Darwin \
     62                        ${hw}/xfree86/doc/sgml/Darwin.sgml \
     63                        ${hw}/xfree86/etc/bindist/Darwin-ppc/quartz-list \
     64                        ${worksrcpath}/programs/Xserver/Imakefile \
     65        }
     66}
     67
    5268variant puredarwin {
    5369        post-configure      {
    5470                set hostfd [open "${worksrcpath}/config/cf/host.def" w+]
    … …  
    5975                close $hostfd
    6076        }
    6177}
    62 

  • files/xorg.patch 

    diff -Naur xorg/files/xorg.patch xorg.new/files/xorg.patch
    old new  
     1--- config/cf/darwin.cf.orig    2004-12-14 23:53:05.000000000 -0500
     2+++ config/cf/darwin.cf 2005-05-17 15:01:40.000000000 -0400
     3@@ -160,7 +160,7 @@
     4  * The default cpp-3.3 that ships with Panther inserts spurious #pragmas,
     5  * so we use the 3.1-based version.
     6  */
     7-#if OSMajorVersion >= 7
     8+#if OSMajorVersion == 7
     9 # define CppCmd                 /usr/bin/cpp3
     10 # define StandardCppOptions     -traditional -D__GNUC__
     11 #else
     12--- extras/freetype2/builds/unix/detect.mk.orig 2004-04-28 06:38:58.000000000 -0400
     13+++ extras/freetype2/builds/unix/detect.mk      2005-05-17 15:01:41.000000000 -0400
     14@@ -20,7 +20,8 @@
     15   #
     16   is_unix := $(strip $(wildcard /sbin/init) \
     17                      $(wildcard /usr/sbin/init) \
     18-                     $(wildcard /hurd/auth))
     19+                     $(wildcard /hurd/auth) \
     20+                     $(wildcard /sbin/launchd))
     21   ifneq ($(is_unix),)
     22 
     23     PLATFORM := unix
     24--- extras/freetype2/include/freetype/freetype.h.orig   2004-04-28 06:38:59.000000000 -0400
     25+++ extras/freetype2/include/freetype/freetype.h        2005-05-17 15:01:43.000000000 -0400
     26@@ -17,11 +17,7 @@
     27 
     28 
     29 #ifndef FT_FREETYPE_H
     30-#error "`ft2build.h' hasn't been included yet!"
     31-#error "Please always use macros to include FreeType header files."
     32-#error "Example:"
     33-#error "  #include <ft2build.h>"
     34-#error "  #include FT_FREETYPE_H"
     35+#include <ft2build.h>
     36 #endif
     37 
     38 
     39--- extras/freetype2/src/base/ftapi.c.orig      2003-11-14 11:48:24.000000000 -0500
     40+++ extras/freetype2/src/base/ftapi.c   2005-05-17 15:01:43.000000000 -0400
     41@@ -118,4 +118,18 @@
     42   }
     43                   
     44 
     45+  FT_BASE_DEF( FT_Short )
     46+  FT_Get_Short( FT_Stream stream )
     47+  {
     48+    return FT_GET_SHORT();
     49+  }
     50+
     51+
     52+  FT_BASE_DEF( FT_Long )
     53+  FT_Get_Long( FT_Stream stream )
     54+  {
     55+    return FT_GET_LONG();
     56+  }
     57+
     58+
     59 /* END */
     60--- extras/freetype2/src/truetype/ttinterp.c.orig       2004-04-28 06:39:07.000000000 -0400
     61+++ extras/freetype2/src/truetype/ttinterp.c    2005-05-17 15:01:43.000000000 -0400
     62@@ -2474,7 +2474,7 @@
     63     W = Vx * Vx + Vy * Vy;
     64 
     65     /* Now, we want that Sqrt( W ) = 0x4000 */
     66-    /* Or 0x1000000 <= W < 0x1004000        */
     67+    /* Or 0x10000000 <= W < 0x10004000        */
     68 
     69     if ( Vx < 0 )
     70     {
     71@@ -2492,7 +2492,7 @@
     72     else
     73       S2 = FALSE;
     74 
     75-    while ( W < 0x1000000L )
     76+    while ( W < 0x10000000L )
     77     {
     78       /* We need to increase W by a minimal amount */
     79       if ( Vx < Vy )
     80@@ -2503,7 +2503,7 @@
     81       W = Vx * Vx + Vy * Vy;
     82     }
     83 
     84-    while ( W >= 0x1004000L )
     85+    while ( W >= 0x10004000L )
     86     {
     87       /* We need to decrease W by a minimal amount */
     88       if ( Vx < Vy )
     89diff -uNr xc-new/lib/GL/apple/dri_driver.h xc/lib/GL/apple/dri_driver.h
     90--- lib/GL/apple/dri_driver.h.orig      2004-04-23 14:43:09.000000000 -0400
     91+++ lib/GL/apple/dri_driver.h   2005-05-17 15:02:22.000000000 -0400
     92@@ -40,6 +40,10 @@
     93 #include "Xthreads.h"
     94 #include <CoreGraphics/CoreGraphics.h>
     95 #include <OpenGL/OpenGL.h>
     96+#ifndef GL_TYPEDEFS_2_0
     97+#define GL_TYPEDEFS_2_0
     98+       typedef char GLchar;
     99+#endif
     100 #include <OpenGL/CGLContext.h>
     101 
     102 #ifdef GLX_DIRECT_RENDERING
     103--- lib/GL/apple/dri_glx.c.orig 2004-07-27 16:23:58.000000000 -0400
     104+++ lib/GL/apple/dri_glx.c      2005-05-17 15:01:43.000000000 -0400
     105@@ -51,7 +51,7 @@
     106 
     107 /* Apple OpenGL "driver" information. */
     108 static const char *__driDriverName = "apple";
     109-static const char __driConfigOptions[] = "";
     110+const char __driConfigOptions[] = "";
     111 static const int __driDriverMajor = 1;
     112 static const int __driDriverMinor = 0;
     113 static const int __driDriverPatch = 0;
     114--- programs/Xserver/hw/darwin/darwinKeyboard.c.orig    2004-04-23 15:06:15.000000000 -0400
     115+++ programs/Xserver/hw/darwin/darwinKeyboard.c 2005-05-17 15:01:43.000000000 -0400
     116@@ -64,7 +64,9 @@
     117 /* Define this to use Alt for Mode_switch. */
     118 #define ALT_IS_MODE_SWITCH 1
     119 
     120-#include <drivers/event_status_driver.h>
     121+#define __BEGIN_DECLS
     122+#define __END_DECLS
     123+#include <IOKit/hidsystem/event_status_driver.h>
     124 #include <IOKit/hidsystem/ev_keymap.h>
     125 #include <stdio.h>
     126 #include <stdlib.h>
     127--- programs/Xserver/hw/darwin/quartz/applewmExt.h.orig 2004-04-23 15:15:17.000000000 -0400
     128+++ programs/Xserver/hw/darwin/quartz/applewmExt.h      2005-05-17 15:01:43.000000000 -0400
     129@@ -59,8 +59,6 @@
     130     FrameDrawProc FrameDraw;
     131 } AppleWMProcsRec, *AppleWMProcsPtr;
     132 
     133-extern AppleWMProcsPtr appleWMProcs;
     134-
     135 void AppleWMExtensionInit(
     136     AppleWMProcsPtr procsPtr
     137 );