diff --git a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch deleted file mode 100644 index cd87e396d4f0..000000000000 --- a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ec6007e6f7772a90713c9c51c64359229961ce27 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Sun, 6 Apr 2014 05:32:00 -0700 -Subject: [PATCH] XQuartz: Ensure we wait for the server thread to terminate - -AKA: XQuartz 2.7.5 doesn't delete its /tmp/.X$d-lock - -http://xquartz.macosforge.org/trac/ticket/823 - -Signed-off-by: Jeremy Huddleston Sequoia ---- - hw/xquartz/X11Controller.m | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m -index 5445c6f..022e832 100644 ---- a/hw/xquartz/X11Controller.m -+++ b/hw/xquartz/X11Controller.m -@@ -942,9 +942,8 @@ extern char *bundle_id_prefix; - /* shutdown the X server, it will exit () for us. */ - DarwinSendDDXEvent(kXquartzQuit, 0); - -- /* In case it doesn't, exit anyway after a while. */ -- remain = 10000000; -- while ((remain = usleep(remain)) > 0) ; -+ /* In case it doesn't, exit anyway after 5s. */ -+ [NSThread sleepForTimeInterval:5.0]; - - exit(1); - } --- -1.9.1 - diff --git a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch new file mode 100644 index 000000000000..ff297a8df96a --- /dev/null +++ b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch @@ -0,0 +1,78 @@ +From fff30cdea46616eb92f4dd9402ebd27fdb55e13b Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia +Date: Sun, 1 Jun 2014 04:29:19 -0700 +Subject: [PATCH 1/6] XQuartz: GLX: Use __glXEnableExtension to build + extensions list + +Signed-off-by: Jeremy Huddleston Sequoia +(cherry picked from commit 3790001ea29658872aebda00a03170e392b47878) +--- + hw/xquartz/GL/indirect.c | 37 +++++++++++++++++++++++++++++++------ + 1 file changed, 31 insertions(+), 6 deletions(-) + +diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c +index 19b7d86..4e6ab3d 100644 +--- a/hw/xquartz/GL/indirect.c ++++ b/hw/xquartz/GL/indirect.c +@@ -52,6 +52,7 @@ + + #include "visualConfigs.h" + #include "dri.h" ++#include "extension_string.h" + + #include "darwin.h" + #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \ +@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable; + */ + struct __GLXAquaScreen { + __GLXscreen base; ++ ++ /* Supported GLX extensions */ ++ unsigned char glx_enable_bits[__GLX_EXT_BYTES]; ++ + int index; + int num_vis; + }; +@@ -541,13 +546,33 @@ __glXAquaScreenProbe(ScreenPtr pScreen) + + screen->base.GLXmajor = 1; + screen->base.GLXminor = 4; +- screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig " +- "GLX_SGIS_multisample " +- "GLX_ARB_multisample " +- "GLX_EXT_visual_info " +- "GLX_EXT_import_context "); + +- /*We may be able to add more GLXextensions at a later time. */ ++ memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES); ++ ++ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info"); ++ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating"); ++ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context"); ++ __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method"); ++ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig"); ++ ++ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample"); ++ __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample"); ++ ++ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context"); ++ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile"); ++ ++ // Generate the GLX extensions string (overrides that set by __glXScreenInit()) ++ { ++ unsigned int buffer_size = ++ __glXGetExtensionString(screen->glx_enable_bits, NULL); ++ if (buffer_size > 0) { ++ free(screen->base.GLXextensions); ++ ++ screen->base.GLXextensions = xnfalloc(buffer_size); ++ __glXGetExtensionString(screen->glx_enable_bits, ++ screen->base.GLXextensions); ++ } ++ } + + return &screen->base; + } +-- +2.3.2 (Apple Git-55) + diff --git a/pkgs/servers/x11/xorg/darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch b/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch similarity index 54% rename from pkgs/servers/x11/xorg/darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch rename to pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch index 450801c6f2f9..ed0518da5ce1 100644 --- a/pkgs/servers/x11/xorg/darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch +++ b/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch @@ -1,7 +1,7 @@ -From d36a301fb3d0f2c7a3d81cbda3fd21d8d36038e5 Mon Sep 17 00:00:00 2001 +From 91971455ee46b1059de75260ef0d1a45170d8b65 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 13 Jan 2012 12:00:57 -0800 -Subject: [PATCH 5000/5004] sdksyms.sh: Use CPPFLAGS, not CFLAGS +Subject: [PATCH 2/6] sdksyms.sh: Use CPPFLAGS, not CFLAGS CFLAGS can include flags which are not useful to the preprocessor or can even cause it to fail. This fixes a build issue on darwin @@ -10,31 +10,32 @@ when building for more than one architecture. Signed-off-by: Jeremy Huddleston Reviewed-by: Keith Packard --- - 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 27f2cc6..d898c43 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 \ +@@ -48,8 +48,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 + +@@ -135,7 +134,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh 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) + -include $(SDKSYMS_DEP) -- -1.8.4.1 +2.3.2 (Apple Git-55) diff --git a/pkgs/servers/x11/xorg/darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch b/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch similarity index 90% rename from pkgs/servers/x11/xorg/darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch rename to pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch index c9a5f7e0f5bc..395853f940fe 100644 --- a/pkgs/servers/x11/xorg/darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch +++ b/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch @@ -1,8 +1,8 @@ -From 9ca14507a31338fad40d430445a4a4cb8106bc9b Mon Sep 17 00:00:00 2001 +From fa5c83fe9129c9cd9cde1420a32112ca2f17566c Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 30 Apr 2010 13:08:25 -0700 -Subject: [PATCH 5001/5004] Workaround the GC clipping problem in miPaintWindow - and add some debugging output. +Subject: [PATCH 3/6] Workaround the GC clipping problem in miPaintWindow and + add some debugging output. Signed-off-by: Jeremy Huddleston --- @@ -10,10 +10,10 @@ Signed-off-by: Jeremy Huddleston 1 file changed, 94 insertions(+), 10 deletions(-) diff --git a/mi/miexpose.c b/mi/miexpose.c -index 8b7c93f..3e972f7 100644 +index fc4dbc0..5e31b83 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 @@ index 8b7c93f..3e972f7 100644 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 @@ index 8b7c93f..3e972f7 100644 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 @@ index 8b7c93f..3e972f7 100644 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 @@ index 8b7c93f..3e972f7 100644 #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 @@ index 8b7c93f..3e972f7 100644 pbox = RegionRects(prgn); for (i = numRects; --i >= 0; pbox++, prect++) { -- -1.8.4.1 +2.3.2 (Apple Git-55) diff --git a/pkgs/servers/x11/xorg/darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch b/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch similarity index 95% rename from pkgs/servers/x11/xorg/darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch rename to pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch index f70ddf9e6af8..4027227bb53f 100644 --- a/pkgs/servers/x11/xorg/darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch +++ b/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch @@ -1,7 +1,7 @@ -From bd9fce8b74f5358e4d7e5ce9b5cdd8fd195bb3fd Mon Sep 17 00:00:00 2001 +From b229a04bde765424542eeba17a7e2bc25785a890 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia Date: Sat, 2 Nov 2013 11:00:23 -0700 -Subject: [PATCH 5004/5004] Use old miTrapezoids and miTriangles routines +Subject: [PATCH 4/6] Use old miTrapezoids and miTriangles routines Reverts commits: 788ccb9a8bcf6a4fb4054c507111eec3338fb969 @@ -19,11 +19,11 @@ Signed-off-by: Jeremy Huddleston Sequoia 5 files changed, 201 insertions(+), 4 deletions(-) diff --git a/fb/fbpict.c b/fb/fbpict.c -index dc0ca3c..276ff06 100644 +index c8378ad..cafb027 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c -@@ -326,10 +326,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) - ps->Glyphs = miGlyphs; +@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats) + ps->UnrealizeGlyph = fbUnrealizeGlyph; ps->CompositeRects = miCompositeRects; ps->RasterizeTrapezoid = fbRasterizeTrapezoid; - ps->Trapezoids = fbTrapezoids; @@ -34,10 +34,10 @@ index dc0ca3c..276ff06 100644 return TRUE; } diff --git a/render/mipict.c b/render/mipict.c -index 2e64b20..d21b58a 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; @@ -49,7 +49,7 @@ index 2e64b20..d21b58a 100644 ps->RasterizeTrapezoid = 0; /* requires DDX support */ ps->AddTraps = 0; /* requires DDX support */ diff --git a/render/mipict.h b/render/mipict.h -index 9436228..7ee2991 100644 +index 23ce9e8..e0f1d4c 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -122,6 +122,16 @@ miCompositeRects(CARD8 op, @@ -293,5 +293,5 @@ index 922f22a..bdca9ca 100644 +} + -- -1.8.4.1 +2.3.2 (Apple Git-55) diff --git a/pkgs/servers/x11/xorg/darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch similarity index 94% rename from pkgs/servers/x11/xorg/darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch rename to pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch index 9f99ab603353..b9d4b18cf82a 100644 --- a/pkgs/servers/x11/xorg/darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch +++ b/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch @@ -1,7 +1,7 @@ -From 07f9e0beaf66ec9de1455a305c87ab642968f3f1 Mon Sep 17 00:00:00 2001 +From a635e397d5830f7f60e3690a1bb36f7a725b915a Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Fri, 12 Feb 2010 19:48:52 -0800 -Subject: [PATCH 5002/5004] fb: Revert fb changes that broke XQuartz +Subject: [PATCH 5/6] fb: Revert fb changes that broke XQuartz http://bugs.freedesktop.org/show_bug.cgi?id=26124 @@ -21,10 +21,10 @@ Signed-off-by: Jeremy Huddleston 3 files changed, 43 insertions(+), 85 deletions(-) diff --git a/fb/fb.h b/fb/fb.h -index b869d12..895b148 100644 +index ab110f3..59eaac3 100644 --- a/fb/fb.h +++ b/fb/fb.h -@@ -1686,8 +1686,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 @@ index b869d12..895b148 100644 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 cafb027..6ee63e9 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -46,23 +46,18 @@ fbComposite(CARD8 op, @@ -67,7 +67,7 @@ index 2804ff4..80c2a91 100644 } 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,8 +97,8 @@ index 2804ff4..80c2a91 100644 stride * sizeof(FbStride)); if (!image) -@@ -333,57 +330,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 @@ index 2804ff4..80c2a91 100644 } switch (pict->repeatType) { -@@ -411,10 +382,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 @@ index 2804ff4..80c2a91 100644 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, +@@ -436,8 +405,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip, } static pixman_image_t * @@ -181,7 +181,7 @@ index 2804ff4..80c2a91 100644 { pixman_image_t *image = NULL; -@@ -457,7 +425,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 @@ index 2804ff4..80c2a91 100644 } 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, +@@ -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 @@ index bf82f8f..0145ce9 100644 DamageRegionProcessPending(pDst->pDrawable); -- -1.8.4.1 +2.3.2 (Apple Git-55) diff --git a/pkgs/servers/x11/xorg/darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch similarity index 73% rename from pkgs/servers/x11/xorg/darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch rename to pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch index 0ff989258fb9..03d4decdb1c9 100644 --- a/pkgs/servers/x11/xorg/darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch +++ b/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch @@ -1,38 +1,29 @@ -From 4a0444a2773bddc3abbf5305a344001ecfe9378c Mon Sep 17 00:00:00 2001 +From 4c7572abafeac9b2dcd884c444c5a5bae5b302c3 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Sequoia -Date: Tue, 18 Dec 2012 01:03:38 -0800 -Subject: [PATCH 5003/5004] fb: Revert fb changes that broke XQuartz +Date: Sat, 31 May 2014 13:14:20 -0700 +Subject: [PATCH 6/6] fb: Revert fb changes that broke XQuartz http://bugs.freedesktop.org/show_bug.cgi?id=26124 Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0" +Revert "fb: Fix origin of source picture in fbGlyphs" +Revert "fb: Publish fbGlyphs and fbUnrealizeGlyph" This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366. +This reverts commit 983e30361f49a67252d0b5d82630e70724d69dbf. +This reverts commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157. --- - configure.ac | 2 +- fb/fb.h | 3 -- - fb/fbpict.c | 153 +--------------------------------------------------------- + fb/fbpict.c | 149 +--------------------------------------------------------- + fb/fbpict.h | 11 +---- fb/fbscreen.c | 1 - - 4 files changed, 2 insertions(+), 157 deletions(-) + 4 files changed, 2 insertions(+), 162 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 59eaac3..046b948 100644 --- a/fb/fb.h +++ b/fb/fb.h -@@ -1344,9 +1344,6 @@ extern _X_EXPORT void +@@ -1116,9 +1116,6 @@ extern _X_EXPORT void extern _X_EXPORT Bool fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats); @@ -43,10 +34,10 @@ index 895b148..cc5759c 100644 * fbpixmap.c */ diff --git a/fb/fbpict.c b/fb/fbpict.c -index 80c2a91..dc0ca3c 100644 +index 6ee63e9..9c4cc42 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); } @@ -70,7 +61,7 @@ index 80c2a91..dc0ca3c 100644 - pixman_glyph_cache_remove (glyphCache, pGlyph, NULL); -} - --static void +-void -fbGlyphs(CARD8 op, - PicturePtr pSrc, - PicturePtr pDst, @@ -93,7 +84,7 @@ index 80c2a91..dc0ca3c 100644 - int xDst = list->xOff, yDst = list->yOff; - - miCompositeSourceValidate(pSrc); -- +- - n_glyphs = 0; - for (i = 0; i < nlist; ++i) - n_glyphs += list[i].len; @@ -102,12 +93,12 @@ index 80c2a91..dc0ca3c 100644 - 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--) { @@ -165,19 +156,15 @@ index 80c2a91..dc0ca3c 100644 - 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, +- xSrc + srcXoff + extents.x1 - xDst, ySrc + srcYoff + extents.y1 - yDst, +- extents.x1, extents.y1, +- extents.x1 + dstXoff, extents.y1 + dstYoff, - extents.x2 - extents.x1, - extents.y2 - extents.y1, - glyphCache, n_glyphs, pglyphs); @@ -203,7 +190,7 @@ index 80c2a91..dc0ca3c 100644 static pixman_image_t * create_solid_fill_image(PicturePtr pict) { -@@ -473,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; @@ -212,9 +199,35 @@ index 80c2a91..dc0ca3c 100644 + ps->Glyphs = miGlyphs; ps->CompositeRects = miCompositeRects; ps->RasterizeTrapezoid = fbRasterizeTrapezoid; - ps->Trapezoids = fbTrapezoids; + ps->AddTraps = fbAddTraps; +diff --git a/fb/fbpict.h b/fb/fbpict.h +index 5cb8663..110f32d 100644 +--- a/fb/fbpict.h ++++ b/fb/fbpict.h +@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op, + INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps); + + extern _X_EXPORT void ++ + fbTriangles(CARD8 op, + PicturePtr pSrc, + PicturePtr pDst, + PictFormatPtr maskFormat, + INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris); + +-extern _X_EXPORT void +-fbGlyphs(CARD8 op, +- PicturePtr pSrc, +- PicturePtr pDst, +- PictFormatPtr maskFormat, +- INT16 xSrc, +- INT16 ySrc, int nlist, +- GlyphListPtr list, +- GlyphPtr *glyphs); +- + #endif /* _FBPICT_H_ */ diff --git a/fb/fbscreen.c b/fb/fbscreen.c -index f9080a4..7c7d656 100644 +index 71bcc5d..55330fc 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen) @@ -226,5 +239,5 @@ index f9080a4..7c7d656 100644 free(depths[d].vids); free(depths); -- -1.8.4.1 +2.3.2 (Apple Git-55) diff --git a/pkgs/servers/x11/xorg/fix-clang.patch b/pkgs/servers/x11/xorg/fix-clang.patch deleted file mode 100644 index 6b51ebfe3d32..000000000000 --- a/pkgs/servers/x11/xorg/fix-clang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorgserver/hw/xfree86/common/compiler.h 2014-10-29 23:43:33.000000000 -0700 -+++ xorgserver/hw/xfree86/common/compiler.h.new 2014-10-29 23:47:30.000000000 -0700 -@@ -1352,7 +1352,7 @@ - - #if !defined(__SUNPRO_C) - #if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) --#ifdef GCCUSESGAS -+#if defined(GCCUSESGAS) || defined(__clang__) - - /* - * If gcc uses gas rather than the native assembler, the syntax of these diff --git a/pkgs/servers/x11/xorg/libpciaccess-apple.patch b/pkgs/servers/x11/xorg/libpciaccess-apple.patch deleted file mode 100644 index a005c03cbbe4..000000000000 --- a/pkgs/servers/x11/xorg/libpciaccess-apple.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur libpciaccess-0.12.1-orig/src/common_interface.c libpciaccess-0.12.1/src/common_interface.c ---- libpciaccess-0.12.1-orig/src/common_interface.c 2010-07-12 00:32:05.000000000 -0400 -+++ libpciaccess-0.12.1/src/common_interface.c 2011-08-29 00:48:17.000000000 -0400 -@@ -67,6 +67,22 @@ - # define HTOLE_32(x) (x) - #endif /* Solaris */ - -+#elif defined(__APPLE__) -+ -+#include -+ -+#if __BYTE_ORDER == __BIG_ENDIAN -+# define LETOH_16(x) OSSwapInt16(x) -+# define HTOLE_16(x) OSSwapInt16(x) -+# define LETOH_32(x) OSSwapInt32(x) -+# define HTOLE_32(x) OSSwapInt32(x) -+#else -+# define LETOH_16(x) (x) -+# define HTOLE_16(x) (x) -+# define LETOH_32(x) (x) -+# define HTOLE_32(x) (x) -+#endif /* darwin */ -+ - #else - - #include diff --git a/pkgs/servers/x11/xorg/libxkbfile-clang36.patch b/pkgs/servers/x11/xorg/libxkbfile-clang36.patch deleted file mode 100644 index 65bf2ea7437e..000000000000 --- a/pkgs/servers/x11/xorg/libxkbfile-clang36.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libxkbfile-1.0.8/src/cout.c 2012-03-07 20:37:23.000000000 -0800 -+++ libxkbfile-1.0.8/src/cout.c 2015-03-24 20:51:11.000000000 -0700 -@@ -45,7 +45,7 @@ - { - register int i,nOut; - -- if ((!xkb)||(!xkb->names)||(!xkb->names->vmods)) -+ if ((!xkb)||(!xkb->names)) - return False; - for (i=nOut=0;inames->vmods[i]!=None) { diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index afd864eafac4..71185643a9e6 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -80,14 +80,6 @@ in nativeBuildInputs = [ args.python ]; }; - libxkbfile = attrs: attrs // { - patches = lib.optional stdenv.cc.isClang ./libxkbfile-clang36.patch; - }; - - libpciaccess = attrs : attrs // { - patches = [ ./libpciaccess-apple.patch ]; - }; - libX11 = attrs: attrs // { preConfigure = setMalloc0ReturnsNullCrossCompiling + '' sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure @@ -287,15 +279,13 @@ in dmxproto /*libdmx not used*/ xf86vidmodeproto recordproto libXext pixman libXfont damageproto xcmiscproto bigreqsproto - libpciaccess inputproto xextproto randrproto renderproto presentproto + inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; - commonPatches = [ ./xorgserver-xkbcomp-path.patch ] - ++ lib.optional isDarwin ./fix-clang.patch; + commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. darwinOtherX = overrideDerivation xorgserver (oldAttrs: { - stdenv = args.stdenv; configureFlags = oldAttrs.configureFlags ++ [ "--disable-xquartz" "--enable-xorg" @@ -309,7 +299,7 @@ in if (!isDarwin) then { buildInputs = [ makeWrapper ] ++ commonBuildInputs; - propagatedBuildInputs = commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ args.udev ]; patches = commonPatches; @@ -329,23 +319,19 @@ in ''; passthru.version = version; # needed by virtualbox guest additions } else { - stdenv = args.clangStdenv; - name = "xorg-server-1.14.6"; - src = args.fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2; - sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8"; - }; - buildInputs = commonBuildInputs ++ [ args.bootstrap_cmds ]; + buildInputs = commonBuildInputs ++ [ args.bootstrap_cmds args.automake args.autoconf ]; propagatedBuildInputs = commonPropagatedBuildInputs ++ [ libAppleWM applewmproto ]; + # Patches can be pulled from the server-*-apple branches of: + # http://cgit.freedesktop.org/~jeremyhu/xserver/ patches = commonPatches ++ [ - ./darwin/0001-XQuartz-Ensure-we-wait-for-the-server-thread-to-term.patch - ./darwin/5000-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch - ./darwin/5001-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch - ./darwin/5002-fb-Revert-fb-changes-that-broke-XQuartz.patch - ./darwin/5003-fb-Revert-fb-changes-that-broke-XQuartz.patch - ./darwin/5004-Use-old-miTrapezoids-and-miTriangles-routines.patch + ./darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch + ./darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch + ./darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch + ./darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch + ./darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch + ./darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch ./darwin/private-extern.patch ./darwin/bundle_main.patch ./darwin/stub.patch