[47330] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Wed Feb 25 18:11:28 PST 2009
Revision: 47330
http://trac.macports.org/changeset/47330
Author: jeremyhu at macports.org
Date: 2009-02-25 18:11:27 -0800 (Wed, 25 Feb 2009)
Log Message:
-----------
xorg-server: Bump to 1.4.2-apple35 to pull in the DRI updates for the new libGL.
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/0001-X11-fonts-fontmod.h-doesn-t-exist-anymore.patch
trunk/dports/x11/xorg-server/files/tiger.indirect.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2009-02-26 02:08:27 UTC (rev 47329)
+++ trunk/dports/x11/xorg-server/Portfile 2009-02-26 02:11:27 UTC (rev 47330)
@@ -3,7 +3,7 @@
PortSystem 1.0
name xorg-server
-version 1.4.2-apple32
+version 1.4.2-apple35
categories x11 devel
maintainers jeremyhu openmaintainer
description The X.org / Xquartz X server.
@@ -18,10 +18,10 @@
distfiles xorg-server-$version.tar.bz2:xq \
MesaLib-${mesavers}.tar.bz2:mesa
-checksums xorg-server-1.4.2-apple32.tar.bz2 \
- md5 5e7a28a2b21e6d9308a7f7088ef2f3ae \
- sha1 9a12c5f9142ccfc60fa51921ea97cd693eec12ca \
- rmd160 3d7f7449ea5d3630689489c1adea20290cd1bbb4 \
+checksums xorg-server-1.4.2-apple35.tar.bz2 \
+ md5 eaa3daf89fda853c7d090a16a935f9c5 \
+ sha1 b6434d8ea3e6fbe81fea80cbbf7d82d48a1933b0 \
+ rmd160 ec53ba78de692505ac295819bd907f60f17915b5 \
MesaLib-7.0.4.tar.bz2 \
md5 8d7bacbe0234742a5d08c8088c4619e9 \
sha1 7e2ecbe89d245510d2681d04e959aee6adc205c5 \
@@ -65,8 +65,6 @@
port:xorg-libAppleWM \
port:xorg-libXfixes
-patchfiles tiger.indirect.patch 0001-X11-fonts-fontmod.h-doesn-t-exist-anymore.patch
-
post-patch {
reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
Deleted: trunk/dports/x11/xorg-server/files/0001-X11-fonts-fontmod.h-doesn-t-exist-anymore.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-X11-fonts-fontmod.h-doesn-t-exist-anymore.patch 2009-02-26 02:08:27 UTC (rev 47329)
+++ trunk/dports/x11/xorg-server/files/0001-X11-fonts-fontmod.h-doesn-t-exist-anymore.patch 2009-02-26 02:11:27 UTC (rev 47330)
@@ -1,29 +0,0 @@
-From bde1e3a7c9804d4bd1e4d2361360e4621386acd5 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp at keithp.com>
-Date: Wed, 18 Feb 2009 16:43:23 -0800
-Subject: [PATCH] X11/fonts/fontmod.h doesn't exist anymore.
-
-libXfont 1.4.0 no longer includes this file, nor do we need it, so just stop
-attempting to reference it.
-
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 4557b3f6c4273cd83b701beaf7a150c806fed298)
----
- hw/xfree86/loader/loaderProcs.h | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h
-index b71ad45..85c9109 100644
---- hw/xfree86/loader/loaderProcs.h
-+++ hw/xfree86/loader/loaderProcs.h
-@@ -56,7 +56,6 @@
- #undef IN_LOADER
- #define IN_LOADER
- #include "xf86Module.h"
--#include <X11/fonts/fontmod.h>
-
- typedef struct module_desc {
- struct module_desc *child;
---
-1.6.1.2
-
Deleted: trunk/dports/x11/xorg-server/files/tiger.indirect.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/tiger.indirect.patch 2009-02-26 02:08:27 UTC (rev 47329)
+++ trunk/dports/x11/xorg-server/files/tiger.indirect.patch 2009-02-26 02:11:27 UTC (rev 47330)
@@ -1,88 +0,0 @@
-diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
-index 504b637..c4e2824 100644
---- hw/xquartz/GL/indirect.c
-+++ hw/xquartz/GL/indirect.c
-@@ -37,6 +37,13 @@
-
- #include "dri.h"
-
-+#include <AvailabilityMacros.h>
-+
-+/*
-+ * These define seem questionable to me, but I'm not sure why they were here
-+ * in the first place.
-+ */
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
- #define GL_EXT_histogram 1
- #define GL_EXT_polygon_offset 1
- #define GL_SGIS_pixel_texture 1
-@@ -53,6 +60,7 @@
- #define GL_APPLE_fence 1
- #define GL_IBM_multimode_draw_arrays 1
- #define GL_EXT_fragment_shader 1
-+#endif
-
- #include <OpenGL/OpenGL.h>
- #include <OpenGL/CGLContext.h>
-@@ -1283,7 +1291,9 @@ static void setup_dispatch_table(void) {
- SET_BlendEquationSeparateEXT(disp, glBlendEquationSeparateEXT);
- SET_BlendFunc(disp, glBlendFunc);
- SET_BlendFuncSeparateEXT(disp, glBlendFuncSeparateEXT);
-+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- SET_BlitFramebufferEXT(disp, glBlitFramebufferEXT);
-+#endif
- SET_BufferDataARB(disp, glBufferDataARB);
- SET_BufferSubDataARB(disp, glBufferSubDataARB);
- SET_CallList(disp, glCallList);
-@@ -1340,12 +1350,16 @@ static void setup_dispatch_table(void) {
- SET_ColorTable(disp, glColorTable);
- SET_ColorTableParameterfv(disp, glColorTableParameterfv);
- SET_ColorTableParameteriv(disp, glColorTableParameteriv);
-+
-+
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
- SET_CombinerInputNV(disp, glCombinerInputNV);
- SET_CombinerOutputNV(disp, glCombinerOutputNV);
- SET_CombinerParameterfNV(disp, glCombinerParameterfNV);
- SET_CombinerParameterfvNV(disp, glCombinerParameterfvNV);
- SET_CombinerParameteriNV(disp, glCombinerParameteriNV);
- SET_CombinerParameterivNV(disp, glCombinerParameterivNV);
-+#endif
- SET_CompileShaderARB(disp, glCompileShaderARB);
- SET_CompressedTexImage1DARB(disp, glCompressedTexImage1DARB);
- SET_CompressedTexImage2DARB(disp, glCompressedTexImage2DARB);
-@@ -1423,7 +1437,10 @@ static void setup_dispatch_table(void) {
- SET_EvalPoint2(disp, glEvalPoint2);
- //SET_ExecuteProgramNV(disp, glExecuteProgramNV);
- SET_FeedbackBuffer(disp, glFeedbackBuffer);
-+
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
- SET_FinalCombinerInputNV(disp, glFinalCombinerInputNV);
-+#endif
- SET_Finish(disp, glFinish);
- SET_FinishFenceNV(disp, glFinishFenceAPPLE); // <-- APPLE -> NV
- SET_Flush(disp, glFlush);
-@@ -1465,10 +1482,12 @@ static void setup_dispatch_table(void) {
- SET_GetColorTable(disp, glGetColorTable);
- SET_GetColorTableParameterfv(disp, glGetColorTableParameterfv);
- SET_GetColorTableParameteriv(disp, glGetColorTableParameteriv);
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
- SET_GetCombinerInputParameterfvNV(disp, glGetCombinerInputParameterfvNV);
- SET_GetCombinerInputParameterivNV(disp, glGetCombinerInputParameterivNV);
- SET_GetCombinerOutputParameterfvNV(disp, glGetCombinerOutputParameterfvNV);
- SET_GetCombinerOutputParameterivNV(disp, glGetCombinerOutputParameterivNV);
-+#endif
- SET_GetCompressedTexImageARB(disp, glGetCompressedTexImageARB);
- SET_GetConvolutionFilter(disp, glGetConvolutionFilter);
- SET_GetConvolutionParameterfv(disp, glGetConvolutionParameterfv);
-@@ -1476,8 +1495,10 @@ static void setup_dispatch_table(void) {
- SET_GetDoublev(disp, glGetDoublev);
- SET_GetError(disp, glGetError);
- //SET_GetFenceivNV(disp, glGetFenceivNV);
-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
- SET_GetFinalCombinerInputParameterfvNV(disp, glGetFinalCombinerInputParameterfvNV);
- SET_GetFinalCombinerInputParameterivNV(disp, glGetFinalCombinerInputParameterivNV);
-+#endif
- SET_GetFloatv(disp, glGetFloatv);
- SET_GetFramebufferAttachmentParameterivEXT(disp, glGetFramebufferAttachmentParameterivEXT);
- SET_GetHandleARB(disp, glGetHandleARB);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090225/cca4dd5a/attachment.html>
More information about the macports-changes
mailing list