[132696] trunk/dports/x11/xorg-server-devel
jeremyhu at macports.org
jeremyhu at macports.org
Sat Feb 7 15:35:42 PST 2015
Revision: 132696
https://trac.macports.org/changeset/132696
Author: jeremyhu at macports.org
Date: 2015-02-07 15:35:42 -0800 (Sat, 07 Feb 2015)
Log Message:
-----------
xorg-server-devel: Bump a little past 1.17 rc1
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:15:38 UTC (rev 132695)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2015-02-07 23:35:42 UTC (rev 132696)
@@ -5,8 +5,7 @@
name xorg-server-devel
conflicts xorg-server
set my_name xorg-server
-version 1.16.99.1
-revision 3
+version 1.16.99.901
categories x11 devel
license X11
maintainers jeremyhu openmaintainer
@@ -17,7 +16,7 @@
fetch.type git
git.url git://anongit.freedesktop.org/xorg/xserver
-git.branch e572bcc7f4236b7e0f23ab762f225b3bce37db59
+git.branch 96143d6dc35c98cb6b4e409dd89687e4ced3c1f0
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:15:38 UTC (rev 132695)
+++ trunk/dports/x11/xorg-server-devel/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch 2015-02-07 23:35:42 UTC (rev 132696)
@@ -1,4 +1,4 @@
-From 19ba0d4ad155a66fcdbda925a1509273263db805 Mon Sep 17 00:00:00 2001
+From a7a7bc03d092d0224c5241dfd203f65763bb853c 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 30f7c8f..22156d4 100644
+index d46bf0a..de86285 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:15:38 UTC (rev 132695)
+++ 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)
@@ -1,4 +1,4 @@
-From 21b64fe49a2a26d0d57ce135a72a12c9736f5866 Mon Sep 17 00:00:00 2001
+From 672a4c1b34ad27581f39334f6706745c45626cc0 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 de8ee6c..a6678a5 100644
+index e74b9c3..5360b73 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:15:38 UTC (rev 132695)
+++ trunk/dports/x11/xorg-server-devel/files/5002-Use-old-miTrapezoids-and-miTriangles-routines.patch 2015-02-07 23:35:42 UTC (rev 132696)
@@ -1,4 +1,4 @@
-From 07c2bb05052b9084055ed27e9c3637bfddabea41 Mon Sep 17 00:00:00 2001
+From e09892ca4ddd83205fc265c653b6fde2dc22619a 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 7a9e46a..8e99cbe 100644
+index e726691..f6deae7 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
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:15:38 UTC (rev 132695)
+++ 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)
@@ -1,4 +1,4 @@
-From e21b429acf631776d3ebe14c3d5db9fa7f3656d7 Mon Sep 17 00:00:00 2001
+From c0fbd4545720941a89fdf2191e09d83a004a3f96 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 5099b0f..dd91cae 100644
+index ab110f3..59eaac3 100644
--- a/fb/fb.h
+++ b/fb/fb.h
-@@ -1383,8 +1383,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
+@@ -1326,8 +1326,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 8e99cbe..2ff9ae2 100644
+index f6deae7..219eae0 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:15:38 UTC (rev 132695)
+++ 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)
@@ -1,4 +1,4 @@
-From 1298d92e044632b04d5693db7ac695ff709d2183 Mon Sep 17 00:00:00 2001
+From 299f24e5dca1cb094ce015763f58e7791613958e 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
@@ -15,15 +15,15 @@
---
fb/fb.h | 3 --
fb/fbpict.c | 149 +---------------------------------------------------------
- fb/fbpict.h | 15 +-----
+ fb/fbpict.h | 11 +----
fb/fbscreen.c | 1 -
- 4 files changed, 2 insertions(+), 166 deletions(-)
+ 4 files changed, 2 insertions(+), 162 deletions(-)
diff --git a/fb/fb.h b/fb/fb.h
-index dd91cae..0b3bc95 100644
+index 59eaac3..046b948 100644
--- a/fb/fb.h
+++ b/fb/fb.h
-@@ -1135,9 +1135,6 @@ extern _X_EXPORT void
+@@ -1116,9 +1116,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 2ff9ae2..9c4cc42 100644
+index 219eae0..9c4cc42 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
@@ -53,7 +53,7 @@
- }
-}
-
--void
+-static void
-fbUnrealizeGlyph(ScreenPtr pScreen,
- GlyphPtr pGlyph)
-{
@@ -201,10 +201,10 @@
ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
ps->AddTraps = fbAddTraps;
diff --git a/fb/fbpict.h b/fb/fbpict.h
-index 8b0f59f..110f32d 100644
+index 5cb8663..110f32d 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
-@@ -65,24 +65,11 @@ fbTrapezoids(CARD8 op,
+@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op,
INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
extern _X_EXPORT void
@@ -216,10 +216,6 @@
INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
-extern _X_EXPORT void
--fbUnrealizeGlyph(ScreenPtr pScreen,
-- GlyphPtr pGlyph);
--
--extern _X_EXPORT void
-fbGlyphs(CARD8 op,
- PicturePtr pSrc,
- PicturePtr pDst,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150207/80d63056/attachment.html>
More information about the macports-changes
mailing list