[92216] trunk/dports/x11/mesa
jeremyhu at macports.org
jeremyhu at macports.org
Sat Apr 21 23:20:46 PDT 2012
Revision: 92216
https://trac.macports.org/changeset/92216
Author: jeremyhu at macports.org
Date: 2012-04-21 23:20:46 -0700 (Sat, 21 Apr 2012)
Log Message:
-----------
mesa: Bump to 8.0.2
Modified Paths:
--------------
trunk/dports/x11/mesa/Portfile
Removed 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
Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile 2012-04-22 06:18:31 UTC (rev 92215)
+++ trunk/dports/x11/mesa/Portfile 2012-04-22 06:20:46 UTC (rev 92216)
@@ -5,7 +5,7 @@
name mesa
epoch 1
-version 8.0.1
+version 8.0.2
categories x11 graphics
maintainers jeremyhu openmaintainer
license MIT
@@ -18,9 +18,9 @@
platforms macosx darwin
use_bzip2 yes
master_sites ftp://ftp.freedesktop.org/pub/mesa/${version}/
-checksums sha1 1f7f37872b64b7b092677b594ec7bf90eb1586f2 \
- rmd160 958e610862bef2bcca6f9b8bb85a4d65a2eedb9c \
- sha256 593af02ea2b5b7afb057a12c550f2c03b1d1cf59a716972d601c1499545ea0a7
+checksums sha1 bbb55d81294425137ee66c7389fbb474a43c9ab9 \
+ rmd160 a7c4e396d82c890eed462fd45b433812f3fad045 \
+ sha256 8f4d1e70e058a65143e618a9daaf45f00fac04ae9464b35a8d9eeeef3fa5e2a5
depends_build bin:makedepend:makedepend \
bin:tclsh8.5:tcl
@@ -34,12 +34,6 @@
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}
Deleted: trunk/dports/x11/mesa/files/0001-darwin-config-file-cleanups.patch
===================================================================
--- trunk/dports/x11/mesa/files/0001-darwin-config-file-cleanups.patch 2012-04-22 06:18:31 UTC (rev 92215)
+++ trunk/dports/x11/mesa/files/0001-darwin-config-file-cleanups.patch 2012-04-22 06:20:46 UTC (rev 92216)
@@ -1,80 +0,0 @@
-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
-
Deleted: trunk/dports/x11/mesa/files/0002-darwin-Build-create_context.c.patch
===================================================================
--- trunk/dports/x11/mesa/files/0002-darwin-Build-create_context.c.patch 2012-04-22 06:18:31 UTC (rev 92215)
+++ trunk/dports/x11/mesa/files/0002-darwin-Build-create_context.c.patch 2012-04-22 06:20:46 UTC (rev 92216)
@@ -1,48 +0,0 @@
-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
-
Deleted: trunk/dports/x11/mesa/files/0003-darwin-Link-against-libxcb.patch
===================================================================
--- trunk/dports/x11/mesa/files/0003-darwin-Link-against-libxcb.patch 2012-04-22 06:18:31 UTC (rev 92215)
+++ trunk/dports/x11/mesa/files/0003-darwin-Link-against-libxcb.patch 2012-04-22 06:20:46 UTC (rev 92216)
@@ -1,27 +0,0 @@
-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
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120421/94af9c71/attachment.html>
More information about the macports-changes
mailing list