[52062] trunk/dports/x11/mesa
jeremyhu at macports.org
jeremyhu at macports.org
Tue Jun 9 00:54:07 PDT 2009
Revision: 52062
http://trac.macports.org/changeset/52062
Author: jeremyhu at macports.org
Date: 2009-06-09 00:54:06 -0700 (Tue, 09 Jun 2009)
Log Message:
-----------
mesa: Version bump to 7.4.2
Modified Paths:
--------------
trunk/dports/x11/mesa/Portfile
Removed Paths:
-------------
trunk/dports/x11/mesa/files/mesa-7.4-byte_order.patch
trunk/dports/x11/mesa/files/mesa-7.4-indirect.patch
trunk/dports/x11/mesa/files/mesa-7.4-x11dir.patch
Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile 2009-06-09 07:53:59 UTC (rev 52061)
+++ trunk/dports/x11/mesa/Portfile 2009-06-09 07:54:06 UTC (rev 52062)
@@ -4,8 +4,7 @@
PortSystem 1.0
name mesa
-version 7.4
-revision 1
+version 7.4.2
set ASGLX_version 57
categories x11 graphics
maintainers jeremyhu and.damore openmaintainer
@@ -26,14 +25,14 @@
master_sites sourceforge:mesa3d:mesa \
http://xquartz.macosforge.org/downloads/src/:xq
-checksums MesaLib-7.4.tar.bz2 \
- md5 7ecddb341a2691e0dfdb02f697109834 \
- sha1 66b5fe185e63706ee2a76e247fd982fdf13972e2 \
- rmd160 a3e601a5fbb482b4d9668d88a33592ea180170d5 \
- MesaGLUT-7.4.tar.bz2 \
- md5 04ec01caebde44f5b0d619f00716b368 \
- sha1 91a405b23b0b848325cc11fbffc0f62008d2a9a7 \
- rmd160 b02194f4a2049c40eb4d7e15b87bed20f5a45269 \
+checksums MesaLib-7.4.2.tar.bz2 \
+ md5 b10a76e32bde4645cfc34ea0416d7d8b \
+ sha1 fe70945ccf2c08d18ae4e83000018f0400352065 \
+ rmd160 e70b8fd203325e676d90485632bf266e39d46a7e \
+ MesaGLUT-7.4.2.tar.bz2 \
+ md5 e0dfc44d537904a030861e5b3c760c11 \
+ sha1 85f357345d71dfe60b785f0cbb03d1e070841c2d \
+ rmd160 caa69b7f2aa7136377cda2f690699415396c64ab \
AppleSGLX-57.tar.bz2 \
md5 7e81c6952030660874511090dd5b31da \
sha1 80e5eb5cc6e9b1352bef86b67a14e3f6f61ef522 \
@@ -57,10 +56,7 @@
patch.pre_args -p1
patchfiles \
- mesa-7.2-drm_headers.patch \
- mesa-7.4-x11dir.patch \
- mesa-7.4-byte_order.patch \
- mesa-7.4-indirect.patch
+ mesa-7.2-drm_headers.patch
build.target default
# PROGS="glxgears glxinfo"
Deleted: trunk/dports/x11/mesa/files/mesa-7.4-byte_order.patch
===================================================================
--- trunk/dports/x11/mesa/files/mesa-7.4-byte_order.patch 2009-06-09 07:53:59 UTC (rev 52061)
+++ trunk/dports/x11/mesa/files/mesa-7.4-byte_order.patch 2009-06-09 07:54:06 UTC (rev 52062)
@@ -1,16 +0,0 @@
-diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
-index 626806d..d17be37 100644
---- a/src/mesa/main/glheader.h
-+++ b/src/mesa/main/glheader.h
-@@ -145,7 +145,10 @@
- #if defined(__linux__)
- #include <byteswap.h>
- #define CPU_TO_LE32( x ) bswap_32( x )
--#else /*__linux__*/
-+#elif defined(__APPLE__)
-+#include <CoreFoundation/CFByteOrder.h>
-+#define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x )
-+#else /*__linux__ __APPLE__*/
- #include <sys/endian.h>
- #define CPU_TO_LE32( x ) bswap32( x )
- #endif /*__linux__*/
Deleted: trunk/dports/x11/mesa/files/mesa-7.4-indirect.patch
===================================================================
--- trunk/dports/x11/mesa/files/mesa-7.4-indirect.patch 2009-06-09 07:53:59 UTC (rev 52061)
+++ trunk/dports/x11/mesa/files/mesa-7.4-indirect.patch 2009-06-09 07:54:06 UTC (rev 52062)
@@ -1,220 +0,0 @@
-diff --git a/src/glx/x11/indirect.c b/src/glx/x11/indirect.c
-index 08d52ae..aea117e 100644
---- a/src/glx/x11/indirect.c
-+++ b/src/glx/x11/indirect.c
-@@ -5198,9 +5198,13 @@ glDeleteTexturesEXT(GLsizei n, const GLuint * textures)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_DeleteTextures(GET_DISPATCH(), (n, textures));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 4 + __GLX_PAD((n * 4));
-@@ -5266,9 +5270,13 @@ glGenTexturesEXT(GLsizei n, GLuint * textures)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GenTextures(GET_DISPATCH(), (n, textures));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 4;
-@@ -5328,9 +5336,13 @@ glIsTextureEXT(GLuint texture)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- return CALL_IsTexture(GET_DISPATCH(), (texture));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- GLboolean retval = (GLboolean) 0;
-@@ -5641,9 +5653,13 @@ glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid * table)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetColorTable(GET_DISPATCH(), (target, format, type, table));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- const __GLXattribute *const state = gc->client_state_private;
- Display *const dpy = gc->currentDpy;
-@@ -5714,10 +5730,14 @@ glGetColorTableParameterfvEXT(GLenum target, GLenum pname, GLfloat * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetColorTableParameterfv(GET_DISPATCH(),
- (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
-@@ -5784,10 +5804,14 @@ glGetColorTableParameterivEXT(GLenum target, GLenum pname, GLint * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetColorTableParameteriv(GET_DISPATCH(),
- (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
-@@ -6107,10 +6131,14 @@ gl_dispatch_stub_356(GLenum target, GLenum format, GLenum type,
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetConvolutionFilter(GET_DISPATCH(),
- (target, format, type, image));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- const __GLXattribute *const state = gc->client_state_private;
- Display *const dpy = gc->currentDpy;
-@@ -6182,10 +6210,14 @@ gl_dispatch_stub_357(GLenum target, GLenum pname, GLfloat * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetConvolutionParameterfv(GET_DISPATCH(),
- (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
-@@ -6252,10 +6284,14 @@ gl_dispatch_stub_358(GLenum target, GLenum pname, GLint * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetConvolutionParameteriv(GET_DISPATCH(),
- (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
-@@ -6329,10 +6365,14 @@ gl_dispatch_stub_361(GLenum target, GLboolean reset, GLenum format,
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetHistogram(GET_DISPATCH(),
- (target, reset, format, type, values));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- const __GLXattribute *const state = gc->client_state_private;
- Display *const dpy = gc->currentDpy;
-@@ -6403,9 +6443,13 @@ gl_dispatch_stub_362(GLenum target, GLenum pname, GLfloat * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetHistogramParameterfv(GET_DISPATCH(), (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
-@@ -6471,9 +6515,13 @@ gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetHistogramParameteriv(GET_DISPATCH(), (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
-@@ -6543,9 +6591,13 @@ gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format,
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, values));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- const __GLXattribute *const state = gc->client_state_private;
- Display *const dpy = gc->currentDpy;
-@@ -6614,9 +6666,13 @@ gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetMinmaxParameterfv(GET_DISPATCH(), (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
-@@ -6679,9 +6735,13 @@ gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params)
- {
- __GLXcontext *const gc = __glXGetCurrentContext();
-
-+#ifdef GLX_DIRECT_RENDERING
- if (gc->driContext) {
- CALL_GetMinmaxParameteriv(GET_DISPATCH(), (target, pname, params));
- } else {
-+#else
-+ {
-+#endif
- __GLXcontext *const gc = __glXGetCurrentContext();
- Display *const dpy = gc->currentDpy;
- const GLuint cmdlen = 8;
Deleted: trunk/dports/x11/mesa/files/mesa-7.4-x11dir.patch
===================================================================
--- trunk/dports/x11/mesa/files/mesa-7.4-x11dir.patch 2009-06-09 07:53:59 UTC (rev 52061)
+++ trunk/dports/x11/mesa/files/mesa-7.4-x11dir.patch 2009-06-09 07:54:06 UTC (rev 52062)
@@ -1,42 +0,0 @@
-diff --git a/configs/darwin b/configs/darwin
-index 77edf1a..f061500 100644
---- a/configs/darwin
-+++ b/configs/darwin
-@@ -6,6 +6,8 @@ CONFIG_NAME = darwin
-
- INSTALL_DIR = /usr/X11
-
-+X11_DIR = $(INSTALL_DIR)
-+
- # Compiler and flags
- CC = gcc
- CXX = gcc
-@@ -21,9 +23,9 @@ DEFINES = -D_DARWIN_C_SOURCE -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L \
- ARCH_FLAGS += $(RC_CFLAGS)
-
- CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing \
-- -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
-+ -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
- CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing \
-- -I$(INSTALL_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
-+ -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
-
- # Library names (actual file names)
- GL_LIB_NAME = libGL.dylib
-@@ -39,12 +41,12 @@ GLUT_LIB_GLOB = libglut.*dylib
- GLW_LIB_GLOB = libGLw.*dylib
- OSMESA_LIB_GLOB = libOSMesa.*dylib
-
--GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
-+GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
- OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
- GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
--GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext
--GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXt
--APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
-+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext
-+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt
-+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
-
- # omit glw lib for now:
- SRC_DIRS = glx/x11 mesa glu glut/glx
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090609/321fdcb3/attachment.html>
More information about the macports-changes
mailing list