[120521] trunk/dports/x11/xorg-server

31 May 2014

Revision: 120521
          https://trac.macports.org/changeset/120521
Author:   jeremyhu@macports.org
Date:     2014-05-31 02:50:38 -0700 (Sat, 31 May 2014)
Log Message:
-----------
xorg-server: Bump to 1.15.1

Modified Paths:
--------------
    trunk/dports/x11/xorg-server/Portfile
    trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
    trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
    trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
    trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
    trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch

Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================

--- trunk/dports/x11/xorg-server/Portfile	2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/Portfile	2014-05-31 09:50:38 UTC (rev 120521)
@@ -5,7 +5,7 @@
 name		xorg-server
 conflicts       xorg-server-devel
 set my_name	xorg-server
-version		1.14.6
+version		1.15.1
 categories	x11 devel
 license		X11
 maintainers	jeremyhu openmaintainer
@@ -20,9 +20,9 @@
 dist_subdir     ${my_name}
 distname        ${my_name}-${version}
 
-checksums           sha1    257fe290829a685f5bba5809bb1b422b6dae68a5 \
-                    rmd160  e8062894d922ff3bad79dd50057c257fae1f18b7 \
-                    sha256  e8b33f09f6adf706dfd2636990730d7fed6538adf346f78a6c685cf0c3dda730
+checksums           sha1    746e533213db8190bf8d71efd54587fd5b5b6511 \
+                    rmd160  b805ab772cf1161e07ccbbeee1090629bf4e3bbe \
+                    sha256  626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2
 
 use_bzip2	yes
 use_parallel_build yes
@@ -38,6 +38,7 @@
 	port:xorg-fontsproto \
 	port:xorg-glproto \
 	port:xorg-inputproto \
+	port:xorg-presentproto \
 	port:xorg-randrproto \
 	port:xorg-recordproto \
 	port:xorg-renderproto \
@@ -65,7 +66,7 @@
 	port:xorg-libAppleWM \
 	port:xorg-libXfixes
 
-# https://trac.macports.org/ticket/36055           
+# https://trac.macports.org/ticket/36055
 compiler.blacklist gcc-4.0
 
 configure.args --with-apple-applications-dir=${applications_dir} \
@@ -75,7 +76,9 @@
 	--without-fop \
 	--without-xmlto \
 	--disable-devel-docs \
-	--with-sha1=CommonCrypto
+	--with-sha1=CommonCrypto \
+	--disable-dri2 \
+	--disable-dri3
 
 # 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/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch	2014-05-31 09:50:38 UTC (rev 120521)
@@ -1,4 +1,4 @@
-From d36a301fb3d0f2c7a3d81cbda3fd21d8d36038e5 Mon Sep 17 00:00:00 2001
+From b877aca8da4fec52875cbf03646ffad0ffd31ae1 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 13 Jan 2012 12:00:57 -0800
 Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS
@@ -10,31 +10,32 @@
 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
 Reviewed-by: Keith Packard <keithp@keithp.com>
 ---
- hw/xfree86/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ hw/xfree86/Makefile.am | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index c3899b5..4f48b85 100644
+index 15670d0..b35e464 100644
 --- a/hw/xfree86/Makefile.am
 +++ b/hw/xfree86/Makefile.am
-@@ -38,7 +38,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
+@@ -43,8 +43,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
  bin_PROGRAMS = Xorg
  nodist_Xorg_SOURCES = sdksyms.c
  
 -AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
-+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
- INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
+-AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
++AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
  	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
- 	-I$(srcdir)/dri -I$(srcdir)/dri2
-@@ -115,7 +115,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
+ 	-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
+ 
+@@ -118,7 +117,7 @@ CLEANFILES = sdksyms.c sdksyms.dep
  EXTRA_DIST += sdksyms.sh
  
  sdksyms.dep sdksyms.c: sdksyms.sh
--	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(INCLUDES)
-+	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES)
+-	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
++	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
  
  SDKSYMS_DEP = sdksyms.dep
  include $(SDKSYMS_DEP)
 -- 
-1.8.4.1
+1.9.1
 

Modified: trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch	2014-05-31 09:50:38 UTC (rev 120521)
@@ -1,4 +1,4 @@
-From 9ca14507a31338fad40d430445a4a4cb8106bc9b Mon Sep 17 00:00:00 2001
+From 152a52f607d68c65683eebc61cbb288ec2670b2a Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 30 Apr 2010 13:08:25 -0700
 Subject: [PATCH 5001/5004] Workaround the GC clipping problem in miPaintWindow
@@ -161,5 +161,5 @@
      pbox = RegionRects(prgn);
      for (i = numRects; --i >= 0; pbox++, prect++) {
 -- 
-1.8.4.1
+1.9.1
 

Modified: trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch	2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch	2014-05-31 09:50:38 UTC (rev 120521)
@@ -1,4 +1,4 @@
-From 07f9e0beaf66ec9de1455a305c87ab642968f3f1 Mon Sep 17 00:00:00 2001
+From eb871812950497a7d11a3cf1ee0e7427813c7ffb Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston <jeremyhu@apple.com>
 Date: Fri, 12 Feb 2010 19:48:52 -0800
 Subject: [PATCH 5002/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 b869d12..895b148 100644
+index 26957df..1c6963f 100644
 --- a/fb/fb.h
 +++ b/fb/fb.h
-@@ -1686,8 +1686,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
+@@ -1652,8 +1652,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 2804ff4..80c2a91 100644
+index b503858..7c2ead5 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
 @@ -46,23 +46,18 @@ fbComposite(CARD8 op,
@@ -67,7 +67,7 @@
      }
  
      free_pixman_pict(pSrc, src);
-@@ -293,20 +288,22 @@ create_conical_gradient_image(PictGradient * gradient)
+@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient)
  }
  
  static pixman_image_t *
