[72724] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Sun Oct 24 21:23:04 PDT 2010
Revision: 72724
http://trac.macports.org/changeset/72724
Author: jeremyhu at macports.org
Date: 2010-10-24 21:23:02 -0700 (Sun, 24 Oct 2010)
Log Message:
-----------
xorg-server: Bump to 1.9.1
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
trunk/dports/x11/xorg-server/files/0011-fb-Revert-fb-changes-that-broke-XQuartz.patch
Added Paths:
-----------
trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch
trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch
trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch
trunk/dports/x11/xorg-server/files/0004-rootless-Adjust-the-frame-size-of-the-native-root-wi.patch
trunk/dports/x11/xorg-server/files/0005-XQuartz-Bump-bundle-version-to-2.5.2.patch
trunk/dports/x11/xorg-server/files/0006-XQuartz-GL-Fix-__glXAquaScreenCreateDrawable-prototy.patch
trunk/dports/x11/xorg-server/files/0007-XQuartz-GLX-Don-t-mangle-__GLXDrawable-s-pDraw.patch
trunk/dports/x11/xorg-server/files/0008-XQuartz-xpbproxy-Don-t-take-down-the-whole-server-on.patch
trunk/dports/x11/xorg-server/files/0009-XQuartz-Bump-bundle-version-to-2.5.3.patch
trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/Portfile 2010-10-25 04:23:02 UTC (rev 72724)
@@ -5,8 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.8.2
-revision 2
+version 1.9.1
categories x11 devel
maintainers jeremyhu openmaintainer
description The X.org / Xquartz X server.
@@ -20,9 +19,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums md5 c4156e3e71123a54413e629f4806fc71 \
- sha1 825d11757b729444800e0a3afd4e98d19d286b1a \
- rmd160 dee713fe677fdcccc0fec29a02b0af4ef48819f2
+checksums md5 64f2a021667ac3a2bc007f2567170f03 \
+ sha1 48384349fb598ece532452ae42bff3a176504e16 \
+ rmd160 cef01a6c9033d6f0adb740d04618e5642c597f71
use_bzip2 yes
use_parallel_build yes
@@ -48,14 +47,8 @@
port:xorg-xextproto \
port:xorg-xineramaproto \
port:xorg-xtrans \
- port:autoconf \
- port:automake \
- port:libtool \
- port:xorg-util-macros \
- port:doxygen
+ port:xorg-util-macros
-depends_skip_archcheck doxygen
-
# This xinit dependency needs to be port: not bin: because we specifically run ${prefix}/bin/startx from bundle-main.c
depends_run \
port:xinit \
@@ -73,6 +66,10 @@
configure.args --with-apple-applications-dir=${applications_dir} \
--with-launchd-id-prefix=org.macports \
--without-dtrace \
+ --without-doxygen \
+ --without-fop \
+ --without-xmlto \
+ --disable-devel-docs \
--with-sha1=CommonCrypto
# GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
@@ -82,20 +79,14 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch \
- 0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch \
- 0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch \
- 0004-rootless-Adjust-the-frame-size-of-the-native-root-wi.patch \
- 0005-XQuartz-Bump-bundle-version-to-2.5.2.patch \
- 0006-XQuartz-GL-Fix-__glXAquaScreenCreateDrawable-prototy.patch \
- 0007-XQuartz-GLX-Don-t-mangle-__GLXDrawable-s-pDraw.patch \
- 0008-XQuartz-xpbproxy-Don-t-take-down-the-whole-server-on.patch \
- 0009-XQuartz-Bump-bundle-version-to-2.5.3.patch \
- 0010-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
+ 0010-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch \
0011-fb-Revert-fb-changes-that-broke-XQuartz.patch
patch.pre_args -p1
+#use_autoreconf yes
+#autoreconf.args -fvi
+
build.args V=1
post-destroot {
@@ -108,3 +99,33 @@
configure.cppflags-append -I${filespath}/include
}
}
+
+variant docs description "Install extra documentation" {
+ depends_build-append \
+ port:doxygen \
+ port:fop \
+ port:xmlto \
+ port:xorg-sgml-doctools
+
+ depends_skip_archcheck-append \
+ doxygen \
+ fop \
+ xmlto
+
+ configure.args-delete \
+ --without-doxygen \
+ --without-fop \
+ --without-xmlto \
+ --disable-devel-docs
+
+ configure.args-append \
+ --with-doxygen \
+ --with-fop \
+ --with-xmlto \
+ --enable-devel-docs
+
+ configure.env-append \
+ DOXYGEN="${prefix}/bin/doxygen" \
+ FOP="${prefix}/bin/fop" \
+ XMLTO="${prefix}/bin/xmlto"
+}
Deleted: trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0001-OS-support-fix-writeable-client-vs-IgnoreClient-beha.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,68 +0,0 @@
-From 665aa7ce8645b50b888db32ebab4e192dbe00649 Mon Sep 17 00:00:00 2001
-From: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date: Wed, 30 Jun 2010 07:59:04 -0700
-Subject: [PATCH 01/11] OS support: fix writeable client vs IgnoreClient behavior
-
-When ResetCurrentRequest is called, or IgnoreClient is called when a
-client has input pending, IgnoredClientsWithInput will be set. However,
-a subsequent IgnoreClient request will clear the client fd from that fd
-set, potentially causing the client to hang.
-
-So add an Ignore/Attend count, and only apply the ignore logic on the
-first ignore and the attend logic on the last attend. This is
-consistent with the comments for these functions; callers must pair
-them.
-
-Fixes https://bugs.freedesktop.org/show_bug.cgi?id=27035.
-
-Reviewed-by: Keith Packard <keithp at keithp.com>
-Reviewed-by: Daniel Stone <daniel at fooishbar.org>
-Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
-Signed-off-by: Keith Packard <keithp at keithp.com>
----
- include/dixstruct.h | 1 +
- os/connection.c | 9 +++++++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
-
-diff --git xorg-server-1.8.2/include/dixstruct.h xorg-server-1.8.2/include/dixstruct.h
-index 696b793..568ea1f 100644
---- xorg-server-1.8.2/include/dixstruct.h
-+++ xorg-server-1.8.2/include/dixstruct.h
-@@ -99,6 +99,7 @@ typedef struct _Client {
- int clientGone;
- int noClientException; /* this client died or needs to be
- * killed */
-+ int ignoreCount; /* count for Attend/IgnoreClient */
- SaveSetElt *saveSet;
- int numSaved;
- void *unused_screenPrivate[16];
-diff --git xorg-server-1.8.2/os/connection.c xorg-server-1.8.2/os/connection.c
-index 61ba72a..3178b7e 100644
---- xorg-server-1.8.2/os/connection.c
-+++ xorg-server-1.8.2/os/connection.c
-@@ -1147,6 +1147,10 @@ IgnoreClient (ClientPtr client)
- OsCommPtr oc = (OsCommPtr)client->osPrivate;
- int connection = oc->fd;
-
-+ client->ignoreCount++;
-+ if (client->ignoreCount > 1)
-+ return;
-+
- isItTimeToYield = TRUE;
- if (!GrabInProgress || FD_ISSET(connection, &AllClients))
- {
-@@ -1181,6 +1185,11 @@ AttendClient (ClientPtr client)
- {
- OsCommPtr oc = (OsCommPtr)client->osPrivate;
- int connection = oc->fd;
-+
-+ client->ignoreCount--;
-+ if (client->ignoreCount)
-+ return;
-+
- if (!GrabInProgress || GrabInProgress == client->index ||
- FD_ISSET(connection, &GrabImperviousClients))
- {
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0002-dixstruct-make-ignoreCount-change-more-ABI-friendly.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,36 +0,0 @@
-From 090d26723f7cdbb3aebfe212170b7f81c163dd7b Mon Sep 17 00:00:00 2001
-From: Jesse Barnes <jbarnes at virtuousgeek.org>
-Date: Thu, 8 Jul 2010 09:08:51 -0700
-Subject: [PATCH 02/11] dixstruct: make ignoreCount change more ABI friendly
-
-Move ignoreCount to the bottom of the ClientRec where it should have
-less impact on the ABI.
-
-Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
----
- include/dixstruct.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.8.2/include/dixstruct.h xorg-server-1.8.2/include/dixstruct.h
-index 568ea1f..5d24f0d 100644
---- xorg-server-1.8.2/include/dixstruct.h
-+++ xorg-server-1.8.2/include/dixstruct.h
-@@ -99,7 +99,6 @@ typedef struct _Client {
- int clientGone;
- int noClientException; /* this client died or needs to be
- * killed */
-- int ignoreCount; /* count for Attend/IgnoreClient */
- SaveSetElt *saveSet;
- int numSaved;
- void *unused_screenPrivate[16];
-@@ -125,6 +124,7 @@ typedef struct _Client {
- long smart_check_tick;
-
- DeviceIntPtr clientPtr;
-+ int ignoreCount; /* count for Attend/IgnoreClient */
- } ClientRec;
-
- /*
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0003-XQuartz-Avoid-a-crash-when-mistakenly-free-ing-in-Qu.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,52 +0,0 @@
-From 9168c63e275767c728afe7b2bba8bc391aceeeb8 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Tue, 13 Jul 2010 08:25:27 -0700
-Subject: [PATCH 03/11] XQuartz: Avoid a crash when mistakenly free()ing in QuartzSetCursor on some configs
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit 648d189548530fa23d97d1e8737f89d297f1c443)
----
- hw/xquartz/xpr/xprCursor.c | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c
-index fbaf825..95eaed9 100644
---- xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c
-+++ xorg-server-1.8.2/hw/xquartz/xpr/xprCursor.c
-@@ -68,6 +68,7 @@ static Bool
- load_cursor(CursorPtr src, int screen)
- {
- uint32_t *data;
-+ Bool free_data = FALSE;
- uint32_t rowbytes;
- int width, height;
- int hot_x, hot_y;
-@@ -96,6 +97,7 @@ load_cursor(CursorPtr src, int screen)
- unsigned i;
- rowbytes = src->bits->width * sizeof (CARD32);
- data = xalloc(rowbytes * src->bits->height);
-+ free_data = TRUE;
- if(!data) {
- FatalError("Failed to allocate memory in %s\n", __func__);
- }
-@@ -122,6 +124,7 @@ load_cursor(CursorPtr src, int screen)
- /* round up to 8 pixel boundary so we can convert whole bytes */
- rowbytes = ((src->bits->width * 4) + 31) & ~31;
- data = xalloc(rowbytes * src->bits->height);
-+ free_data = TRUE;
- if(!data) {
- FatalError("Failed to allocate memory in %s\n", __func__);
- }
-@@ -174,7 +177,8 @@ load_cursor(CursorPtr src, int screen)
- }
-
- err = xp_set_cursor(width, height, hot_x, hot_y, data, rowbytes);
-- xfree(data);
-+ if(free_data)
-+ xfree(data);
- return err == Success;
- }
-
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0004-rootless-Adjust-the-frame-size-of-the-native-root-wi.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0004-rootless-Adjust-the-frame-size-of-the-native-root-wi.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0004-rootless-Adjust-the-frame-size-of-the-native-root-wi.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,60 +0,0 @@
-From ea191e1679f91373da439b5a90cae756aff837c2 Mon Sep 17 00:00:00 2001
-From: Jan Hauffa <hauffa at in.tum.de>
-Date: Sat, 17 Jul 2010 12:18:39 -0700
-Subject: [PATCH 04/11] rootless: Adjust the frame size of the native root window in RootlessResizeWindow
-
-If the native root window isn't resized as well, we will likely crash the
-next time we draw to the root. On OS X, this can be seen by:
-
-1) Put the display preferences in the menu bar and set X11's preferences so you
- can access the menu bar in fullscreen mode
-2) Set the resolution of your screen lower than normal.
-3) Start X11 in fullscreen mode. The root window will cover the screen as
- expected.
-4) Use the menu bar to increase the resolution of the display. The root
- window will now cover the old area and not the full screen, but
- 'xwininfo -root' will report the full width.
-5) Run 'xsetroot -solid red', and we have the crash you mention above.
-
-Leaving/entering fullscreen after #4 will fix the problem. This is because the
-WINREC is erased when we leave fullscreen mode and it is recreated upon
-re-entry:
-
-RootlessUpdateRooted(FALSE)
- RootlessDisableRoot(screenInfo.screens[0])
- RootlessDestroyFrame (pRoot, winRec);
-RootlessUpdateRooted(TRUE)
- RootlessEnableRoot(screenInfo.screens[0])
- RootlessEnsureFrame(screenInfo.screens[0]->pRoot)
- creates a new WINREC...
-
-Signed-off-by: Jan Hauffa <hauffa at in.tum.de>
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
-Acked-By: Jon TURNEY <jon.turney at dronecode.org.uk>
-Tested-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit 95756f410c65a6510a797e94a792b959d45cdb9e)
----
- miext/rootless/rootlessWindow.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git xorg-server-1.8.2/miext/rootless/rootlessWindow.c xorg-server-1.8.2/miext/rootless/rootlessWindow.c
-index 55c7b96..8e3b7af 100644
---- xorg-server-1.8.2/miext/rootless/rootlessWindow.c
-+++ xorg-server-1.8.2/miext/rootless/rootlessWindow.c
-@@ -1326,6 +1326,13 @@ RootlessResizeWindow(WindowPtr pWin, int x, int y,
- REGION_COPY(pScreen, &pWin->clipList, &pWin->winSize);
- REGION_COPY(pScreen, &pWin->borderClip, &pWin->winSize);
-
-+ if (winRec) {
-+ SCREENREC(pScreen)->imp->ResizeFrame(winRec->wid, pScreen,
-+ x + SCREEN_TO_GLOBAL_X,
-+ y + SCREEN_TO_GLOBAL_Y,
-+ w, h, RL_GRAVITY_NONE);
-+ }
-+
- miSendExposures(pWin, &pWin->borderClip,
- pWin->drawable.x, pWin->drawable.y);
- }
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0005-XQuartz-Bump-bundle-version-to-2.5.2.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0005-XQuartz-Bump-bundle-version-to-2.5.2.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0005-XQuartz-Bump-bundle-version-to-2.5.2.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,29 +0,0 @@
-From 5f555ea1a1647795aeb84985f478eed0424dad61 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Tue, 20 Jul 2010 00:37:43 -0700
-Subject: [PATCH 05/11] XQuartz: Bump bundle version to 2.5.2
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/bundle/Info.plist.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp
-index 91c8c03..dfc7d9c 100644
---- xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp
-+++ xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp
-@@ -19,9 +19,9 @@
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
-- <string>2.5.1</string>
-+ <string>2.5.2</string>
- <key>CFBundleVersion</key>
-- <string>2.5.1</string>
-+ <string>2.5.2</string>
- <key>CFBundleSignature</key>
- <string>x11a</string>
- <key>CSResourcesFileMapped</key>
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0006-XQuartz-GL-Fix-__glXAquaScreenCreateDrawable-prototy.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0006-XQuartz-GL-Fix-__glXAquaScreenCreateDrawable-prototy.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0006-XQuartz-GL-Fix-__glXAquaScreenCreateDrawable-prototy.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,55 +0,0 @@
-From c7846bf1b2cc78a7181dab3fb712c48c6684a29d Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Tue, 11 May 2010 09:49:34 -0700
-Subject: [PATCH 06/11] XQuartz GL: Fix __glXAquaScreenCreateDrawable prototype
-
-Fixes regression introduced in 9de0e31746d5f0d9d39d11c94ec3cbc04a9935fc
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-Reviewed-by: Keith Packard <keithp at keithp.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit ba1f1f9d9e48226f1ef6b3222a8d92fc969d6560)
----
- hw/xquartz/GL/indirect.c | 10 ++++++----
- 1 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git xorg-server-1.8.2/hw/xquartz/GL/indirect.c xorg-server-1.8.2/hw/xquartz/GL/indirect.c
-index ad9ebbd..8092cfa 100644
---- xorg-server-1.8.2/hw/xquartz/GL/indirect.c
-+++ xorg-server-1.8.2/hw/xquartz/GL/indirect.c
-@@ -169,7 +169,7 @@ void warn_func(void * p1, char *format, ...);
-
- // some prototypes
- static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen);
--static __GLXdrawable * __glXAquaScreenCreateDrawable(__GLXscreen *screen, DrawablePtr pDraw, int type, XID drawId, __GLXconfig *conf);
-+static __GLXdrawable * __glXAquaScreenCreateDrawable(ClientPtr client, __GLXscreen *screen, DrawablePtr pDraw, XID drawId, int type, XID glxDrawId, __GLXconfig *conf);
-
- static void __glXAquaContextDestroy(__GLXcontext *baseContext);
- static int __glXAquaContextMakeCurrent(__GLXcontext *baseContext);
-@@ -639,10 +639,12 @@ static void __glXAquaDrawableDestroy(__GLXdrawable *base) {
- }
-
- static __GLXdrawable *
--__glXAquaScreenCreateDrawable(__GLXscreen *screen,
-+__glXAquaScreenCreateDrawable(ClientPtr client,
-+ __GLXscreen *screen,
- DrawablePtr pDraw,
-- int type,
- XID drawId,
-+ int type,
-+ XID glxDrawId,
- __GLXconfig *conf) {
- __GLXAquaDrawable *glxPriv;
-
-@@ -653,7 +655,7 @@ __glXAquaScreenCreateDrawable(__GLXscreen *screen,
-
- memset(glxPriv, 0, sizeof *glxPriv);
-
-- if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, drawId, conf)) {
-+ if(!__glXDrawableInit(&glxPriv->base, screen, pDraw, type, glxDrawId, conf)) {
- xfree(glxPriv);
- return NULL;
- }
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0007-XQuartz-GLX-Don-t-mangle-__GLXDrawable-s-pDraw.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0007-XQuartz-GLX-Don-t-mangle-__GLXDrawable-s-pDraw.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0007-XQuartz-GLX-Don-t-mangle-__GLXDrawable-s-pDraw.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,44 +0,0 @@
-From 5aeb53dd7b5b50eddad01c684f3c8ce122d46f4c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 28 Jul 2010 18:08:02 -0700
-Subject: [PATCH 07/11] XQuartz: GLX: Don't mangle __GLXDrawable's pDraw
-
-We were incorrectly NULLing out pDraw in __GLXDrawable instead of ours in
-__GLXAquaDrawable. (we should refactor to eliminate this redundancy later)
-
-This was causing http://xquartz.macosforge.org/trac/ticket/426
-This was benign until commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4
-The root cause of this change was fed7ccc481ad1caaa518cafe944c2327a5d0b6c65
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit 98f90145d786695ecbc02a667c6ffe7c619dc67e)
----
- hw/xquartz/GL/indirect.c | 5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git xorg-server-1.8.2/hw/xquartz/GL/indirect.c xorg-server-1.8.2/hw/xquartz/GL/indirect.c
-index 8092cfa..ed25c3d 100644
---- xorg-server-1.8.2/hw/xquartz/GL/indirect.c
-+++ xorg-server-1.8.2/hw/xquartz/GL/indirect.c
-@@ -271,8 +271,7 @@ static void __glXAquaContextDestroy(__GLXcontext *baseContext) {
-
- __GLXAquaContext *context = (__GLXAquaContext *) baseContext;
-
-- GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx 0x%x)\n",
-- (unsigned int) baseContext);
-+ GLAQUA_DEBUG_MSG("glAquaContextDestroy (ctx %p)\n", baseContext);
- if (context != NULL) {
- if (context->sid != 0 && surface_hash != NULL) {
- lst = x_hash_table_lookup(surface_hash, x_cvt_uint_to_vptr(context->sid), NULL);
-@@ -321,7 +320,7 @@ static void surface_notify(void *_arg, void *data) {
- case AppleDRISurfaceNotifyDestroyed:
- if (surface_hash != NULL)
- x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));
-- draw->base.pDraw = NULL;
-+ draw->pDraw = NULL;
- draw->sid = 0;
- break;
-
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0008-XQuartz-xpbproxy-Don-t-take-down-the-whole-server-on.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0008-XQuartz-xpbproxy-Don-t-take-down-the-whole-server-on.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0008-XQuartz-xpbproxy-Don-t-take-down-the-whole-server-on.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,31 +0,0 @@
-From a9483196cf2fc8319057541d2bd3c4f3fa0e7357 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Thu, 29 Jul 2010 11:39:40 -0700
-Subject: [PATCH 08/11] XQuartz: xpbproxy: Don't take down the whole server on an IO error
-
-Calls pthread_exit to prevent _XIOError from calling exit()
-
-This fixes http://xquartz.macosforge.org/trac/ticket/421
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit 750d4e82a0c1161292d24216bcff200cd6647611)
----
- hw/xquartz/pbproxy/main.m | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git xorg-server-1.8.2/hw/xquartz/pbproxy/main.m xorg-server-1.8.2/hw/xquartz/pbproxy/main.m
-index 560cf01..bb06465 100644
---- xorg-server-1.8.2/hw/xquartz/pbproxy/main.m
-+++ xorg-server-1.8.2/hw/xquartz/pbproxy/main.m
-@@ -75,6 +75,8 @@ static int x_io_error_handler (Display *dpy) {
- exit(EXIT_FAILURE);
- #endif
-
-+ /* Prevent _XIOError from calling exit() */
-+ pthread_exit(NULL);
- return 0;
- }
-
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0009-XQuartz-Bump-bundle-version-to-2.5.3.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0009-XQuartz-Bump-bundle-version-to-2.5.3.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0009-XQuartz-Bump-bundle-version-to-2.5.3.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,29 +0,0 @@
-From 7593290d1e0666a41966f82e3029e3028e46ffec Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Sat, 31 Jul 2010 14:48:22 -0700
-Subject: [PATCH 09/11] XQuartz: Bump bundle version to 2.5.3
- Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-
----
- hw/xquartz/bundle/Info.plist.cpp | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp
-index dfc7d9c..9dd012f 100644
---- xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp
-+++ xorg-server-1.8.2/hw/xquartz/bundle/Info.plist.cpp
-@@ -19,9 +19,9 @@
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
-- <string>2.5.2</string>
-+ <string>2.5.3</string>
- <key>CFBundleVersion</key>
-- <string>2.5.2</string>
-+ <string>2.5.3</string>
- <key>CFBundleSignature</key>
- <string>x11a</string>
- <key>CSResourcesFileMapped</key>
---
-1.7.2.1
-
Deleted: trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,165 +0,0 @@
-From 1c5084dedbc96cac70c6769d01202f39507f91ed Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Fri, 30 Apr 2010 13:08:25 -0700
-Subject: [PATCH 10/11] Workaround the GC clipping problem in miPaintWindow and add some debugging output.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-(cherry picked from commit a9c526bbe10ecf97b6c065fdbc03cc341917a5a6)
----
- mi/miexpose.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++------
- 1 files changed, 94 insertions(+), 11 deletions(-)
-
-diff --git xorg-server-1.8.2/mi/miexpose.c xorg-server-1.8.2/mi/miexpose.c
-index f52b492..21493cb 100644
---- xorg-server-1.8.2/mi/miexpose.c
-+++ xorg-server-1.8.2/mi/miexpose.c
-@@ -524,6 +524,7 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
- void RootlessStartDrawing(WindowPtr pWin);
- void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
- Bool IsFramedWindow(WindowPtr pWin);
-+#include "../fb/fb.h"
- #endif
-
- void
-@@ -551,24 +552,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- Bool solid = TRUE;
- DrawablePtr drawable = &pWin->drawable;
-
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative);
-+ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1,
-+ prgn->extents.x2 - prgn->extents.x1,
-+ prgn->extents.y2 - prgn->extents.y1);
-+ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y,
-+ pWin->winSize.extents.x1, pWin->winSize.extents.y1,
-+ pWin->winSize.extents.x2 - pWin->winSize.extents.x1,
-+ pWin->winSize.extents.y2 - pWin->winSize.extents.y1);
-+ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y,
-+ pWin->drawable.width, pWin->drawable.height);
-+#endif
-+
- #ifdef ROOTLESS
- if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
- return;
--
-- if(IsFramedWindow(pWin)) {
-- RootlessStartDrawing(pWin);
-- RootlessDamageRegion(pWin, prgn);
--
-- if(pWin->backgroundState == ParentRelative) {
-- if((what == PW_BACKGROUND) ||
-- (what == PW_BORDER && !pWin->borderIsPixel))
-- RootlessSetPixmapOfAncestors(pWin);
-- }
-- }
- #endif
-
- if (what == PW_BACKGROUND)
- {
-+#ifdef ROOTLESS
-+ if(IsFramedWindow(pWin)) {
-+ RootlessStartDrawing(pWin);
-+ RootlessDamageRegion(pWin, prgn);
-+
-+ if(pWin->backgroundState == ParentRelative) {
-+ RootlessSetPixmapOfAncestors(pWin);
-+ }
-+ }
-+#endif
-+
- while (pWin->backgroundState == ParentRelative)
- pWin = pWin->parent;
-
-@@ -590,6 +604,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- {
- PixmapPtr pixmap;
-
-+#ifdef ROOTLESS
-+ if(IsFramedWindow(pWin)) {
-+ RootlessStartDrawing(pWin);
-+ RootlessDamageRegion(pWin, prgn);
-+
-+ if(!pWin->borderIsPixel &&
-+ pWin->backgroundState == ParentRelative) {
-+ RootlessSetPixmapOfAncestors(pWin);
-+ }
-+ }
-+#endif
-+
- tile_x_off = drawable->x;
- tile_y_off = drawable->y;
-
-@@ -598,6 +624,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- return;
- pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
- drawable = &pixmap->drawable;
-+
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF(" Draw: %d %d %d %d\n",
-+ drawable->x, drawable->y, drawable->width, drawable->height);
-+#endif
-+
- #ifdef COMPOSITE
- draw_x_off = pixmap->screen_x;
- draw_y_off = pixmap->screen_y;
-@@ -660,6 +692,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
- dixChangeGC (NullClient, pGC, gcmask, NULL, gcval);
- ValidateGC (drawable, pGC);
-
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF(" GC: %d %d %d %d\n",
-+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
-+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
-+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
-+#endif
-+
-+#ifdef XQUARTZ
-+ /* Looks like our clipping isn't set right for some reason:
-+ * http://xquartz.macosforge.org/trac/ticket/290
-+ */
-+ if(what == PW_BORDER) {
-+
-+#if 0
-+ if(solid) {
-+#if 1
-+ fbFillRegionSolid(&pWin->drawable,
-+ prgn,
-+ 0,
-+ fbReplicatePixel(fill.pixel,
-+ pWin->drawable.bitsPerPixel));
-+#else
-+ fbFillRegionSolid(drawable,
-+ prgn,
-+ 0,
-+ fbReplicatePixel(fill.pixel,
-+ drawable->bitsPerPixel));
-+#endif
-+ return;
-+ }
-+#endif
-+
-+ pGC->pCompositeClip->extents.x1 += prgn->extents.x1;
-+ pGC->pCompositeClip->extents.y1 += prgn->extents.y1;
-+ pGC->pCompositeClip->extents.x2 += prgn->extents.x1;
-+ pGC->pCompositeClip->extents.y2 += prgn->extents.y1;
-+
-+ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width)
-+ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width;
-+ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height)
-+ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height;
-+ }
-+#endif
-+
-+#ifdef XQUARTZ_CLIP_DEBUG
-+ ErrorF(" GC: %d %d %d %d\n",
-+ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
-+ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
-+ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
-+#endif
-+
- numRects = REGION_NUM_RECTS(prgn);
- pbox = REGION_RECTS(prgn);
- for (i= numRects; --i >= 0; pbox++, prect++)
---
-1.7.2.1
-
Added: trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch (rev 0)
+++ trunk/dports/x11/xorg-server/files/0010-Workaround-the-GC-clipping-problem-in-miPaintWindow.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -0,0 +1,164 @@
+From d07081c5a6d32446f4ef86b25af5ac62683f7595 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Fri, 30 Apr 2010 13:08:25 -0700
+Subject: [PATCH] Workaround the GC clipping problem in miPaintWindow and add some debugging output.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ mi/miexpose.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 files changed, 94 insertions(+), 11 deletions(-)
+
+diff --git xorg-server-1.9.0/mi/miexpose.c xorg-server-1.9.0/mi/miexpose.c
+index 94258b8..4f25c23 100644
+--- xorg-server-1.9.0/mi/miexpose.c
++++ xorg-server-1.9.0/mi/miexpose.c
+@@ -521,6 +521,7 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
+ void RootlessStartDrawing(WindowPtr pWin);
+ void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
+ Bool IsFramedWindow(WindowPtr pWin);
++#include "../fb/fb.h"
+ #endif
+
+ void
+@@ -548,24 +549,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ Bool solid = TRUE;
+ DrawablePtr drawable = &pWin->drawable;
+
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative);
++ ErrorF(" Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1,
++ prgn->extents.x2 - prgn->extents.x1,
++ prgn->extents.y2 - prgn->extents.y1);
++ ErrorF(" Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y,
++ pWin->winSize.extents.x1, pWin->winSize.extents.y1,
++ pWin->winSize.extents.x2 - pWin->winSize.extents.x1,
++ pWin->winSize.extents.y2 - pWin->winSize.extents.y1);
++ ErrorF(" Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y,
++ pWin->drawable.width, pWin->drawable.height);
++#endif
++
+ #ifdef ROOTLESS
+ if(!drawable || drawable->type == UNDRAWABLE_WINDOW)
+ return;
+-
+- if(IsFramedWindow(pWin)) {
+- RootlessStartDrawing(pWin);
+- RootlessDamageRegion(pWin, prgn);
+-
+- if(pWin->backgroundState == ParentRelative) {
+- if((what == PW_BACKGROUND) ||
+- (what == PW_BORDER && !pWin->borderIsPixel))
+- RootlessSetPixmapOfAncestors(pWin);
+- }
+- }
+ #endif
+
+ if (what == PW_BACKGROUND)
+ {
++#ifdef ROOTLESS
++ if(IsFramedWindow(pWin)) {
++ RootlessStartDrawing(pWin);
++ RootlessDamageRegion(pWin, prgn);
++
++ if(pWin->backgroundState == ParentRelative) {
++ RootlessSetPixmapOfAncestors(pWin);
++ }
++ }
++#endif
++
+ while (pWin->backgroundState == ParentRelative)
+ pWin = pWin->parent;
+
+@@ -587,6 +601,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ {
+ PixmapPtr pixmap;
+
++#ifdef ROOTLESS
++ if(IsFramedWindow(pWin)) {
++ RootlessStartDrawing(pWin);
++ RootlessDamageRegion(pWin, prgn);
++
++ if(!pWin->borderIsPixel &&
++ pWin->backgroundState == ParentRelative) {
++ RootlessSetPixmapOfAncestors(pWin);
++ }
++ }
++#endif
++
+ tile_x_off = drawable->x;
+ tile_y_off = drawable->y;
+
+@@ -595,6 +621,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ return;
+ pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
+ drawable = &pixmap->drawable;
++
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF(" Draw: %d %d %d %d\n",
++ drawable->x, drawable->y, drawable->width, drawable->height);
++#endif
++
+ #ifdef COMPOSITE
+ draw_x_off = pixmap->screen_x;
+ draw_y_off = pixmap->screen_y;
+@@ -657,6 +689,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+ ChangeGC (NullClient, pGC, gcmask, gcval);
+ ValidateGC (drawable, pGC);
+
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF(" GC: %d %d %d %d\n",
++ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
++ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
++ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
++#endif
++
++#ifdef XQUARTZ
++ /* Looks like our clipping isn't set right for some reason:
++ * http://xquartz.macosforge.org/trac/ticket/290
++ */
++ if(what == PW_BORDER) {
++
++#if 0
++ if(solid) {
++#if 1
++ fbFillRegionSolid(&pWin->drawable,
++ prgn,
++ 0,
++ fbReplicatePixel(fill.pixel,
++ pWin->drawable.bitsPerPixel));
++#else
++ fbFillRegionSolid(drawable,
++ prgn,
++ 0,
++ fbReplicatePixel(fill.pixel,
++ drawable->bitsPerPixel));
++#endif
++ return;
++ }
++#endif
++
++ pGC->pCompositeClip->extents.x1 += prgn->extents.x1;
++ pGC->pCompositeClip->extents.y1 += prgn->extents.y1;
++ pGC->pCompositeClip->extents.x2 += prgn->extents.x1;
++ pGC->pCompositeClip->extents.y2 += prgn->extents.y1;
++
++ if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width)
++ pGC->pCompositeClip->extents.x2 = drawable->pScreen->width;
++ if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height)
++ pGC->pCompositeClip->extents.y2 = drawable->pScreen->height;
++ }
++#endif
++
++#ifdef XQUARTZ_CLIP_DEBUG
++ ErrorF(" GC: %d %d %d %d\n",
++ pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
++ pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
++ pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
++#endif
++
+ numRects = RegionNumRects(prgn);
+ pbox = RegionRects(prgn);
+ for (i= numRects; --i >= 0; pbox++, prect++)
+--
+1.5.6.6
+
Modified: trunk/dports/x11/xorg-server/files/0011-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0011-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-10-25 04:20:08 UTC (rev 72723)
+++ trunk/dports/x11/xorg-server/files/0011-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-10-25 04:23:02 UTC (rev 72724)
@@ -1,7 +1,7 @@
-From 2d6f9fe547e22503e23cba6f5edf383ae51637e5 Mon Sep 17 00:00:00 2001
+From 1f03dfb10cd9afab052d38cd9de8311dd4bd9166 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri, 12 Feb 2010 19:48:52 -0800
-Subject: [PATCH 11/11] fb: Revert fb changes that broke XQuartz
+Subject: [PATCH] fb: Revert fb changes that broke XQuartz
http://bugs.freedesktop.org/show_bug.cgi?id=26124
@@ -16,15 +16,15 @@
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
fb/fb.h | 7 +----
- fb/fbpict.c | 72 ++++++++++++++++++-----------------------------------------
+ fb/fbpict.c | 78 +++++++++++++++++++----------------------------------------
fb/fbtrap.c | 6 +---
- 3 files changed, 26 insertions(+), 59 deletions(-)
+ 3 files changed, 29 insertions(+), 62 deletions(-)
-diff --git xorg-server-1.8.2/fb/fb.h xorg-server-1.8.2/fb/fb.h
-index 02d6c03..ed21f9e 100644
---- xorg-server-1.8.2/fb/fb.h
-+++ xorg-server-1.8.2/fb/fb.h
-@@ -2082,11 +2082,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
+diff --git xorg-server-1.9.0/fb/fb.h xorg-server-1.9.0/fb/fb.h
+index a06f98b..3b9efea 100644
+--- xorg-server-1.9.0/fb/fb.h
++++ xorg-server-1.9.0/fb/fb.h
+@@ -2080,11 +2080,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
FbBits xor);
extern _X_EXPORT pixman_image_t *
@@ -38,11 +38,11 @@
extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
#endif /* _FB_H_ */
-diff --git xorg-server-1.8.2/fb/fbpict.c xorg-server-1.8.2/fb/fbpict.c
-index dddfce8..07a2286 100644
---- xorg-server-1.8.2/fb/fbpict.c
-+++ xorg-server-1.8.2/fb/fbpict.c
-@@ -158,24 +158,19 @@ fbComposite (CARD8 op,
+diff --git xorg-server-1.9.0/fb/fbpict.c xorg-server-1.9.0/fb/fbpict.c
+index f7f1200..5467ee4 100644
+--- xorg-server-1.9.0/fb/fbpict.c
++++ xorg-server-1.9.0/fb/fbpict.c
+@@ -156,24 +156,19 @@ fbComposite (CARD8 op,
CARD16 height)
{
pixman_image_t *src, *mask, *dest;
@@ -71,7 +71,7 @@
width, height);
}
-@@ -275,22 +270,22 @@ create_conical_gradient_image (PictGradient *gradient)
+@@ -271,22 +266,22 @@ create_conical_gradient_image (PictGradient *gradient)
static pixman_image_t *
create_bits_picture (PicturePtr pict,
@@ -102,7 +102,7 @@
(uint32_t *)bits, stride * sizeof (FbStride));
-@@ -316,52 +311,30 @@ create_bits_picture (PicturePtr pict,
+@@ -312,55 +307,33 @@ create_bits_picture (PicturePtr pict,
if (pict->clientClipType != CT_NONE)
pixman_image_set_has_client_clip (image, TRUE);
@@ -128,9 +128,13 @@
return image;
}
+ static pixman_image_t *
+-image_from_pict_internal (PicturePtr pict, Bool has_clip, int *xoff, int *yoff, Bool is_alpha_map);
++image_from_pict_internal (PicturePtr pict, Bool has_clip, Bool is_alpha_map);
+
static void
--set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-+set_image_properties (pixman_image_t *image, PicturePtr pict)
+-set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int *xoff, int *yoff, Bool is_alpha_map)
++set_image_properties (pixman_image_t *image, PicturePtr pict, Bool is_alpha_map)
{
pixman_repeat_t repeat;
pixman_filter_t filter;
@@ -160,27 +164,27 @@
}
switch (pict->repeatType)
-@@ -388,8 +361,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
-
- if (pict->alphaMap)
+@@ -390,8 +363,7 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+ */
+ if (pict->alphaMap && !is_alpha_map)
{
- int alpha_xoff, alpha_yoff;
-- pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);
-+ pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE);
+- pixman_image_t *alpha_map = image_from_pict_internal (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff, TRUE);
++ pixman_image_t *alpha_map = image_from_pict_internal (pict->alphaMap, TRUE, TRUE);
pixman_image_set_alpha_map (
image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
-@@ -422,7 +394,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
+@@ -424,7 +396,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
}
- pixman_image_t *
--image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-+image_from_pict (PicturePtr pict,
-+ Bool has_clip)
+ static pixman_image_t *
+-image_from_pict_internal (PicturePtr pict, Bool has_clip, int *xoff, int *yoff, Bool is_alpha_map)
++image_from_pict_internal (PicturePtr pict,
++ Bool has_clip, Bool is_alpha_map)
{
pixman_image_t *image = NULL;
-@@ -431,7 +404,7 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+@@ -433,7 +406,7 @@ image_from_pict_internal (PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
if (pict->pDrawable)
{
@@ -189,7 +193,7 @@
}
else if (pict->pSourcePict)
{
-@@ -452,11 +425,10 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+@@ -454,19 +427,18 @@ image_from_pict_internal (PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
else if (sp->type == SourcePictTypeConical)
image = create_conical_gradient_image (gradient);
}
@@ -197,16 +201,26 @@
}
if (image)
-- set_image_properties (image, pict, has_clip, xoff, yoff);
-+ set_image_properties (image, pict);
+- set_image_properties (image, pict, has_clip, xoff, yoff, is_alpha_map);
++ set_image_properties (image, pict, is_alpha_map);
return image;
}
-diff --git xorg-server-1.8.2/fb/fbtrap.c xorg-server-1.8.2/fb/fbtrap.c
-index 515e2e1..830603a 100644
---- xorg-server-1.8.2/fb/fbtrap.c
-+++ xorg-server-1.8.2/fb/fbtrap.c
-@@ -40,8 +40,7 @@ fbAddTraps (PicturePtr pPicture,
+
+ pixman_image_t *
+-image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
++image_from_pict (PicturePtr pict, Bool has_clip)
+ {
+- return image_from_pict_internal (pict, has_clip, xoff, yoff, FALSE);
++ return image_from_pict_internal (pict, has_clip, FALSE);
+ }
+
+ void
+diff --git xorg-server-1.9.0/fb/fbtrap.c xorg-server-1.9.0/fb/fbtrap.c
+index 9f5c39f..9c55236 100644
+--- xorg-server-1.9.0/fb/fbtrap.c
++++ xorg-server-1.9.0/fb/fbtrap.c
+@@ -38,8 +38,7 @@ fbAddTraps (PicturePtr pPicture,
int ntrap,
xTrap *traps)
{
@@ -216,7 +230,7 @@
if (!image)
return;
-@@ -57,8 +56,7 @@ fbRasterizeTrapezoid (PicturePtr pPicture,
+@@ -55,8 +54,7 @@ fbRasterizeTrapezoid (PicturePtr pPicture,
int x_off,
int y_off)
{
@@ -227,5 +241,5 @@
if (!image)
return;
--
-1.7.2.1
+1.5.6.6
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101024/ef182da6/attachment-0001.html>
More information about the macports-changes
mailing list