[69068] trunk/dports/x11/xorg-server-devel
jeremyhu at macports.org
jeremyhu at macports.org
Tue Jun 22 14:53:55 PDT 2010
Revision: 69068
http://trac.macports.org/changeset/69068
Author: jeremyhu at macports.org
Date: 2010-06-22 14:53:54 -0700 (Tue, 22 Jun 2010)
Log Message:
-----------
xorg-server-devel: Bump to 1.8.99.903 (1.9 RC3)
Modified Paths:
--------------
trunk/dports/x11/xorg-server-devel/Portfile
Removed Paths:
-------------
trunk/dports/x11/xorg-server-devel/files/0001-Clean-up-RandR12-bits-on-screen-close-bug-27114.patch
trunk/dports/x11/xorg-server-devel/files/0002-In-DRI2Connect-check-to-see-if-DRI2-has-been-initial.patch
trunk/dports/x11/xorg-server-devel/files/0003-Re-enabled-Xnest-fix-for-focus-in-modifier-bug.patch
trunk/dports/x11/xorg-server-devel/files/0004-dix-the-default-axis-mode-is-Relative-not-0.patch
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2010-06-22 19:55:25 UTC (rev 69067)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2010-06-22 21:53:54 UTC (rev 69068)
@@ -4,7 +4,7 @@
name xorg-server-devel
set my_name xorg-server
-version 1.8.99.901
+version 1.8.99.903
categories x11 devel
maintainers jeremyhu openmaintainer
description The X.org / Xquartz X server.
@@ -18,9 +18,9 @@
dist_subdir ${my_name}
distname ${my_name}-${version}
-checksums md5 ebc580fcf4ad9fb03ab9119525467f4a \
- sha1 f2409a8fac39e3648312b3be11f54fc0317b2b4d \
- rmd160 7fdb0af51c0a74e8a8271d9461536116d4ee3be5
+checksums md5 d49305baa79772ca965407b0fd2dcb84 \
+ sha1 d0b0df07336d45c35cea63c17b216bda9eea6ea6 \
+ rmd160 d9eead21c6b62d416feaacb5cb28c2bcecc970fc
use_bzip2 yes
use_parallel_build yes
@@ -82,10 +82,6 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0001-Clean-up-RandR12-bits-on-screen-close-bug-27114.patch \
- 0002-In-DRI2Connect-check-to-see-if-DRI2-has-been-initial.patch \
- 0003-Re-enabled-Xnest-fix-for-focus-in-modifier-bug.patch \
- 0004-dix-the-default-axis-mode-is-Relative-not-0.patch \
0005-XQuartz-Remove-some-dead-code.patch \
0006-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
0007-fb-Revert-fb-changes-that-broke-XQuartz.patch
Deleted: trunk/dports/x11/xorg-server-devel/files/0001-Clean-up-RandR12-bits-on-screen-close-bug-27114.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-Clean-up-RandR12-bits-on-screen-close-bug-27114.patch 2010-06-22 19:55:25 UTC (rev 69067)
+++ trunk/dports/x11/xorg-server-devel/files/0001-Clean-up-RandR12-bits-on-screen-close-bug-27114.patch 2010-06-22 21:53:54 UTC (rev 69068)
@@ -1,92 +0,0 @@
-From 68a9ee8370e6f9b38218376ac92d5130a5b0ef1e Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp at keithp.com>
-Date: Fri, 7 May 2010 22:56:04 -0700
-Subject: [PATCH 1/7] Clean up RandR12 bits on screen close (bug 27114)
-
-When resetting the server, pScrn->EnterVT must be unwrapped or the
-next server generation will end up wrapping the wrapper and causing an
-infinite recursion on EnterVT.
-
-Signed-off-by: Keith Packard <keithp at keithp.com>
-Tested-by: Michael Stapelberg <michael+freedesktop at stapelberg.de>
----
- hw/xfree86/modes/xf86Crtc.c | 2 ++
- hw/xfree86/modes/xf86RandR12.c | 26 +++++++++++++++++++++++++-
- hw/xfree86/modes/xf86RandR12.h | 1 +
- 3 files changed, 28 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.8.99.901/hw/xfree86/modes/xf86Crtc.c xorg-server-1.8.99.901/hw/xfree86/modes/xf86Crtc.c
-index a62a63f..7f6fad3 100644
---- xorg-server-1.8.99.901/hw/xfree86/modes/xf86Crtc.c
-+++ xorg-server-1.8.99.901/hw/xfree86/modes/xf86Crtc.c
-@@ -753,6 +753,8 @@ xf86CrtcCloseScreen (int index, ScreenPtr screen)
-
- crtc->randr_crtc = NULL;
- }
-+ xf86RandR12CloseScreen (screen);
-+
- return screen->CloseScreen (index, screen);
- }
-
-diff --git xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.c xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.c
-index bb4d75e..043ceee 100644
---- xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.c
-+++ xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.c
-@@ -928,6 +928,24 @@ xf86RandR12Init (ScreenPtr pScreen)
- }
-
- void
-+xf86RandR12CloseScreen (ScreenPtr pScreen)
-+{
-+ XF86RandRInfoPtr randrp;
-+
-+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)
-+ if (xf86RandR12Key == NULL)
-+ return;
-+#endif
-+
-+ randrp = XF86RANDRINFO(pScreen);
-+#if RANDR_12_INTERFACE
-+ xf86Screens[pScreen->myNum]->EnterVT = randrp->orig_EnterVT;
-+#endif
-+
-+ free(randrp);
-+}
-+
-+void
- xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotations)
- {
- XF86RandRInfoPtr randrp;
-@@ -1755,10 +1773,16 @@ static Bool
- xf86RandR12EnterVT (int screen_index, int flags)
- {
- ScreenPtr pScreen = screenInfo.screens[screen_index];
-+ ScrnInfoPtr pScrn = xf86Screens[screen_index];
- XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
-+ Bool ret;
-
- if (randrp->orig_EnterVT) {
-- if (!randrp->orig_EnterVT (screen_index, flags))
-+ pScrn->EnterVT = randrp->orig_EnterVT;
-+ ret = pScrn->EnterVT (screen_index, flags);
-+ randrp->orig_EnterVT = pScrn->EnterVT;
-+ pScrn->EnterVT = xf86RandR12EnterVT;
-+ if (!ret)
- return FALSE;
- }
-
-diff --git xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.h xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.h
-index c8d9918..0c586be 100644
---- xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.h
-+++ xorg-server-1.8.99.901/hw/xfree86/modes/xf86RandR12.h
-@@ -30,6 +30,7 @@
-
- extern _X_EXPORT Bool xf86RandR12CreateScreenResources (ScreenPtr pScreen);
- extern _X_EXPORT Bool xf86RandR12Init(ScreenPtr pScreen);
-+extern _X_EXPORT void xf86RandR12CloseScreen(ScreenPtr pScreen);
- extern _X_EXPORT void xf86RandR12SetRotations (ScreenPtr pScreen, Rotation rotation);
- extern _X_EXPORT void xf86RandR12SetTransformSupport (ScreenPtr pScreen, Bool transforms);
- extern _X_EXPORT Bool xf86RandR12SetConfig(ScreenPtr pScreen, Rotation rotation, int rate,
---
-1.7.1
-
Deleted: trunk/dports/x11/xorg-server-devel/files/0002-In-DRI2Connect-check-to-see-if-DRI2-has-been-initial.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0002-In-DRI2Connect-check-to-see-if-DRI2-has-been-initial.patch 2010-06-22 19:55:25 UTC (rev 69067)
+++ trunk/dports/x11/xorg-server-devel/files/0002-In-DRI2Connect-check-to-see-if-DRI2-has-been-initial.patch 2010-06-22 21:53:54 UTC (rev 69068)
@@ -1,35 +0,0 @@
-From 505724c5f3e4fc1475fa54f20d08c0c06fb32443 Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp at keithp.com>
-Date: Mon, 7 Jun 2010 16:28:34 -0700
-Subject: [PATCH 2/7] In DRI2Connect, check to see if DRI2 has been initialized (bug 28424)
-
-This prevents DRI2GetScreen from being invoked with an uninitialized
-private key which would cause an assert failure.
-
-Signed-off-by: Keith Packard <keithp at keithp.com>
-Tested-by: David Ronis <David.Ronis at McGill.CA>
----
- hw/xfree86/dri2/dri2.c | 6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.8.99.901/hw/xfree86/dri2/dri2.c xorg-server-1.8.99.901/hw/xfree86/dri2/dri2.c
-index 27d8e25..a8dedfa 100644
---- xorg-server-1.8.99.901/hw/xfree86/dri2/dri2.c
-+++ xorg-server-1.8.99.901/hw/xfree86/dri2/dri2.c
-@@ -957,8 +957,12 @@ Bool
- DRI2Connect(ScreenPtr pScreen, unsigned int driverType, int *fd,
- const char **driverName, const char **deviceName)
- {
-- DRI2ScreenPtr ds = DRI2GetScreen(pScreen);
-+ DRI2ScreenPtr ds;
-+
-+ if (!dixPrivateKeyRegistered(dri2ScreenPrivateKey))
-+ return FALSE;
-
-+ ds = DRI2GetScreen(pScreen);
- if (ds == NULL || driverType >= ds->numDrivers ||
- !ds->driverNames[driverType])
- return FALSE;
---
-1.7.1
-
Deleted: trunk/dports/x11/xorg-server-devel/files/0003-Re-enabled-Xnest-fix-for-focus-in-modifier-bug.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0003-Re-enabled-Xnest-fix-for-focus-in-modifier-bug.patch 2010-06-22 19:55:25 UTC (rev 69067)
+++ trunk/dports/x11/xorg-server-devel/files/0003-Re-enabled-Xnest-fix-for-focus-in-modifier-bug.patch 2010-06-22 21:53:54 UTC (rev 69068)
@@ -1,161 +0,0 @@
-From db0d3d4e573c93a8af43499682ed788c7bd0d70d Mon Sep 17 00:00:00 2001
-From: Xiaoyang Yu (Max) <max.a.yu at intel.com>
-Date: Fri, 4 Jun 2010 17:17:53 +0800
-Subject: [PATCH 3/7] Re-enabled Xnest fix for focus in + modifier bug.
-
-* See https://bugs.freedesktop.org/show_bug.cgi?id=3030
-
-Signed-off-by: Xiaoyang Yu (Max) <max.a.yu at intel.com>
-Reviewed-by: Mikhail Gusarov <dottedmag at dottedmag.net>
-
-This takes the xnest way of working around this (see
-5904ef2ccd6056b187ca76f104c21e2d686bfc1d "xnest: restore
-xnestUpdateModifierState") and copies it to Xephyr.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
----
- hw/kdrive/ephyr/ephyr.c | 107 ++++++++++++++++++++---------------------------
- 1 files changed, 45 insertions(+), 62 deletions(-)
-
-diff --git xorg-server-1.8.99.901/hw/kdrive/ephyr/ephyr.c xorg-server-1.8.99.901/hw/kdrive/ephyr/ephyr.c
-index e0cb956..bd7deed 100644
---- xorg-server-1.8.99.901/hw/kdrive/ephyr/ephyr.c
-+++ xorg-server-1.8.99.901/hw/kdrive/ephyr/ephyr.c
-@@ -38,6 +38,8 @@
- #include "ephyrglxext.h"
- #endif /* XF86DRI */
-
-+#include "xkbsrv.h"
-+
- extern int KdTsPhyScreen;
- #ifdef GLXEXT
- extern Bool noGlxVisualInit;
-@@ -748,75 +750,55 @@ ephyrScreenFini (KdScreenInfo *screen)
- void
- ephyrUpdateModifierState(unsigned int state)
- {
--#if 0
-- DeviceIntPtr pkeydev;
-- KeyClassPtr keyc;
-- int i;
-- CARD8 mask;
--
-- pkeydev = inputInfo.keyboard;
-
-- if (!pkeydev)
-- return;
-+ DeviceIntPtr pDev = inputInfo.keyboard;
-+ KeyClassPtr keyc = pDev->key;
-+ int i;
-+ CARD8 mask;
-+ int xkb_state;
-
--/* This is pretty broken.
-- *
-- * What should happen is that focus out should do as a VT switch does in
-- * traditional servers: fake releases for all keys (and buttons too, come
-- * to think of it) currently down. Then, on focus in, get the state from
-- * the host, and fake keypresses for everything currently down.
-- *
-- * So I'm leaving this broken for a little while. Sorry, folks.
-- *
-- * -daniels
-- */
-+ if (!pDev)
-+ return;
-
-- keyc = pkeydev->key;
--
-+ xkb_state = XkbStateFieldFromRec(&pDev->key->xkbInfo->state);
- state = state & 0xff;
--
-- if (keyc->state == state)
-+
-+ if (xkb_state == state)
- return;
--
-- for (i = 0, mask = 1; i < 8; i++, mask <<= 1)
-- {
-- int key;
-
-- /* Modifier is down, but shouldn't be */
-- if ((keyc->state & mask) && !(state & mask))
-- {
-- int count = keyc->modifierKeyCount[i];
--
-- for (key = 0; key < MAP_LENGTH; key++)
-- if (keyc->xkbInfo->desc->map->modmap[key] & mask)
-- {
-- int bit;
-- BYTE *kptr;
--
-- kptr = &keyc->down[key >> 3];
-- bit = 1 << (key & 7);
--
-- if (*kptr & bit && ephyrKbd &&
-- ((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-- KdEnqueueKeyboardEvent(ephyrKbd, key, TRUE); /* release */
--
-- if (--count == 0)
-- break;
-- }
-- }
--
-- /* Modifier shoud be down, but isn't */
-- if (!(keyc->state & mask) && (state & mask))
-- for (key = 0; key < MAP_LENGTH; key++)
-- if (keyc->xkbInfo->desc->map->modmap[key] & mask)
-- {
-- if (keyc->xkbInfo->desc->map->modmap[key] & mask && ephyrKbd &&
-- ((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
-- KdEnqueueKeyboardEvent(ephyrKbd, key, FALSE); /* press */
-- break;
-- }
-+ for (i = 0, mask = 1; i < 8; i++, mask <<= 1) {
-+ int key;
-+
-+ /* Modifier is down, but shouldn't be
-+ */
-+ if ((xkb_state & mask) && !(state & mask)) {
-+ int count = keyc->modifierKeyCount[i];
-+
-+ for (key = 0; key < MAP_LENGTH; key++)
-+ if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
-+ int bit;
-+ BYTE *kptr;
-+
-+ kptr = &keyc->down[key >> 3];
-+ bit = 1 << (key & 7);
-+
-+ if (*kptr & bit)
-+ KdEnqueueKeyboardEvent (ephyrKbd, key, TRUE);
-+
-+ if (--count == 0)
-+ break;
-+ }
- }
--#endif
-+
-+ /* Modifier shoud be down, but isn't
-+ */
-+ if (!(xkb_state & mask) && (state & mask))
-+ for (key = 0; key < MAP_LENGTH; key++)
-+ if (keyc->xkbInfo->desc->map->modmap[key] & mask) {
-+ KdEnqueueKeyboardEvent (ephyrKbd, key, FALSE);
-+ break;
-+ }
-+ }
- }
-
- static void
-@@ -998,6 +980,7 @@ ephyrPoll(void)
- if (!ephyrKbd ||
- !((EphyrKbdPrivate *)ephyrKbd->driverPrivate)->enabled)
- continue;
-+ ephyrUpdateModifierState(ev.key_state);
- KdEnqueueKeyboardEvent (ephyrKbd, ev.data.key_up.scancode, TRUE);
- break;
-
---
-1.7.1
-
Deleted: trunk/dports/x11/xorg-server-devel/files/0004-dix-the-default-axis-mode-is-Relative-not-0.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0004-dix-the-default-axis-mode-is-Relative-not-0.patch 2010-06-22 19:55:25 UTC (rev 69067)
+++ trunk/dports/x11/xorg-server-devel/files/0004-dix-the-default-axis-mode-is-Relative-not-0.patch 2010-06-22 21:53:54 UTC (rev 69068)
@@ -1,29 +0,0 @@
-From 868bf3de478fac0080d525137fc728c551c78ea6 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer at who-t.net>
-Date: Tue, 15 Jun 2010 13:22:20 +1000
-Subject: [PATCH 4/7] dix: the default axis mode is Relative, not "0".
-
-Yay for readability.
-
-Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
-Reviewed-by: Fernando Carrijo <fcarrijo at yahoo.com.br>
----
- dix/devices.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git xorg-server-1.8.99.901/dix/devices.c xorg-server-1.8.99.901/dix/devices.c
-index bca2caf..034d5e6 100644
---- xorg-server-1.8.99.901/dix/devices.c
-+++ xorg-server-1.8.99.901/dix/devices.c
-@@ -1546,7 +1546,7 @@ InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons, Atom* btn_
-
- return(InitButtonClassDeviceStruct(dev, numButtons, btn_labels, map) &&
- InitValuatorClassDeviceStruct(dev, numAxes, axes_labels,
-- numMotionEvents, 0) &&
-+ numMotionEvents, Relative) &&
- InitPtrFeedbackClassDeviceStruct(dev, controlProc));
- }
-
---
-1.7.1
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100622/89b6ed42/attachment.html>
More information about the macports-changes
mailing list