@@ -97,7 +97,7 @@
                                       stride * sizeof(FbStride));
  
      if (!image)
-@@ -333,57 +330,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
+@@ -329,57 +326,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
          if (pict->clientClipType != CT_NONE)
              pixman_image_set_has_client_clip(image, TRUE);
  
@@ -159,7 +159,7 @@
      }
  
      switch (pict->repeatType) {
-@@ -411,10 +382,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -407,10 +378,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);
-@@ -448,8 +417,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
+@@ -444,8 +413,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;
  
-@@ -457,7 +425,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -453,7 +421,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;
-@@ -475,19 +443,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
+@@ -471,19 +439,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);
 -- 
-1.8.4.1
+1.9.1
 

Modified: trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch	2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch	2014-05-31 09:50:38 UTC (rev 120521)
@@ -1,4 +1,4 @@
-From 4a0444a2773bddc3abbf5305a344001ecfe9378c Mon Sep 17 00:00:00 2001
+From 1ab1cd8c2732d33624fc7e72d763836dbffc0d3a Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 Date: Tue, 18 Dec 2012 01:03:38 -0800
 Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz
@@ -9,30 +9,16 @@
 
 This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
 ---
- configure.ac  |   2 +-
  fb/fb.h       |   3 --
- fb/fbpict.c   | 153 +---------------------------------------------------------
+ fb/fbpict.c   | 149 +---------------------------------------------------------
  fb/fbscreen.c |   1 -
- 4 files changed, 2 insertions(+), 157 deletions(-)
+ 3 files changed, 1 insertion(+), 152 deletions(-)
 
-diff --git a/configure.ac b/configure.ac
-index 8797df5..99a1e62 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -811,7 +811,7 @@ LIBPCIACCESS="pciaccess >= 0.12.901"
- LIBUDEV="libudev >= 143"
- LIBSELINUX="libselinux >= 2.0.86"
- LIBDBUS="dbus-1 >= 1.0"
--LIBPIXMAN="pixman-1 >= 0.27.2"
-+LIBPIXMAN="pixman-1 >= 0.21.8"
- 
- dnl Pixman is always required, but we separate it out so we can link
- dnl specific modules against it
 diff --git a/fb/fb.h b/fb/fb.h
-index 895b148..cc5759c 100644
+index 1c6963f..11e6344 100644
 --- a/fb/fb.h
 +++ b/fb/fb.h
-@@ -1344,9 +1344,6 @@ extern _X_EXPORT void
+@@ -1310,9 +1310,6 @@ extern _X_EXPORT void
  extern _X_EXPORT Bool
   fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
  
@@ -43,10 +29,10 @@
   * fbpixmap.c
   */
 diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 80c2a91..dc0ca3c 100644
+index 7c2ead5..dc0ca3c 100644
 --- a/fb/fbpict.c
 +++ b/fb/fbpict.c
-@@ -65,156 +65,6 @@ fbComposite(CARD8 op,
+@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
      free_pixman_pict(pDst, dest);
  }
  
@@ -165,19 +151,15 @@
 -    if (maskFormat) {
 -	pixman_format_code_t format;
 -	pixman_box32_t extents;
--	int x, y;
 -
 -	format = maskFormat->format | (maskFormat->depth << 24);
 -
 -	pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
 -
--	x = extents.x1;
--	y = extents.y1;
--
 -	pixman_composite_glyphs(op, srcImage, dstImage, format,
 -				xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
--				x, y,
--				x + dstXoff, y + dstYoff,
+-				extents.x1, extents.y1,
+-				extents.x1 + dstXoff, extents.y1 + dstYoff,
 -				extents.x2 - extents.x1,
 -				extents.y2 - extents.y1,
 -				glyphCache, n_glyphs, pglyphs);
@@ -203,7 +185,7 @@
  static pixman_image_t *
  create_solid_fill_image(PicturePtr pict)
  {
-@@ -473,8 +323,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
+@@ -469,8 +323,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
          return FALSE;
      ps = GetPictureScreen(pScreen);
      ps->Composite = fbComposite;
@@ -226,5 +208,5 @@
          free(depths[d].vids);
      free(depths);
 -- 
-1.8.4.1
+1.9.1
 

Modified: trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch
===================================================================
--- trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch	2014-05-31 05:53:33 UTC (rev 120520)
+++ trunk/dports/x11/xorg-server/files/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch	2014-05-31 09:50:38 UTC (rev 120521)
@@ -1,4 +1,4 @@
-From bd9fce8b74f5358e4d7e5ce9b5cdd8fd195bb3fd Mon Sep 17 00:00:00 2001
+From 0b41adb9994696d40ef1ce66b5c70d867581f8a9 Mon Sep 17 00:00:00 2001
 From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
 Date: Sat, 2 Nov 2013 11:00:23 -0700
 Subject: [PATCH 5004/5004] Use old miTrapezoids and miTriangles routines
@@ -293,5 +293,5 @@
 +}
 +
 -- 
-1.8.4.1
+1.9.1

    

jeremyhu＠macports.org

tags

participants (1)