[67551] trunk/dports/x11/xorg-server
jeremyhu at macports.org
jeremyhu at macports.org
Wed May 12 09:10:18 PDT 2010
Revision: 67551
http://trac.macports.org/changeset/67551
Author: jeremyhu at macports.org
Date: 2010-05-12 09:10:15 -0700 (Wed, 12 May 2010)
Log Message:
-----------
xorg-server: Bump to 1.8.1
Modified Paths:
--------------
trunk/dports/x11/xorg-server/Portfile
trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2010-05-12 15:51:02 UTC (rev 67550)
+++ trunk/dports/x11/xorg-server/Portfile 2010-05-12 16:10:15 UTC (rev 67551)
@@ -3,7 +3,8 @@
PortSystem 1.0
name xorg-server
-version 1.7.7
+set my_name xorg-server
+version 1.8.1
categories x11 devel
maintainers jeremyhu openmaintainer
description The X.org / Xquartz X server.
@@ -14,10 +15,13 @@
#master_sites http://xquartz.macosforge.org/downloads/src
master_sites http://xorg.freedesktop.org/archive/individual/xserver/
-checksums md5 8c0146330fb155c23d947ac37d431d4b \
- sha1 0f1b71363843b7e394d6de62d0db5b74d3e645ef \
- rmd160 19ab82795abe122cd267e4718152bf87af465829
+dist_subdir ${my_name}
+distname ${my_name}-${version}
+checksums md5 7c3b873692f4e93938261d774510e78d \
+ sha1 cba0d3b3d28696609a1f9b110d4d129cd066e133 \
+ rmd160 27bd6d1e565e241412f1fb8e18b5b9b194b94356
+
use_bzip2 yes
use_parallel_build yes
@@ -60,15 +64,12 @@
port:xorg-libXfont \
port:xorg-libXt \
port:xorg-libAppleWM \
- port:xorg-libXfixes \
- port:openssl
+ port:xorg-libXfixes
-# TODO: Remove openssl dependency with 1.8
-
configure.args --with-apple-applications-dir=${applications_dir} \
--with-launchd-id-prefix=org.macports \
--without-dtrace \
- --disable-dmx
+ --with-sha1=CommonCrypto
# GL/internal/dri_interface.h is missing in prefix (provided by libdrm for the xorg DDX... not helpful for us)
configure.cppflags-append -I/usr/include -I${filespath}/dri
Modified: trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2010-05-12 15:51:02 UTC (rev 67550)
+++ trunk/dports/x11/xorg-server/files/0001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch 2010-05-12 16:10:15 UTC (rev 67551)
@@ -1,4 +1,4 @@
-From ba1cac5853e9f916a8c3a37af1c7b637882f21ea Mon Sep 17 00:00:00 2001
+From a23a7b3a535e13044c3f511b13873591187552d1 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 1/2] Workaround the GC clipping problem in miPaintWindow and add some debugging output.
@@ -9,10 +9,10 @@
mi/miexpose.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 94 insertions(+), 11 deletions(-)
-diff --git xorg-server-1.7.7/mi/miexpose.c xorg-server-1.7.7/mi/miexpose.c
+diff --git xorg-server-1.8.0.902/mi/miexpose.c xorg-server-1.8.0.902/mi/miexpose.c
index f52b492..21493cb 100644
---- xorg-server-1.7.7/mi/miexpose.c
-+++ xorg-server-1.7.7/mi/miexpose.c
+--- xorg-server-1.8.0.902/mi/miexpose.c
++++ xorg-server-1.8.0.902/mi/miexpose.c
@@ -524,6 +524,7 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
void RootlessStartDrawing(WindowPtr pWin);
void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
Modified: trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-05-12 15:51:02 UTC (rev 67550)
+++ trunk/dports/x11/xorg-server/files/0002-fb-Revert-fb-changes-that-broke-XQuartz.patch 2010-05-12 16:10:15 UTC (rev 67551)
@@ -1,124 +1,47 @@
-From d678bddf9e58b7973bc9cddf242ddc0cf050c253 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu at freedesktop.org>
-Date: Sun, 31 Jan 2010 01:38:53 -0800
+From e7c02ccf2e1cab511df38c7035b66ead287c1e19 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 2/2] fb: Revert fb changes that broke XQuartz
http://bugs.freedesktop.org/show_bug.cgi?id=26124
Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
-Revert "fb: backport fb changes from master for src window operations."
+Revert "fb: Adjust transform or composite coordinates for pixman operations"
-This reverts commit 66b6e2fd49fdc650703e56aa176a902e4921251c.
-This reverts commit 2d6a8f668342a5190cdf43b5d385f592d10f5900.
+http://bugs.freedesktop.org/26124
-Signed-off-by: Jeremy Huddleston <jeremyhu at freedesktop.org>
+This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
+This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
---
- fb/fb.h | 76 +++++++++++++++++++++----------------------------
- fb/fbpict.c | 86 ++++++++++++++++---------------------------------------
- fb/fbtrap.c | 6 +--
- fb/wfbrename.h | 1 -
- 4 files changed, 60 insertions(+), 109 deletions(-)
+ fb/fb.h | 7 +----
+ fb/fbpict.c | 72 ++++++++++++++++++-----------------------------------------
+ fb/fbtrap.c | 6 +---
+ 3 files changed, 26 insertions(+), 59 deletions(-)
-diff --git xorg-server-1.7.7/fb/fb.h xorg-server-1.7.7/fb/fb.h
-index 8b2839a..37de71e 100644
---- xorg-server-1.7.7/fb/fb.h
-+++ xorg-server-1.7.7/fb/fb.h
-@@ -700,41 +700,38 @@ typedef struct {
- #define __fbPixOffXPix(pPix) (__fbPixDrawableX(pPix))
- #define __fbPixOffYPix(pPix) (__fbPixDrawableY(pPix))
-
--#define fbGetDrawablePixmap(pDrawable, pixmap, xoff, yoff) { \
-- if ((pDrawable)->type != DRAWABLE_PIXMAP) { \
-- (pixmap) = fbGetWindowPixmap(pDrawable); \
-- (xoff) = __fbPixOffXWin(pixmap); \
-- (yoff) = __fbPixOffYWin(pixmap); \
-- } else { \
-- (pixmap) = (PixmapPtr) (pDrawable); \
-- (xoff) = __fbPixOffXPix(pixmap); \
-- (yoff) = __fbPixOffYPix(pixmap); \
-- } \
-- fbPrepareAccess(pDrawable); \
--}
--
--#define fbGetPixmapBitsData(pixmap, pointer, stride, bpp) { \
-- (pointer) = (FbBits *) (pixmap)->devPrivate.ptr; \
-- (stride) = ((int) (pixmap)->devKind) / sizeof (FbBits); (void)(stride); \
-- (bpp) = (pixmap)->drawable.bitsPerPixel; (void)(bpp); \
--}
--
--#define fbGetPixmapStipData(pixmap, pointer, stride, bpp) { \
-- (pointer) = (FbStip *) (pixmap)->devPrivate.ptr; \
-- (stride) = ((int) (pixmap)->devKind) / sizeof (FbStip); (void)(stride); \
-- (bpp) = (pixmap)->drawable.bitsPerPixel; (void)(bpp); \
--}
--
--#define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
-- PixmapPtr _pPix; \
-- fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff); \
-- fbGetPixmapBitsData(_pPix, pointer, stride, bpp); \
-+#define fbGetDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
-+ PixmapPtr _pPix; \
-+ if ((pDrawable)->type != DRAWABLE_PIXMAP) { \
-+ _pPix = fbGetWindowPixmap(pDrawable); \
-+ (xoff) = __fbPixOffXWin(_pPix); \
-+ (yoff) = __fbPixOffYWin(_pPix); \
-+ } else { \
-+ _pPix = (PixmapPtr) (pDrawable); \
-+ (xoff) = __fbPixOffXPix(_pPix); \
-+ (yoff) = __fbPixOffYPix(_pPix); \
-+ } \
-+ fbPrepareAccess(pDrawable); \
-+ (pointer) = (FbBits *) _pPix->devPrivate.ptr; \
-+ (stride) = ((int) _pPix->devKind) / sizeof (FbBits); (void)(stride); \
-+ (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
- }
-
--#define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
-- PixmapPtr _pPix; \
-- fbGetDrawablePixmap(pDrawable, _pPix, xoff, yoff); \
-- fbGetPixmapStipData(_pPix, pointer, stride, bpp); \
-+#define fbGetStipDrawable(pDrawable, pointer, stride, bpp, xoff, yoff) { \
-+ PixmapPtr _pPix; \
-+ if ((pDrawable)->type != DRAWABLE_PIXMAP) { \
-+ _pPix = fbGetWindowPixmap(pDrawable); \
-+ (xoff) = __fbPixOffXWin(_pPix); \
-+ (yoff) = __fbPixOffYWin(_pPix); \
-+ } else { \
-+ _pPix = (PixmapPtr) (pDrawable); \
-+ (xoff) = __fbPixOffXPix(_pPix); \
-+ (yoff) = __fbPixOffYPix(_pPix); \
-+ } \
-+ fbPrepareAccess(pDrawable); \
-+ (pointer) = (FbStip *) _pPix->devPrivate.ptr; \
-+ (stride) = ((int) _pPix->devKind) / sizeof (FbStip); (void)(stride); \
-+ (bpp) = _pPix->drawable.bitsPerPixel; (void)(bpp); \
- }
-
- /*
-@@ -2082,16 +2079,9 @@ fbFillRegionSolid (DrawablePtr pDrawable,
+diff --git xorg-server-1.8.0.902/fb/fb.h xorg-server-1.8.0.902/fb/fb.h
+index 02d6c03..ed21f9e 100644
+--- xorg-server-1.8.0.902/fb/fb.h
++++ xorg-server-1.8.0.902/fb/fb.h
+@@ -2082,11 +2082,8 @@ fbFillRegionSolid (DrawablePtr pDrawable,
FbBits xor);
extern _X_EXPORT pixman_image_t *
-image_from_pict (PicturePtr pict,
- Bool has_clip,
-- Bool is_src);
--
--extern _X_EXPORT pixman_image_t *
--image_from_pict_18 (PicturePtr pict,
-- Bool has_clip,
- int *xoff,
- int *yoff);
-
+image_from_pict (PicturePtr pict,
-+ Bool has_clip,
-+ Bool is_src);
++ Bool has_clip);
extern _X_EXPORT void free_pixman_pict (PicturePtr, pixman_image_t *);
#endif /* _FB_H_ */
-diff --git xorg-server-1.7.7/fb/fbpict.c xorg-server-1.7.7/fb/fbpict.c
-index c046bae..8fdaa58 100644
---- xorg-server-1.7.7/fb/fbpict.c
-+++ xorg-server-1.7.7/fb/fbpict.c
+diff --git xorg-server-1.8.0.902/fb/fbpict.c xorg-server-1.8.0.902/fb/fbpict.c
+index dddfce8..07a2286 100644
+--- xorg-server-1.8.0.902/fb/fbpict.c
++++ xorg-server-1.8.0.902/fb/fbpict.c
@@ -158,24 +158,19 @@ fbComposite (CARD8 op,
CARD16 height)
{
@@ -127,18 +50,16 @@
- int msk_xoff, msk_yoff;
- int dst_xoff, dst_yoff;
-- miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
-+ miCompositeSourceValidate (pSrc, xSrc, ySrc, width, height);
+ miCompositeSourceValidate (pSrc, xSrc - xDst, ySrc - yDst, width, height);
if (pMask)
-- miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
-+ miCompositeSourceValidate (pMask, xMask, yMask, width, height);
+ miCompositeSourceValidate (pMask, xMask - xDst, yMask - yDst, width, height);
-- src = image_from_pict_18 (pSrc, FALSE, &src_xoff, &src_yoff);
-- mask = image_from_pict_18 (pMask, FALSE, &msk_xoff, &msk_yoff);
-- dest = image_from_pict_18 (pDst, TRUE, &dst_xoff, &dst_yoff);
-+ src = image_from_pict (pSrc, TRUE, TRUE);
-+ mask = image_from_pict (pMask, TRUE, TRUE);
-+ dest = image_from_pict (pDst, TRUE, FALSE);
+- src = image_from_pict (pSrc, FALSE, &src_xoff, &src_yoff);
+- mask = image_from_pict (pMask, FALSE, &msk_xoff, &msk_yoff);
+- dest = image_from_pict (pDst, TRUE, &dst_xoff, &dst_yoff);
++ src = image_from_pict (pSrc, TRUE);
++ mask = image_from_pict (pMask, TRUE);
++ dest = image_from_pict (pDst, TRUE);
if (src && dest && !(pMask && !mask))
{
@@ -244,25 +165,22 @@
if (pict->alphaMap)
{
- int alpha_xoff, alpha_yoff;
-- pixman_image_t *alpha_map = image_from_pict_18 (pict->alphaMap, FALSE, &alpha_xoff, &alpha_yoff);
-+ pixman_image_t *alpha_map = image_from_pict (pict->alphaMap, TRUE, TRUE);
+- 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_set_alpha_map (
image, alpha_map, pict->alphaOrigin.x, pict->alphaOrigin.y);
-@@ -421,9 +393,10 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
- pixman_image_set_source_clipping (image, TRUE);
+@@ -422,7 +394,8 @@ set_image_properties (pixman_image_t *image, PicturePtr pict, Bool has_clip, int
}
--
pixman_image_t *
--image_from_pict_18 (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+-image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+image_from_pict (PicturePtr pict,
-+ Bool has_clip,
-+ Bool is_src)
++ Bool has_clip)
{
pixman_image_t *image = NULL;
-@@ -432,7 +405,7 @@ image_from_pict_18 (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+@@ -431,7 +404,7 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
if (pict->pDrawable)
{
@@ -271,7 +189,7 @@
}
else if (pict->pSourcePict)
{
-@@ -453,22 +426,14 @@ image_from_pict_18 (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+@@ -452,11 +425,10 @@ image_from_pict (PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
else if (sp->type == SourcePictTypeConical)
image = create_conical_gradient_image (gradient);
}
@@ -284,33 +202,17 @@
return image;
}
-
--pixman_image_t *
--image_from_pict (PicturePtr pict, Bool has_clip, Bool is_src)
--{
-- int xoff = 0, yoff = 0;
-- return image_from_pict_18(pict, has_clip, &xoff, &yoff);
--}
--
- void
- free_pixman_pict (PicturePtr pict, pixman_image_t *image)
- {
-@@ -498,4 +463,3 @@ fbPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-
- return TRUE;
- }
--
-diff --git xorg-server-1.7.7/fb/fbtrap.c xorg-server-1.7.7/fb/fbtrap.c
-index 5b5aeae..b1e1eff 100644
---- xorg-server-1.7.7/fb/fbtrap.c
-+++ xorg-server-1.7.7/fb/fbtrap.c
+diff --git xorg-server-1.8.0.902/fb/fbtrap.c xorg-server-1.8.0.902/fb/fbtrap.c
+index 515e2e1..830603a 100644
+--- xorg-server-1.8.0.902/fb/fbtrap.c
++++ xorg-server-1.8.0.902/fb/fbtrap.c
@@ -40,8 +40,7 @@ fbAddTraps (PicturePtr pPicture,
int ntrap,
xTrap *traps)
{
- int image_xoff, image_yoff;
-- pixman_image_t *image = image_from_pict_18 (pPicture, FALSE, &image_xoff, &image_yoff);
-+ pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
+- pixman_image_t *image = image_from_pict (pPicture, FALSE, &image_xoff, &image_yoff);
++ pixman_image_t *image = image_from_pict (pPicture, FALSE);
if (!image)
return;
@@ -319,21 +221,11 @@
int y_off)
{
- int mask_xoff, mask_yoff;
-- pixman_image_t *image = image_from_pict_18 (pPicture, FALSE, &mask_xoff, &mask_yoff);
-+ pixman_image_t *image = image_from_pict (pPicture, FALSE, FALSE);
+- pixman_image_t *image = image_from_pict (pPicture, FALSE, &mask_xoff, &mask_yoff);
++ pixman_image_t *image = image_from_pict (pPicture, FALSE);
if (!image)
return;
-diff --git xorg-server-1.7.7/fb/wfbrename.h xorg-server-1.7.7/fb/wfbrename.h
-index e9cdca8..73ee510 100644
---- xorg-server-1.7.7/fb/wfbrename.h
-+++ xorg-server-1.7.7/fb/wfbrename.h
-@@ -187,5 +187,4 @@
- #define fbZeroSegment wfbZeroSegment
- #define free_pixman_pict wfb_free_pixman_pict
- #define image_from_pict wfb_image_from_pict
--#define image_from_pict_18 wfb_image_from_pict_18
- #define composeFunctions wfbComposeFunctions
--
1.7.0.4
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100512/01e0d3c3/attachment.html>
More information about the macports-changes
mailing list