[56456] trunk/dports/x11/xorg-server

[jeremyhu at macports.org]

Revision: 56456
          http://trac.macports.org/changeset/56456
Author:   jeremyhu at macports.org
Date:     2009-08-27 21:17:48 -0700 (Thu, 27 Aug 2009)
Log Message:
-----------
xorg-server: Added a patch to fix compilation on tiger/ppc ... Ticket #20638

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile

Added Paths:
-----------
    trunk/dports/x11/xorg-server/files/xorg-tiger-ppc.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile	2009-08-28 01:53:38 UTC (rev 56455)
+++ trunk/dports/x11/xorg-server/Portfile	2009-08-28 04:17:48 UTC (rev 56456)
@@ -63,7 +63,7 @@
 	port:xorg-libAppleWM \
 	port:xorg-libXfixes
 
-patchfiles nuke-old-extensions.patch xextproto.patch tiger.patch
+patchfiles nuke-old-extensions.patch xextproto.patch tiger.patch xorg-tiger-ppc.patch
 patch.args -p1
 
 use_autoreconf yes

Added: trunk/dports/x11/xorg-server/files/xorg-tiger-ppc.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/xorg-tiger-ppc.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-server/files/xorg-tiger-ppc.patch	2009-08-28 04:17:48 UTC (rev 56456)
@@ -0,0 +1,92 @@
+diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
+index f080067..f9d69f7 100644
+--- a/hw/xquartz/GL/indirect.c
++++ b/hw/xquartz/GL/indirect.c
+@@ -44,6 +44,87 @@
+ #include <OpenGL/OpenGL.h>
+ #include <OpenGL/CGLContext.h>
+ 
++/* These next few GL_EXT pre-processing blocks are to explicitly define 
++ * these symbols to 0 if they are not set by OpenGL.framework.  This
++ * prevents the X11 glext.h from setting them to 1.
++ */
++
++#ifndef GL_EXT_fragment_shader
++#define GL_EXT_fragment_shader 0
++#endif
++
++#ifndef GL_EXT_blend_equation_separate
++#define GL_EXT_blend_equation_separate 0
++#endif
++
++#ifndef GL_EXT_blend_func_separate
++#define GL_EXT_blend_func_separate 0
++#endif
++
++#ifndef GL_EXT_depth_bounds_test
++#define GL_EXT_depth_bounds_test 0
++#endif
++
++#ifndef GL_EXT_compiled_vertex_array
++#define GL_EXT_compiled_vertex_array 0
++#endif
++
++#ifndef GL_EXT_cull_vertex
++#define GL_EXT_cull_vertex 0
++#endif
++
++#ifndef GL_EXT_fog_coord
++#define GL_EXT_fog_coord 0
++#endif
++
++#ifndef GL_EXT_framebuffer_blit
++#define GL_EXT_framebuffer_blit 0
++#endif
++
++#ifndef GL_EXT_framebuffer_object
++#define GL_EXT_framebuffer_object 0
++#endif
++
++#ifndef GL_EXT_gpu_program_parameters
++#define GL_EXT_gpu_program_parameters 0
++#endif
++
++#ifndef GL_EXT_multi_draw_arrays
++#define GL_EXT_multi_draw_arrays 0
++#endif
++
++#ifndef GL_EXT_point_parameters
++#define GL_EXT_point_parameters 0
++#endif
++
++#ifndef GL_EXT_polygon_offset
++#define GL_EXT_polygon_offset 0
++#endif
++
++#ifndef GL_EXT_secondary_color
++#define GL_EXT_secondary_color 0
++#endif
++
++#ifndef GL_EXT_stencil_two_side
++#define GL_EXT_stencil_two_side 0
++#endif
++
++#ifndef GL_EXT_timer_query
++#define GL_EXT_timer_query 0
++#endif
++
++#ifndef GL_EXT_vertex_array
++#define GL_EXT_vertex_array 0
++#endif
++
++/* Tiger PPC doesn't have the associated symbols, but glext.h says it does.  Liars!
++ * http://trac.macports.org/ticket/20638
++ */
++#if defined(__ppc__) && MAC_OS_X_VERSION_MIN_REQUIRED == 1040
++#undef GL_EXT_gpu_program_parameters
++#define GL_EXT_gpu_program_parameters 0
++#endif
++
+ #include <GL/glxproto.h>
+ #include <windowstr.h>
+ #include <resource.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090827/677e067f/attachment-0001.html>