Bug 1127 - libGL fails to build on Mac OS X 10.3.0-10.3.3
Summary: libGL fails to build on Mac OS X 10.3.0-10.3.3
Status: RESOLVED FIXED
Alias: None
Product: xorg
Classification: Unclassified
Component: Server/DDX/XQuartz (show other bugs)
Version: 6.8.0
Hardware: PowerPC Mac OS X (All)
: highest blocker
Assignee: Torrey T. Lyons
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 351
  Show dependency treegraph
 
Reported: 2004-08-18 12:34 UTC by Torrey T. Lyons
Modified: 2007-01-23 20:00 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments

Description Torrey T. Lyons 2004-08-18 12:34:49 UTC
There is an incorrect version test in the AppleDRI support for libGL. This causes libGL to fail to build on 
some versions of Panther. The following patch fixes this:

Index: apple/dri_dispatch.defs
===============================================================
====
RCS file: /cvs/xorg/xc/lib/GL/apple/dri_dispatch.defs,v
retrieving revision 1.4
diff -u -d -b -w -r1.4 dri_dispatch.defs
--- apple/dri_dispatch.defs     30 Jul 2004 01:35:31 -0000      1.4
+++ apple/dri_dispatch.defs     18 Aug 2004 19:26:48 -0000
@@ -782,7 +782,7 @@
 ;; endif
 (void MultiModeDrawArraysIBM -1 "const GLenum * mode, const GLint * first, const GLsizei * count, 
GLsizei primcount, GLint modestride")
 (void MultiModeDrawElementsIBM -1 "const GLenum * mode, const GLsizei * count, GLenum type, 
const GLvoid * const * indices, GLsizei primcount, GLint modestride")
-;; if MAC_OS_X_VERSION < 10.3.0
+;; if MAC_OS_X_VERSION < 10.3.4
 ;; (void BlendEquationSeparateEXT 458 "GLenum modeRGB, GLenum modeA" 
BlendEquationSeparateATI)
 ;; else
 (void BlendEquationSeparateEXT 458 "GLenum modeRGB, GLenum modeA")
Index: apple/dri_dispatch.h
===============================================================
====
RCS file: /cvs/xorg/xc/lib/GL/apple/dri_dispatch.h,v
retrieving revision 1.4
diff -u -d -b -w -r1.4 dri_dispatch.h
--- apple/dri_dispatch.h        30 Jul 2004 01:35:31 -0000      1.4
+++ apple/dri_dispatch.h        18 Aug 2004 19:26:48 -0000
@@ -3059,13 +3059,13 @@
     (void *rend, GLenum modeRGB, GLenum modeA),
     (modeRGB, modeA))
 
-#if OSVERSION < 700
+#if OSVERSION < 704
 
 DEFUN_ALIAS_VOID (BlendEquationSeparateEXT, BlendEquationSeparateATI,
     (GLenum modeRGB, GLenum modeA),
     (modeRGB, modeA))
 
-#endif  /* OSVERSION < 700 */
+#endif  /* OSVERSION < 704 */
 
 DEFUN_ALIAS_VOID (ArrayElementEXT, ArrayElement,
     (GLint i),
Comment 1 Kevin E. Martin 2004-08-18 16:13:47 UTC
Patch checked in.
Closing.


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.