[132694] trunk/dports/x11/xorg-server-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sat Feb 7 15:15:22 PST 2015
Revision: 132694
https://trac.macports.org/changeset/132694
Author: jeremyhu at macports.org
Date: 2015-02-07 15:15:22 -0800 (Sat, 07 Feb 2015)
Log Message:
-----------
xorg-server-devel: Update to a slightly newer (but not master) xorg-server
Modified Paths:
--------------
trunk/dports/x11/xorg-server-devel/Portfile
trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch
trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
Removed Paths:
-------------
trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch
trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2015-02-07 23:15:22 UTC (rev 132694)
@@ -6,7 +6,7 @@
conflicts xorg-server
set my_name xorg-server
version 1.16.99.1
-revision 2
+revision 3
categories x11 devel
license X11
maintainers jeremyhu openmaintainer
@@ -17,7 +17,7 @@
fetch.type git
git.url git://anongit.freedesktop.org/xorg/xserver
-git.branch cff12936275db2f71f6d24f9ea0985a0d14af454
+git.branch e572bcc7f4236b7e0f23ab762f225b3bce37db59
use_parallel_build yes
@@ -81,8 +81,6 @@
RAWCPP=${configure.cpp}
patchfiles \
- 0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch \
- 0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch \
5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch \
5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch \
5002-Use-old-miTrapezoids-and-miTriangles-routines.patch \
Deleted: trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/0001-ListenOnOpenFD-Remove-Resets-since-this-is-intended-.patch 2015-02-07 23:15:22 UTC (rev 132694)
@@ -1,42 +0,0 @@
-From 2996b9bff99882f2bcd7eaf5540d2e6eb78fa668 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Wed, 23 Jul 2014 11:53:33 -0700
-Subject: [PATCH] ListenOnOpenFD: Remove Resets since this is intended to be
- for hotplugging connections
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-pharris says that the resets should not be done in the hotplugging case.
-
-This may fix a crash reported against XQuartz:
-http://xquartz.macosforge.org/trac/ticket/869
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-CC: Peter Harris <pharris at opentext.com>
-CC: Kristian Høgsberg <krh at bitplanet.net>
----
- os/connection.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/os/connection.c b/os/connection.c
-index 40d9ff3..f915e12 100644
---- a/os/connection.c
-+++ b/os/connection.c
-@@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
-
- /* Increment the count */
- ListenTransCount++;
--
-- /* This *might* not be needed... /shrug */
-- ResetAuthorization();
-- ResetHosts(display);
--#ifdef XDMCP
-- XdmcpReset();
--#endif
- }
-
- /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
---
-2.0.1
-
Deleted: trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/0001-mieq-Fix-a-crash-regression-in-mieqProcessDeviceEven.patch 2015-02-07 23:15:22 UTC (rev 132694)
@@ -1,43 +0,0 @@
-From 07389f7dc7504bcd3892b1031446fd3eb2573c7c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-Date: Sat, 19 Jul 2014 17:08:09 -0700
-Subject: [PATCH] mieq: Fix a crash regression in mieqProcessDeviceEvent
-
-(lldb) bt
-* thread #6: tid = 0x92d4eb, 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0,
-screen=0x0000000000000000) + 36 at mieq.c:519, stop reason = EXC_BAD_ACCESS (code=1, address=0x44)
- * frame #0: 0x00000001001dee94 X11.bin`mieqProcessDeviceEvent(dev=0x0000000000000000, event=0x0000000100298bb0, screen=0x0000000000000000) + 36 at
-mieq.c:519
- frame #1: 0x00000001001df3eb X11.bin`mieqProcessInputEvents + 555 at mieq.c:631
- frame #2: 0x0000000100017674 X11.bin`ProcessInputEvents + 20 at darwinEvents.c:422
- frame #3: 0x0000000100175eaa X11.bin`Dispatch + 154 at dispatch.c:357
- frame #4: 0x0000000100181b4a X11.bin`dix_main(argc=4, argv=0x00007fff5fbff750, envp=0x00007fff5fbff650) + 1594 at main.c:296
- frame #5: 0x000000010001ba80 X11.bin`server_thread(arg=0x0000000101208220) + 64 at quartzStartup.c:66
- frame #6: 0x00007fff89bb9899 libsystem_pthread.dylib`_pthread_body + 138
- frame #7: 0x00007fff89bb972a libsystem_pthread.dylib`_pthread_start + 137
- frame #8: 0x00007fff89bbdfc9 libsystem_pthread.dylib`thread_start + 13
-
-Regression from: 9fb08310b51b46736f3ca8dbc04efdf502420403
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
-CC: Peter Hutterer <peter.hutterer at who-t.net>
----
- mi/mieq.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mi/mieq.c b/mi/mieq.c
-index 872ff93..aced60d 100644
---- a/mi/mieq.c
-+++ b/mi/mieq.c
-@@ -516,7 +516,7 @@ mieqProcessDeviceEvent(DeviceIntPtr dev, InternalEvent *event, ScreenPtr screen)
- verify_internal_event(event);
-
- /* refuse events from disabled devices */
-- if (!dev->enabled)
-+ if (dev && !dev->enabled)
- return;
-
- /* Custom event handler */
---
-2.0.1
-
Modified: trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2015-02-07 23:15:22 UTC (rev 132694)
@@ -1,4 +1,4 @@
-From f2126ef96002eda432e1974f14a914dc075ef017 Mon Sep 17 00:00:00 2001
+From 19ba0d4ad155a66fcdbda925a1509273263db805 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu at apple.com>
Date: Fri, 13 Jan 2012 12:00:57 -0800
Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
@@ -14,7 +14,7 @@
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index c5992c3..71b6769 100644
+index 30f7c8f..22156d4 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
@@ -37,5 +37,5 @@
SDKSYMS_DEP = sdksyms.dep
-include $(SDKSYMS_DEP)
--
-2.0.1
+2.3.0
Modified: trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2015-02-07 23:15:22 UTC (rev 132694)
@@ -1,4 +1,4 @@
-From 2f09ff191ef3a03a992d15f6f8176db0892d32f4 Mon Sep 17 00:00:00 2001
+From 21b64fe49a2a26d0d57ce135a72a12c9736f5866 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 5001/5004] Workaround the GC clipping problem in miPaintWindow
@@ -10,10 +10,10 @@
1 file changed, 94 insertions(+), 10 deletions(-)
diff --git a/mi/miexpose.c b/mi/miexpose.c
-index 198c433..ad1621d 100644
+index de8ee6c..a6678a5 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
-@@ -489,7 +489,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
+@@ -408,7 +408,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
void RootlessStartDrawing(WindowPtr pWin);
void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
Bool IsFramedWindow(WindowPtr pWin);
@@ -23,7 +23,7 @@
void
miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-@@ -518,23 +519,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -437,23 +438,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
Bool solid = TRUE;
DrawablePtr drawable = &pWin->drawable;
@@ -70,7 +70,7 @@
while (pWin->backgroundState == ParentRelative)
pWin = pWin->parent;
-@@ -559,6 +574,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -478,6 +493,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
else {
PixmapPtr pixmap;
@@ -89,7 +89,7 @@
tile_x_off = drawable->x;
tile_y_off = drawable->y;
-@@ -567,6 +594,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -486,6 +513,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
return;
pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
drawable = &pixmap->drawable;
@@ -102,7 +102,7 @@
#ifdef COMPOSITE
draw_x_off = pixmap->screen_x;
draw_y_off = pixmap->screen_y;
-@@ -629,6 +662,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
+@@ -548,6 +581,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
ChangeGC(NullClient, pGC, gcmask, gcval);
ValidateGC(drawable, pGC);
@@ -161,5 +161,5 @@
pbox = RegionRects(prgn);
for (i = numRects; --i >= 0; pbox++, prect++) {
--
-2.0.1
+2.3.0
Modified: trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2015-02-07 23:15:22 UTC (rev 132694)
@@ -1,4 +1,4 @@
-From 8a899939a369a04a31d5c1d118079845890127d4 Mon Sep 17 00:00:00 2001
+From 07c2bb05052b9084055ed27e9c3637bfddabea41 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 2 Nov 2013 11:00:23 -0700
Subject: [PATCH 5002/5004] Use old miTrapezoids and miTriangles routines
@@ -19,10 +19,10 @@
5 files changed, 201 insertions(+), 4 deletions(-)
diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 21baf89..65eb2a4 100644
+index 7a9e46a..8e99cbe 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
-@@ -507,10 +507,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
ps->UnrealizeGlyph = fbUnrealizeGlyph;
ps->CompositeRects = miCompositeRects;
ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
@@ -34,10 +34,10 @@
return TRUE;
}
diff --git a/render/mipict.c b/render/mipict.c
-index 3959fc4..2bb1a1d 100644
+index a725104..e14293a 100644
--- a/render/mipict.c
+++ b/render/mipict.c
-@@ -595,8 +595,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
ps->Composite = 0; /* requires DDX support */
ps->Glyphs = miGlyphs;
ps->CompositeRects = miCompositeRects;
@@ -293,5 +293,5 @@
+}
+
--
-2.0.1
+2.3.0
Modified: trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:15:22 UTC (rev 132694)
@@ -1,4 +1,4 @@
-From f71e2f31e251f314aff23085f59bbbc79522b8d9 Mon Sep 17 00:00:00 2001
+From e21b429acf631776d3ebe14c3d5db9fa7f3656d7 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 5003/5004] fb: Revert fb changes that broke XQuartz
@@ -21,10 +21,10 @@
3 files changed, 43 insertions(+), 85 deletions(-)
diff --git a/fb/fb.h b/fb/fb.h
-index 9057767..f584154 100644
+index 5099b0f..dd91cae 100644
--- a/fb/fb.h
+++ b/fb/fb.h
-@@ -1652,8 +1652,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
+@@ -1383,8 +1383,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
RegionPtr pRegion, FbBits and, FbBits xor);
extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
@@ -35,7 +35,7 @@
extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 65eb2a4..e7a3811 100644
+index 8e99cbe..2ff9ae2 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -46,23 +46,18 @@ fbComposite(CARD8 op,
@@ -97,8 +97,8 @@
stride * sizeof(FbStride));
if (!image)
-@@ -329,57 +326,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
- if (pict->clientClipType != CT_NONE)
+@@ -321,57 +318,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+ if (pict->clientClip)
pixman_image_set_has_client_clip(image, TRUE);
- if (*xoff || *yoff)
@@ -159,7 +159,7 @@
}
switch (pict->repeatType) {
-@@ -407,10 +378,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -399,10 +370,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
* as the alpha map for this operation
*/
if (pict->alphaMap && !is_alpha_map) {
@@ -171,7 +171,7 @@
pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
pict->alphaOrigin.y);
-@@ -444,8 +413,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -436,8 +405,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
}
static pixman_image_t *
@@ -181,7 +181,7 @@
{
pixman_image_t *image = NULL;
-@@ -453,7 +421,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -445,7 +413,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
return NULL;
if (pict->pDrawable) {
@@ -190,7 +190,7 @@
}
else if (pict->pSourcePict) {
SourcePict *sp = pict->pSourcePict;
-@@ -471,19 +439,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -463,19 +431,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
else if (sp->type == SourcePictTypeConical)
image = create_conical_gradient_image(gradient);
}
@@ -312,5 +312,5 @@
DamageRegionProcessPending(pDst->pDrawable);
--
-2.0.1
+2.3.0
Modified: trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:09:10 UTC (rev 132693)
+++ trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch 2015-02-07 23:15:22 UTC (rev 132694)
@@ -1,4 +1,4 @@
-From bccceaa79183e23d7a3c60f36acd537e2f0d6564 Mon Sep 17 00:00:00 2001
+From 1298d92e044632b04d5693db7ac695ff709d2183 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sat, 31 May 2014 13:14:20 -0700
Subject: [PATCH 5004/5004] fb: Revert fb changes that broke XQuartz
@@ -20,10 +20,10 @@
4 files changed, 2 insertions(+), 166 deletions(-)
diff --git a/fb/fb.h b/fb/fb.h
-index f584154..25a7eff 100644
+index dd91cae..0b3bc95 100644
--- a/fb/fb.h
+++ b/fb/fb.h
-@@ -1310,9 +1310,6 @@ extern _X_EXPORT void
+@@ -1135,9 +1135,6 @@ extern _X_EXPORT void
extern _X_EXPORT Bool
fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
@@ -34,7 +34,7 @@
* fbpixmap.c
*/
diff --git a/fb/fbpict.c b/fb/fbpict.c
-index e7a3811..276ff06 100644
+index 2ff9ae2..9c4cc42 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
@@ -190,7 +190,7 @@
static pixman_image_t *
create_solid_fill_image(PicturePtr pict)
{
-@@ -469,8 +323,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+@@ -461,8 +315,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
return FALSE;
ps = GetPictureScreen(pScreen);
ps->Composite = fbComposite;
@@ -231,7 +231,7 @@
-
#endif /* _FBPICT_H_ */
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
-index 0d4d87f..e6ff1bd 100644
+index 71bcc5d..55330fc 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
@@ -243,5 +243,5 @@
free(depths[d].vids);
free(depths);
--
-2.0.1
+2.3.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150207/5d66ea8a/attachment-0001.html>
More information about the macports-changes
mailing list