[80296] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Fri Jul 8 13:17:03 PDT 2011
Revision: 80296
http://trac.macports.org/changeset/80296
Author: jeremyhu at macports.org
Date: 2011-07-08 13:17:02 -0700 (Fri, 08 Jul 2011)
Log Message:
-----------
xorg-server: Bump to version 1.10.3
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
Removed Paths:
-------------
trunk/dports/x11/xorg-server/files/0001-Send-events-that-were-missing-from-RRSelectInput.patch
trunk/dports/x11/xorg-server/files/0002-randr-check-rotated-virtual-size-limits-correctly.patch
trunk/dports/x11/xorg-server/files/0003-linux-Retry-VT-ioctls-while-errno-EINTR.patch
trunk/dports/x11/xorg-server/files/0004-DIX-Set-backgroundState-correctly-for-root-window.patch
trunk/dports/x11/xorg-server/files/0005-privates.h-line-198-warning-void-function-cannot-ret.patch
trunk/dports/x11/xorg-server/files/0006-XQuartz-GLX-Create-a-new-dispatch-table-rather-than-.patch
trunk/dports/x11/xorg-server/files/0007-test-fix-memset-size-for-WindowRec-37801.patch
trunk/dports/x11/xorg-server/files/1001-XQuartz-Add-missing-include-for-pthread.h.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/Portfile 2011-07-08 20:17:02 UTC (rev 80296)
@@ -5,8 +5,7 @@
name xorg-server
conflicts xorg-server-devel
set my_name xorg-server
-version 1.10.2
-revision 1
+version 1.10.3
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 c9ba50bd44ea70da51f13100336a5484 \
- sha1 fd831b3c6297d1a68830c602d767752d87b9ca54 \
- rmd160 3d1ad6b236772ebe0400a69a03b9093bb210fd4b
+checksums md5 fc1bb18a09244cd43a998625a6a1b071 \
+ sha1 1699be5c0edeca553cfa3ee6caa228483465136b \
+ rmd160 dfa59ac6d3f3f7fd059e6f92cead352845e08228
use_bzip2 yes
use_parallel_build yes
@@ -80,14 +79,6 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0001-Send-events-that-were-missing-from-RRSelectInput.patch \
- 0002-randr-check-rotated-virtual-size-limits-correctly.patch \
- 0003-linux-Retry-VT-ioctls-while-errno-EINTR.patch \
- 0004-DIX-Set-backgroundState-correctly-for-root-window.patch \
- 0005-privates.h-line-198-warning-void-function-cannot-ret.patch \
- 0006-XQuartz-GLX-Create-a-new-dispatch-table-rather-than-.patch \
- 0007-test-fix-memset-size-for-WindowRec-37801.patch \
- 1001-XQuartz-Add-missing-include-for-pthread.h.patch \
5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
5002-fb-Revert-fb-changes-that-broke-XQuartz.patch \
5003-configure.ac-Add-fno-strict-aliasing-to-CFLAGS.patch
Deleted: trunk/dports/x11/xorg-server/files/0001-Send-events-that-were-missing-from-RRSelectInput.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-Send-events-that-were-missing-from-RRSelectInput.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/0001-Send-events-that-were-missing-from-RRSelectInput.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,72 +0,0 @@
-From 613e0e9ef74c4542ed458200165adbcdfdf3cd17 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Wed, 13 Apr 2011 11:51:30 -0700
-Subject: [PATCH 1/7] Send events that were missing from RRSelectInput
-
-The RANDR spec (randrproto.txt) specifies that RRSelectInput will send out
-events corresponding to the event mask, if there have been changes to
-CRTCs or outputs. Only screen events were being generated, however.
-
-Fixes http://bugs.freedesktop.org/21760
-
-Signed-off-by: Federico Mena Quintero <federico at novell.com>
-Reviewd-by: Keith Packard <keithp at keithp.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit b2997431fd426ab318bc5dfd2cd43956d733ebec)
----
- randr/rrdispatch.c | 32 ++++++++++++++++++++++++++++++--
- 1 files changed, 30 insertions(+), 2 deletions(-)
-
-diff --git xorg-server-1.10.2/randr/rrdispatch.c xorg-server-1.10.2/randr/rrdispatch.c
-index ac4d2ac..2135504 100644
---- xorg-server-1.10.2/randr/rrdispatch.c
-+++ xorg-server-1.10.2/randr/rrdispatch.c
-@@ -146,7 +146,7 @@ ProcRRSelectInput (ClientPtr client)
- /*
- * Now see if the client needs an event
- */
-- if (pScrPriv && (pRREvent->mask & RRScreenChangeNotifyMask))
-+ if (pScrPriv)
- {
- pTimes = &((RRTimesPtr) (pRRClient + 1))[pScreen->myNum];
- if (CompareTimeStamps (pTimes->setTime,
-@@ -154,7 +154,35 @@ ProcRRSelectInput (ClientPtr client)
- CompareTimeStamps (pTimes->configTime,
- pScrPriv->lastConfigTime) != 0)
- {
-- RRDeliverScreenEvent (client, pWin, pScreen);
-+ if (pRREvent->mask & RRScreenChangeNotifyMask)
-+ {
-+ RRDeliverScreenEvent (client, pWin, pScreen);
-+ }
-+
-+ if (pRREvent->mask & RRCrtcChangeNotifyMask)
-+ {
-+ int i;
-+
-+ for (i = 0; i < pScrPriv->numCrtcs; i++)
-+ {
-+ RRDeliverCrtcEvent (client, pWin, pScrPriv->crtcs[i]);
-+ }
-+ }
-+
-+ if (pRREvent->mask & RROutputChangeNotifyMask)
-+ {
-+ int i;
-+
-+ for (i = 0; i < pScrPriv->numOutputs; i++)
-+ {
-+ RRDeliverOutputEvent (client, pWin, pScrPriv->outputs[i]);
-+ }
-+ }
-+
-+ /* We don't check for RROutputPropertyNotifyMask, as randrproto.txt doesn't
-+ * say if there ought to be notifications of changes to output properties
-+ * if those changes occurred before the time RRSelectInput is called.
-+ */
- }
- }
- }
---
-1.7.5.2
-
Deleted: trunk/dports/x11/xorg-server/files/0002-randr-check-rotated-virtual-size-limits-correctly.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-randr-check-rotated-virtual-size-limits-correctly.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/0002-randr-check-rotated-virtual-size-limits-correctly.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,65 +0,0 @@
-From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner at nvidia.com>
-Date: Tue, 24 May 2011 16:02:42 -0700
-Subject: [PATCH 2/7] randr: check rotated virtual size limits correctly
-
-Commit d1107918d4626268803b54033a07405122278e7f introduced checks to
-the RandR path that cause RRSetScreenConfig requests to fail if the
-size is too large. Unfortunately, when RandR 1.1 rotation is enabled
-it compares the rotated screen dimensions to the unrotated limits,
-which causes 90- and 270-degree rotation to fail unless your screen
-happens to be square:
-
- X Error of failed request: BadValue (integer parameter out of range for operation)
- Major opcode of failed request: 153 (RANDR)
- Minor opcode of failed request: 2 (RRSetScreenConfig)
- Value in failed request: 0x780
- Serial number of failed request: 14
- Current serial number in output stream: 14
-
-Fix this by moving the check above the code that swaps the dimensions
-based on the rotation.
-
-Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
-Tested-by: Robert Hooker <robert.hooker at canonical.com>
-Tested-by: Kent Baxley <kent.baxley at canonical.com>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3)
----
- randr/rrscreen.c | 12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git xorg-server-1.10.2/randr/rrscreen.c xorg-server-1.10.2/randr/rrscreen.c
-index 1bc1a9e..da6d48d 100644
---- xorg-server-1.10.2/randr/rrscreen.c
-+++ xorg-server-1.10.2/randr/rrscreen.c
-@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client)
- */
- width = mode->mode.width;
- height = mode->mode.height;
-- if (rotation & (RR_Rotate_90|RR_Rotate_270))
-- {
-- width = mode->mode.height;
-- height = mode->mode.width;
-- }
--
- if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
- client->errorValue = width;
- free(pData);
-@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client)
- return BadValue;
- }
-
-+ if (rotation & (RR_Rotate_90|RR_Rotate_270))
-+ {
-+ width = mode->mode.height;
-+ height = mode->mode.width;
-+ }
-+
- if (width != pScreen->width || height != pScreen->height)
- {
- int c;
---
-1.7.5.2
-
Deleted: trunk/dports/x11/xorg-server/files/0003-linux-Retry-VT-ioctls-while-errno-EINTR.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0003-linux-Retry-VT-ioctls-while-errno-EINTR.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/0003-linux-Retry-VT-ioctls-while-errno-EINTR.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,193 +0,0 @@
-From 4bfb22e7667c4cd55da5e7a31af29ce5769ecc65 Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner at nvidia.com>
-Date: Mon, 18 Apr 2011 08:23:48 -0700
-Subject: [PATCH 3/7] linux: Retry VT ioctls while errno == EINTR
-
-When the smart scheduler is enabled, the VT ioctls (particularly
-VT_WAITACTIVE) can be interrupted by the smart scheduler's SIGALRMs.
-Previously, this caused the server to immediately continue on to
-ScreenInit, almost certainly causing a crash or failure because the X
-server that owned the VT hadn't finished cleaning up. As of commit
-7ee965a300c9eddcc1acacf9414cfe3e589222a8, it causes a FatalError
-instead.
-
-Retrying the ioctl as long as it fails with errno == EINTR fixes the
-problem and allows server regenerations to trigger VT switches that
-actually succeed.
-
-Signed-off-by: Aaron Plattner <aplattner at nvidia.com>
-Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Cyril Brulebois <kibi at debian.org>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit 88c4622b594a1725d0cee86bc82ad640d241c520)
----
- hw/xfree86/os-support/linux/lnx_init.c | 83 +++++++++++++++++++-------------
- 1 files changed, 49 insertions(+), 34 deletions(-)
-
-diff --git xorg-server-1.10.2/hw/xfree86/os-support/linux/lnx_init.c xorg-server-1.10.2/hw/xfree86/os-support/linux/lnx_init.c
-index 9c71a42..77dfb2f 100644
---- xorg-server-1.10.2/hw/xfree86/os-support/linux/lnx_init.c
-+++ xorg-server-1.10.2/hw/xfree86/os-support/linux/lnx_init.c
-@@ -62,17 +62,21 @@ drain_console(int fd, void *closure)
- static void
- switch_to(int vt, const char *from)
- {
-- if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt) < 0)
-- FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
-+ int ret;
-
-- if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt) < 0)
-- FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt));
-+ if (ret < 0)
-+ FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno));
-+
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt));
-+ if (ret < 0)
-+ FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno));
- }
-
- void
- xf86OpenConsole(void)
- {
-- int i, fd = -1;
-+ int i, fd = -1, ret;
- struct vt_mode VT;
- struct vt_stat vts;
- MessageType from = X_PROBED;
-@@ -107,17 +111,19 @@ xf86OpenConsole(void)
-
- if (ShareVTs)
- {
-- if (ioctl(fd, VT_GETSTATE, &vts) == 0)
-- xf86Info.vtno = vts.v_active;
-- else
-- FatalError("xf86OpenConsole: Cannot find the current"
-- " VT (%s)\n", strerror(errno));
-+ SYSCALL(ret = ioctl(fd, VT_GETSTATE, &vts));
-+ if (ret < 0)
-+ FatalError("xf86OpenConsole: Cannot find the current"
-+ " VT (%s)\n", strerror(errno));
-+ xf86Info.vtno = vts.v_active;
- } else {
-- if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) ||
-- (xf86Info.vtno == -1))
-- FatalError("xf86OpenConsole: Cannot find a free VT: %s\n",
-- strerror(errno));
-- }
-+ SYSCALL(ret = ioctl(fd, VT_OPENQRY, &xf86Info.vtno));
-+ if (ret < 0)
-+ FatalError("xf86OpenConsole: Cannot find a free VT: "
-+ "%s\n", strerror(errno));
-+ if (xf86Info.vtno == -1)
-+ FatalError("xf86OpenConsole: Cannot find a free VT\n");
-+ }
- close(fd);
- }
-
-@@ -159,7 +165,8 @@ xf86OpenConsole(void)
- * Linux doesn't switch to an active vt after the last close of a vt,
- * so we do this ourselves by remembering which is active now.
- */
-- if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0)
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts));
-+ if (ret < 0)
- xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n",
- strerror(errno));
- else
-@@ -171,7 +178,7 @@ xf86OpenConsole(void)
- * Detach from the controlling tty to avoid char loss
- */
- if ((i = open("/dev/tty",O_RDWR)) >= 0) {
-- ioctl(i, TIOCNOTTY, 0);
-+ SYSCALL(ioctl(i, TIOCNOTTY, 0));
- close(i);
- }
- }
-@@ -186,9 +193,10 @@ xf86OpenConsole(void)
- */
- switch_to(xf86Info.vtno, "xf86OpenConsole");
-
-- if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
-- FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
-- strerror(errno));
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
-+ if (ret < 0)
-+ FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
-+ strerror(errno));
-
- signal(SIGUSR1, xf86VTRequest);
-
-@@ -196,20 +204,23 @@ xf86OpenConsole(void)
- VT.relsig = SIGUSR1;
- VT.acqsig = SIGUSR1;
-
-- if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
-- FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed: %s\n",
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
-+ if (ret < 0)
-+ FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed: %s\n",
- strerror(errno));
--
-- if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0)
-- FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed %s\n",
-- strerror(errno));
-+
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS));
-+ if (ret < 0)
-+ FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed %s\n",
-+ strerror(errno));
-
- tcgetattr(xf86Info.consoleFd, &tty_attr);
-- ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode);
-+ SYSCALL(ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode));
-
-- if (ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW) < 0)
-- FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n",
-- strerror(errno));
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW));
-+ if (ret < 0)
-+ FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n",
-+ strerror(errno));
-
- nTty = tty_attr;
- nTty.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP);
-@@ -241,6 +252,7 @@ void
- xf86CloseConsole(void)
- {
- struct vt_mode VT;
-+ int ret;
-
- if (ShareVTs) {
- close(xf86Info.consoleFd);
-@@ -253,20 +265,23 @@ xf86CloseConsole(void)
- };
-
- /* Back to text mode ... */
-- if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT) < 0)
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT));
-+ if (ret < 0)
- xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n",
- strerror(errno));
-
-- ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode);
-+ SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode));
- tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr);
-
-- if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT));
-+ if (ret < 0)
- xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n",
- strerror(errno));
- else {
- /* set dflt vt handling */
- VT.mode = VT_AUTO;
-- if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0)
-+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT));
-+ if (ret < 0)
- xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n",
- strerror(errno));
- }
---
-1.7.5.2
-
Deleted: trunk/dports/x11/xorg-server/files/0004-DIX-Set-backgroundState-correctly-for-root-window.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0004-DIX-Set-backgroundState-correctly-for-root-window.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/0004-DIX-Set-backgroundState-correctly-for-root-window.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,42 +0,0 @@
-From 5752cc473648bf73f9ca71b7ccffc03b23e9195b Mon Sep 17 00:00:00 2001
-From: Marko Macek <Marko.Macek at gmx.net>
-Date: Sat, 21 May 2011 13:30:59 +0100
-Subject: [PATCH 4/7] DIX: Set backgroundState correctly for root window
-
-When we change the root window's background to None, and we've run with
--wr or -br for a forced solid background, make sure we also change the
-background state to BackgroundPixel, so we don't try to lookup either
-pScreen->whitePixel or pScreen->blackPixel as a pixmap.
-
-Signed-off-by: Marko Macek <Marko.Macek at gmx.net>
-Reviewed-by: Walter Harms <wharms at bfs.de>
-Reviewed-by: Daniel Stone <daniel at fooishbar.org>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit c5b72fd350bbdfd1facd0ddd5085f238c4cf252a)
----
- dix/window.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git xorg-server-1.10.2/dix/window.c xorg-server-1.10.2/dix/window.c
-index 9be7064..41306b3 100644
---- xorg-server-1.10.2/dix/window.c
-+++ xorg-server-1.10.2/dix/window.c
-@@ -474,6 +474,7 @@ InitRootWindow(WindowPtr pWin)
- pWin->background.pixel = pScreen->whitePixel;
- backFlag |= CWBackPixmap;
- } else {
-+ pWin->backgroundState = BackgroundPixel;
- if (whiteRoot)
- pWin->background.pixel = pScreen->whitePixel;
- else
-@@ -972,6 +973,7 @@ SetRootWindowBackground(WindowPtr pWin, ScreenPtr pScreen, Mask *index2)
- else if (party_like_its_1989)
- MakeRootTile(pWin);
- else {
-+ pWin->backgroundState = BackgroundPixel;
- if (whiteRoot)
- pWin->background.pixel = pScreen->whitePixel;
- else
---
-1.7.5.2
-
Deleted: trunk/dports/x11/xorg-server/files/0005-privates.h-line-198-warning-void-function-cannot-ret.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0005-privates.h-line-198-warning-void-function-cannot-ret.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/0005-privates.h-line-198-warning-void-function-cannot-ret.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,36 +0,0 @@
-From 6a16c4c268962fd09a52e4e78116aaa3bb1c47d5 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith at oracle.com>
-Date: Wed, 1 Jun 2011 21:42:07 -0700
-Subject: [PATCH 5/7] "privates.h", line 198: warning: void function cannot
- return value
-
-Providing an argument to return in a function with void return type
-is not allowed by the C standard, and makes the Sun compilers unhappy.
-(They actually flag it as an error, unless using a new enough version
- to be able to downgrade it to a warning with "-features=extensions".)
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
-Reviewed-by: Daniel Stone <daniel at fooishbar.org>
-Reviewed-by: Cyril Brulebois <kibi at debian.org>
-(cherry picked from commit bc04065b5ce277f3ac3491ff221a60ef3c7605cf)
----
- include/privates.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.10.2/include/privates.h xorg-server-1.10.2/include/privates.h
-index 7ef2cb7..2b0040c 100644
---- xorg-server-1.10.2/include/privates.h
-+++ xorg-server-1.10.2/include/privates.h
-@@ -195,7 +195,7 @@ dixGetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key, ScreenP
- static inline void
- dixSetScreenPrivate(PrivatePtr *privates, const DevScreenPrivateKey key, ScreenPtr pScreen, pointer val)
- {
-- return dixSetPrivate(privates, _dixGetScreenPrivateKey(key, pScreen), val);
-+ dixSetPrivate(privates, _dixGetScreenPrivateKey(key, pScreen), val);
- }
-
- static inline pointer
---
-1.7.5.2
-
Deleted: trunk/dports/x11/xorg-server/files/0006-XQuartz-GLX-Create-a-new-dispatch-table-rather-than-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0006-XQuartz-GLX-Create-a-new-dispatch-table-rather-than-.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/0006-XQuartz-GLX-Create-a-new-dispatch-table-rather-than-.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,57 +0,0 @@
-From a4725afa0e77e9fcf6570001dc0de23a7a9ee6cb Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Tue, 31 May 2011 13:01:05 -0700
-Subject: [PATCH 6/7] XQuartz: GLX: Create a new dispatch table rather than
- modifying the existing one
-
-Fixes regression introduced by b0c665ac0fe6840dda581e4d0d0b76c703d62a7b
-
-0 X11.bin 0x0000000100118293 __glXAquaScreenCreateContext + 684
-1 X11.bin 0x00000001001315b0 DoCreateContext + 163
-2 X11.bin 0x000000010013509f __glXDispatch + 211
-3 X11.bin 0x00000001000c7dad Dispatch + 785
-4 X11.bin 0x00000001000b97e5 dix_main + 1022
-5 X11.bin 0x00000001000122bc server_thread + 50
-6 libSystem.B.dylib 0x00007fff836554f6 _pthread_start + 331
-7 libSystem.B.dylib 0x00007fff836553a9 thread_start + 13
-
-http://lists.apple.com/archives/X11-users/2011/May/msg00045.html
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
-Reviewed-by: Adam Jackson <ajax at redhat.com>
-(cherry picked from commit 38df706c6b8a339c4267cae7be0881c4362f36da)
----
- hw/xquartz/GL/indirect.c | 12 +++++++++++-
- 1 files changed, 11 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.10.2/hw/xquartz/GL/indirect.c xorg-server-1.10.2/hw/xquartz/GL/indirect.c
-index 1375bea..db4fe83 100644
---- xorg-server-1.10.2/hw/xquartz/GL/indirect.c
-+++ xorg-server-1.10.2/hw/xquartz/GL/indirect.c
-@@ -682,7 +682,15 @@ GLuint __glFloorLog2(GLuint val)
- }
-
- static void setup_dispatch_table(void) {
-- struct _glapi_table *disp=_glapi_get_dispatch();
-+ static struct _glapi_table *disp = NULL;
-+
-+ if(disp) {
-+ _glapi_set_dispatch(disp);
-+ return;
-+ }
-+
-+ disp=calloc(1,sizeof(struct _glapi_table));
-+ assert(disp);
-
- /* to update:
- * for f in $(grep 'define SET_' ../../../glx/dispatch.h | cut -f2 -d' ' | cut -f1 -d\( | sort -u); do grep -q $f indirect.c || echo $f ; done | grep -v by_offset | sed 's:SET_\(.*\)$:SET_\1(disp, gl\1)\;:' | pbcopy
-@@ -1626,4 +1634,6 @@ static void setup_dispatch_table(void) {
- SET_PixelTexGenParameterivSGIS(disp, glPixelTexGenParameterivSGIS);
- SET_PixelTexGenSGIX(disp, glPixelTexGenSGIX);
- #endif
-+
-+ _glapi_set_dispatch(disp);
- }
---
-1.7.5.2
-
Deleted: trunk/dports/x11/xorg-server/files/0007-test-fix-memset-size-for-WindowRec-37801.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0007-test-fix-memset-size-for-WindowRec-37801.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/0007-test-fix-memset-size-for-WindowRec-37801.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,33 +0,0 @@
-From fe4af41314a6537b3fcc66955ccb6895639738b1 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Wed, 1 Jun 2011 10:24:43 +1000
-Subject: [PATCH 7/7] test: fix memset size for WindowRec (#37801)
-
-X.Org Bug 37801 <http://bugs.freedesktop.org/show_bug.cgi?id=37801>
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>
-Reviewed-by: Daniel Stone <daniel at fooishbar.org>
-Reviewed-by: Cyril Brulebois <kibi at debian.org>
-Signed-off-by: Keith Packard <keithp at keithp.com>
-(cherry picked from commit d9bda34d0df576d155e1d682d5e2a382b8e1ffda)
----
- test/xi2/protocol-common.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.10.2/test/xi2/protocol-common.c xorg-server-1.10.2/test/xi2/protocol-common.c
-index 10d82a5..cd9e81a 100644
---- xorg-server-1.10.2/test/xi2/protocol-common.c
-+++ xorg-server-1.10.2/test/xi2/protocol-common.c
-@@ -122,7 +122,7 @@ ClientRec init_client(int len, void *data)
-
- void init_window(WindowPtr window, WindowPtr parent, int id)
- {
-- memset(window, 0, sizeof(window));
-+ memset(window, 0, sizeof(*window));
-
- window->drawable.id = id;
- if (parent)
---
-1.7.5.2
-
Deleted: trunk/dports/x11/xorg-server/files/1001-XQuartz-Add-missing-include-for-pthread.h.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/1001-XQuartz-Add-missing-include-for-pthread.h.patch 2011-07-08 18:47:23 UTC (rev 80295)
+++ trunk/dports/x11/xorg-server/files/1001-XQuartz-Add-missing-include-for-pthread.h.patch 2011-07-08 20:17:02 UTC (rev 80296)
@@ -1,30 +0,0 @@
-From 1f3a4b189b98a44e82eae78a30dcbbc495512b12 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at apple.com>
-Date: Sun, 5 Jun 2011 21:59:13 -0400
-Subject: [PATCH] XQuartz: Add missing include for <pthread.h>
-
-BuildFix for Leopard and earlier.
-
-https://trac.macports.org/ticket/29717
-
-Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
----
- hw/xquartz/X11Application.m | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
-index a51ee82..31aa9b9 100644
---- a/hw/xquartz/X11Application.m
-+++ b/hw/xquartz/X11Application.m
-@@ -49,6 +49,8 @@
- #include <unistd.h>
- #include <AvailabilityMacros.h>
-
-+#include <pthread.h>
-+
- #include <Xplugin.h>
-
- // pbproxy/pbproxy.h
---
-1.7.5.4
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110708/99381f1b/attachment-0001.html>
More information about the macports-changes
mailing list