[132697] trunk/dports/x11/xorg-server-devel

jeremyhu at macports.org jeremyhu at macports.org
Sat Feb 7 15:44:32 PST 2015


Revision: 132697
          https://trac.macports.org/changeset/132697
Author:   jeremyhu at macports.org
Date:     2015-02-07 15:44:32 -0800 (Sat, 07 Feb 2015)
Log Message:
-----------
xorg-server-devel: Bump to 1.17.0

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

Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile	2015-02-07 23:35:42 UTC (rev 132696)
+++ trunk/dports/x11/xorg-server-devel/Portfile	2015-02-07 23:44:32 UTC (rev 132697)
@@ -5,7 +5,7 @@
 name		xorg-server-devel
 conflicts       xorg-server
 set my_name	xorg-server
-version		1.16.99.901
+version		1.17.0
 categories	x11 devel
 license         X11
 maintainers	jeremyhu openmaintainer
@@ -16,7 +16,7 @@
 
 fetch.type      git
 git.url         git://anongit.freedesktop.org/xorg/xserver
-git.branch      96143d6dc35c98cb6b4e409dd89687e4ced3c1f0
+git.branch      xorg-server-1.17.0
 
 use_parallel_build yes
 

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:35:42 UTC (rev 132696)
+++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2015-02-07 23:44:32 UTC (rev 132697)
@@ -1,4 +1,4 @@
-From a7a7bc03d092d0224c5241dfd203f65763bb853c Mon Sep 17 00:00:00 2001
+From f0716c45eabc27f62e43ecd6e4001cb5b92a9203 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 d46bf0a..de86285 100644
+index 27f2cc6..d898c43 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 \

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:35:42 UTC (rev 132696)
+++ trunk/dports/x11/xorg-server-devel/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2015-02-07 23:44:32 UTC (rev 132697)
@@ -1,4 +1,4 @@
-From 672a4c1b34ad27581f39334f6706745c45626cc0 Mon Sep 17 00:00:00 2001
+From 8ce19f5a2e0c31e7d3ce3daa6f7f08eefc8f1031 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,7 +10,7 @@
  1 file changed, 94 insertions(+), 10 deletions(-)
 
 diff --git a/mi/miexpose.c b/mi/miexpose.c
-index e74b9c3..5360b73 100644
+index fc4dbc0..5e31b83 100644
 --- a/mi/miexpose.c
 +++ b/mi/miexpose.c
 @@ -408,7 +408,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);

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:35:42 UTC (rev 132696)
+++ trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch	2015-02-07 23:44:32 UTC (rev 132697)
@@ -1,4 +1,4 @@
-From e09892ca4ddd83205fc265c653b6fde2dc22619a Mon Sep 17 00:00:00 2001
+From 2b3d9d3d7cb433b60a749c06d1e02873802ad492 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,7 +19,7 @@
  5 files changed, 201 insertions(+), 4 deletions(-)
 
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index e726691..f6deae7 100644
+index c8378ad..cafb027 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
 @@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
@@ -49,7 +49,7 @@
      ps->RasterizeTrapezoid = 0; /* requires DDX support */
      ps->AddTraps = 0;           /* requires DDX support */
 diff --git a/render/mipict.h b/render/mipict.h
-index a16dd31..ee90b58 100644
+index 23ce9e8..e0f1d4c 100644
 --- a/render/mipict.h
 +++ b/render/mipict.h
 @@ -122,6 +122,16 @@ miCompositeRects(CARD8 op,

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:35:42 UTC (rev 132696)
+++ trunk/dports/x11/xorg-server-devel/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch	2015-02-07 23:44:32 UTC (rev 132697)
@@ -1,4 +1,4 @@
-From c0fbd4545720941a89fdf2191e09d83a004a3f96 Mon Sep 17 00:00:00 2001
+From 577d85c19e372140e037c6576a159108054ccaf7 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
@@ -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 f6deae7..219eae0 100644
+index cafb027..6ee63e9 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
 @@ -46,23 +46,18 @@ fbComposite(CARD8 op,

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:35:42 UTC (rev 132696)
+++ trunk/dports/x11/xorg-server-devel/files/5004-fb-Revert-fb-changes-that-broke-XQuartz.patch	2015-02-07 23:44:32 UTC (rev 132697)
@@ -1,4 +1,4 @@
-From 299f24e5dca1cb094ce015763f58e7791613958e Mon Sep 17 00:00:00 2001
+From 6ec80b7b3e4c76f6bdb0afacbe8acf21984b43fe 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
@@ -34,7 +34,7 @@
   * fbpixmap.c
   */
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 219eae0..9c4cc42 100644
+index 6ee63e9..9c4cc42 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
 @@ -65,152 +65,6 @@ fbComposite(CARD8 op,
@@ -84,7 +84,7 @@
 -    int xDst = list->xOff, yDst = list->yOff;
 -
 -    miCompositeSourceValidate(pSrc);
--    
+-
 -    n_glyphs = 0;
 -    for (i = 0; i < nlist; ++i)
 -	n_glyphs += list[i].len;
@@ -93,12 +93,12 @@
 -	glyphCache = pixman_glyph_cache_create();
 -
 -    pixman_glyph_cache_freeze (glyphCache);
--    
+-
 -    if (n_glyphs > N_STACK_GLYPHS) {
 -	if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
 -	    goto out;
 -    }
--    
+-
 -    i = 0;
 -    x = y = 0;
 -    while (nlist--) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150207/25b48108/attachment-0001.html>


More information about the macports-changes mailing list