[90884] trunk/dports/x11/mesa
jeremyhu at macports.org
jeremyhu at macports.org
Fri Mar 16 18:12:24 PDT 2012
Revision: 90884
https://trac.macports.org/changeset/90884
Author: jeremyhu at macports.org
Date: 2012-03-16 18:12:24 -0700 (Fri, 16 Mar 2012)
Log Message:
-----------
mesa: Bump to 8.0.1
Modified Paths:
--------------
trunk/dports/x11/mesa/Portfile
trunk/dports/x11/mesa/files/tiger-exports.patch
Added Paths:
-----------
trunk/dports/x11/mesa/files/0001-darwin-config-file-cleanups.patch
trunk/dports/x11/mesa/files/0002-darwin-Build-create_context.c.patch
trunk/dports/x11/mesa/files/0003-darwin-Link-against-libxcb.patch
trunk/dports/x11/mesa/files/iglx.patch
Removed Paths:
-------------
trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch
Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile 2012-03-17 01:12:09 UTC (rev 90883)
+++ trunk/dports/x11/mesa/Portfile 2012-03-17 01:12:24 UTC (rev 90884)
@@ -5,30 +5,23 @@
name mesa
epoch 1
-version 7.11.2
+version 8.0.1
categories x11 graphics
maintainers jeremyhu openmaintainer
-# GLUT license isn't clear, but is intended to be a permissive license:
-# see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=131997#71
-license MIT Permissive
+license MIT
description Mesa 3D Graphics Library
long_description Mesa is an open-source implementation of the OpenGL specification, a system for rendering interactive 3D graphics.
homepage http://mesa3d.sourceforge.net/
-distfiles MesaLib-${version}.tar.bz2 \
- MesaGLUT-${version}.tar.bz2
+distfiles MesaLib-${version}.tar.bz2
worksrcdir Mesa-${version}
platforms macosx darwin
use_bzip2 yes
-master_sites http://pkg.ylmf.com/sources/ \
- ftp://ftp.freedesktop.org/pub/mesa/${version}/
-checksums MesaLib-7.11.2.tar.bz2 \
- rmd160 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea \
- sha256 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357 \
- MesaGLUT-7.11.2.tar.bz2 \
- rmd160 bb2b140375aa13df79fcdb60a7ad0a63622dc531 \
- sha256 46b9fd1c261cbbd090a71ae1db328c37d2ff5118b83c38b8ebc8f150484e94f7
+master_sites ftp://ftp.freedesktop.org/pub/mesa/${version}/
+checksums sha1 1f7f37872b64b7b092677b594ec7bf90eb1586f2 \
+ rmd160 958e610862bef2bcca6f9b8bb85a4d65a2eedb9c \
+ sha256 593af02ea2b5b7afb057a12c550f2c03b1d1cf59a716972d601c1499545ea0a7
depends_build bin:makedepend:makedepend \
bin:tclsh8.5:tcl
@@ -42,6 +35,12 @@
use_configure no
use_parallel_build yes
+patch.pre_args -p1
+patchfiles \
+ 0001-darwin-config-file-cleanups.patch \
+ 0002-darwin-Build-create_context.c.patch \
+ 0003-darwin-Link-against-libxcb.patch
+
build.target darwin
build.args-append INSTALL_DIR=${prefix}
destroot.args-append INSTALL_DIR=${prefix}
@@ -87,7 +86,7 @@
}
variant iglx description {Install a libGL that uses your X11 server's indirect GLX path for rendering (the default is off which allows libGL to accelerate rendering using OpenGL.framework)} {
- patchfiles-append mesa-7.10.2-iglx.patch
+ patchfiles-append iglx.patch
}
variant python26 conflicts python27 description {Use python 2.6} {
Added: trunk/dports/x11/mesa/files/0001-darwin-config-file-cleanups.patch
===================================================================
--- trunk/dports/x11/mesa/files/0001-darwin-config-file-cleanups.patch (rev 0)
+++ trunk/dports/x11/mesa/files/0001-darwin-config-file-cleanups.patch 2012-03-17 01:12:24 UTC (rev 90884)
@@ -0,0 +1,80 @@
+From 485d1c491aabb30f29f52ec72842af2e6a649c6b Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 16 Mar 2012 17:01:01 -0700
+Subject: [PATCH 1/3] darwin: config file cleanups
+
+Set our default compiler based on what our installed XCode prefers
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 61f6aff5d9136c91ca4a16de04c7ae673e9433df)
+---
+ configs/darwin | 23 +++++++++++++----------
+ configs/darwin-fat-intel | 7 +++++++
+ 2 files changed, 20 insertions(+), 10 deletions(-)
+ create mode 100644 configs/darwin-fat-intel
+
+diff --git a/configs/darwin b/configs/darwin
+index e2ca70a..fe721d7 100644
+--- a/configs/darwin
++++ b/configs/darwin
+@@ -9,8 +9,8 @@ INSTALL_DIR = /usr/X11
+ X11_DIR = $(INSTALL_DIR)
+
+ # Compiler and flags
+-CC = gcc
+-CXX = g++
++CC = $(shell xcrun -find cc)
++CXX = $(shell xcrun -find c++)
+ PIC_FLAGS = -fPIC
+ DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
+ -DGLX_ALIAS_UNSUPPORTED \
+@@ -24,11 +24,14 @@ DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
+ # -DIN_DRI_DRIVER
+
+ ARCH_FLAGS += $(RC_CFLAGS)
++INCLUDE_FLAGS = -I$(INSTALL_DIR)/include -I$(X11_DIR)/include
++OPT_FLAGS = -g3 -gdwarf-2 -Os -ffast-math -fno-strict-aliasing
++WARN_FLAGS = -Wall -Wmissing-prototypes
+
+-CFLAGS = -ggdb3 -Os -Wall -Wmissing-prototypes -std=c99 -ffast-math -fno-strict-aliasing -fvisibility=hidden \
+- -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
+-CXXFLAGS = -ggdb3 -Os -Wall -fno-strict-aliasing -fvisibility=hidden \
+- -I$(INSTALL_DIR)/include -I$(X11_DIR)/include $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
++CFLAGS = -std=c99 -fvisibility=hidden \
++ $(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS)
++CXXFLAGS = -fvisibility=hidden \
++ $(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS)
+
+ # Library names (actual file names)
+ GL_LIB_NAME = lib$(GL_LIB).dylib
+@@ -44,10 +47,10 @@ GLW_LIB_GLOB = lib$(GLW_LIB).*dylib
+ OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
+ VG_LIB_GLOB = lib$(VG_LIB).*dylib
+
+-GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread
+-OSMESA_LIB_DEPS =
+-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt
++GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread $(EXTRA_LDFLAGS)
++OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS)
++GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS)
++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS)
+
+ SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu
+ GLU_DIRS = sgi
+diff --git a/configs/darwin-fat-intel b/configs/darwin-fat-intel
+new file mode 100644
+index 0000000..273ae3d
+--- /dev/null
++++ b/configs/darwin-fat-intel
+@@ -0,0 +1,7 @@
++# Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs for intel
++
++RC_CFLAGS=-arch i386 -arch x86_64
++
++include $(TOP)/configs/darwin
++
++CONFIG_NAME = darwin-fat-intel
+--
+1.7.9.2
+
Added: trunk/dports/x11/mesa/files/0002-darwin-Build-create_context.c.patch
===================================================================
--- trunk/dports/x11/mesa/files/0002-darwin-Build-create_context.c.patch (rev 0)
+++ trunk/dports/x11/mesa/files/0002-darwin-Build-create_context.c.patch 2012-03-17 01:12:24 UTC (rev 90884)
@@ -0,0 +1,48 @@
+From 63c8f7142c49007e9cb49ffcd73d85f8f4d71497 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 16 Mar 2012 17:03:54 -0700
+Subject: [PATCH 2/3] darwin: Build create_context.c
+
+Fixes a build regression from: 588042a8ec4ea91a952c07a0768516fd590758f4
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit f9e1295cffc3cf096611e193cca016326715e6ca)
+---
+ src/glx/apple/Makefile | 1 +
+ src/glx/create_context.c | 7 ++++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
+index 66e6658..dc64295 100644
+--- a/src/glx/apple/Makefile
++++ b/src/glx/apple/Makefile
+@@ -35,6 +35,7 @@ SOURCES = \
+ apple_xgl_api_stereo.c \
+ apple_xgl_api_viewport.c \
+ appledri.c \
++ ../create_context.c \
+ ../clientattrib.c \
+ ../compsize.c \
+ ../glxconfig.c \
+diff --git a/src/glx/create_context.c b/src/glx/create_context.c
+index 714f0e5..a1a55b3 100644
+--- a/src/glx/create_context.c
++++ b/src/glx/create_context.c
+@@ -80,8 +80,13 @@ glXCreateContextAttribsARB(Display *dpy, GLXFBConfig config,
+ &dummy_err);
+ }
+
+- if (gc == NULL)
++ if (gc == NULL) {
++#ifdef GLX_USE_APPLEGL
++ gc = applegl_create_context(psc, cfg, share, 0);
++#else
+ gc = indirect_create_context(psc, cfg, share, 0);
++#endif
++ }
+
+ gc->xid = xcb_generate_id(c);
+ gc->share_xid = (share != NULL) ? share->xid : 0;
+--
+1.7.9.2
+
Added: trunk/dports/x11/mesa/files/0003-darwin-Link-against-libxcb.patch
===================================================================
--- trunk/dports/x11/mesa/files/0003-darwin-Link-against-libxcb.patch (rev 0)
+++ trunk/dports/x11/mesa/files/0003-darwin-Link-against-libxcb.patch 2012-03-17 01:12:24 UTC (rev 90884)
@@ -0,0 +1,27 @@
+From d982036c3ae1350c60874f5c4ea13c1867ed1c2c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 16 Mar 2012 17:07:06 -0700
+Subject: [PATCH 3/3] darwin: Link against libxcb
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+(cherry picked from commit 90a51753c40465c1253c612e0fef2aef96441668)
+---
+ configs/darwin | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configs/darwin b/configs/darwin
+index fe721d7..721fbc7 100644
+--- a/configs/darwin
++++ b/configs/darwin
+@@ -47,7 +47,7 @@ GLW_LIB_GLOB = lib$(GLW_LIB).*dylib
+ OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
+ VG_LIB_GLOB = lib$(VG_LIB).*dylib
+
+-GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXext -lm -lpthread $(EXTRA_LDFLAGS)
++GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11-xcb -lxcb -lX11 -lXext $(EXTRA_LDFLAGS)
+ OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS)
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS)
+ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS)
+--
+1.7.9.2
+
Added: trunk/dports/x11/mesa/files/iglx.patch
===================================================================
--- trunk/dports/x11/mesa/files/iglx.patch (rev 0)
+++ trunk/dports/x11/mesa/files/iglx.patch 2012-03-17 01:12:24 UTC (rev 90884)
@@ -0,0 +1,21 @@
+--- Mesa-8.0.1/configs/darwin.orig 2012-03-16 17:35:29.000000000 -0700
++++ Mesa-8.0.1/configs/darwin 2012-03-16 17:36:21.000000000 -0700
+@@ -13,8 +13,7 @@ CC = $(shell xcrun -find cc)
+ CXX = $(shell xcrun -find c++)
+ PIC_FLAGS = -fPIC
+ DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
+- -DGLX_ALIAS_UNSUPPORTED \
+- -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
++ -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
+
+ # -DGLX_INDIRECT_RENDERING \
+
+@@ -52,7 +51,7 @@ OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS)
+ GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS)
+ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS)
+
+-SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu
++SRC_DIRS = glsl mapi/glapi mapi/vgapi glx mesa gallium glu
+ GLU_DIRS = sgi
+ DRIVER_DIRS = osmesa
+ #DRIVER_DIRS = dri
Deleted: trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch
===================================================================
--- trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch 2012-03-17 01:12:09 UTC (rev 90883)
+++ trunk/dports/x11/mesa/files/mesa-7.10.2-iglx.patch 2012-03-17 01:12:24 UTC (rev 90884)
@@ -1,23 +0,0 @@
-diff --git a/configs/darwin b/configs/darwin
-index 3cf1110..aa5a22c 100644
---- a/configs/darwin
-+++ b/configs/darwin
-@@ -13,8 +13,7 @@ CC = gcc
- CXX = g++
- PIC_FLAGS = -fPIC
- DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
-- -DGLX_ALIAS_UNSUPPORTED \
-- -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
-+ -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING
-
- # -DGLX_INDIRECT_RENDERING \
-
-@@ -54,7 +53,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X
- 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 = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx
-+SRC_DIRS = glsl mapi/glapi mapi/vgapi glx mesa gallium glu glut/glx
- GLU_DIRS = sgi
- DRIVER_DIRS = osmesa
- #DRIVER_DIRS = dri
Modified: trunk/dports/x11/mesa/files/tiger-exports.patch
===================================================================
--- trunk/dports/x11/mesa/files/tiger-exports.patch 2012-03-17 01:12:09 UTC (rev 90883)
+++ trunk/dports/x11/mesa/files/tiger-exports.patch 2012-03-17 01:12:24 UTC (rev 90884)
@@ -1,5 +1,5 @@
---- src/glu/sgi/glu.exports.darwin.orig
-+++ src/glu/sgi/glu.exports.darwin
+--- a/src/glu/sgi/glu.exports.darwin.orig
++++ b/src/glu/sgi/glu.exports.darwin
@@ -1,59 +1,59 @@
-_*gluBeginCurve
-_*gluBeginPolygon
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120316/a03f6301/attachment-0001.html>
More information about the macports-changes
mailing list