From 2e0ab775f2ca9e8758a28ef505bca5427c521362 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 19 Jul 2016 20:04:04 +0000 Subject: Updated modular-xorg-server to 1.18.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Another pile of backports from the devel branch, primarily in glamor, xwayland, and the modesetting driver. Thanks to all who contributed. Adam Jackson (9): dix: Squash some new gcc6 warnings kdrive: Nuke a bunch of dead code xfree86: Add IndirectGLX server flag (v2) xfree86: Don't swallow ±iglx command line flag modesetting: resubmit dirty rects on EINVAL (v2) xfree86: Fix fallback driver sort order for Xorg -configure (v2) os: Treat ssh as a non-local client (v4) xserver 1.18.4 Alexandre Courbot (1): configure.ac: Keep environment CFLAGS when testing Andreas Schwab (1): x86emu: Change include order to avoid conflict with system header Andrew Comminos (1): Input: Send XI2 FocusOut NotifyPointer events to the pointer window. Andrew Eikum (1): shm: Also censor images returned by ShmGetImage Chris Wilson (2): present: Improve scaling of vblank handler present: Fix presentation of flips out of order Dave Airlie (6): randr/provider: only allow slave gpu to be offload sources. modesetting: set driverPrivate to NULL after closing fd. xf86Crtc: don't set the root window property on slave GPUs. modesetting: set capabilities up after glamor and enable offload caps. glamor: add glamor_finish API modesetting: Implement 32->24 bpp conversion in shadow update Guilherme Quentel Melo (1): glx: avoid memory leak when using indirect rendering Hans De Goede (1): linux: Do not try to open /dev/vc/0, fix error msg when /dev/tty0 open fails Hans de Goede (4): modesetting: Properly cleanup fb for reverse-prime-offload modesetting: Fix swapping of provider sink / source capabilities modesetting: Only add main fb if necessary Jeremy Huddleston Sequoia (7): XQuartz: Remove --with-launchd-id-prefix XQuartz: Fix the help text for --with-bundle-id-prefix XQuartz: Update release feed URL to use new https URL XQuartz: Add --with-sparkle-feed-url configure option XQuartz: Add --with-bundle-version and --with-bundle-version-string configure options XQuartz: Update copyright years XQuartz: Fix default CFBundleVersion Keith Packard (5): glamor: Disable logic ops when doing compositing [v4] glamor: glamor_make_current sooner in glamor_composite_with_shader glamor: Preserve GL_RED bits in R channel when destination is GL_RED [v2] glamor: Adjust for drawable x/y in composite's copy optimization glamor: Use DestroyPixmap instead of FreePicture for glyph atlas pixmap Lyude Paul (1): modesetting: Clear drmmode->fb_id before unflipping Maarten Lankhorst (1): exa: only draw valid trapezoids Marek Chalupa (1): xwayland-shm: fortify fallocate against EINTR Michel Dänzer (9): EXA: Honour op parameter to exaGlyphs even if maskFormat == NULL glamor: Fix sampling outside of RGBx source/mask pictures glamor: Check for composite operations which are equivalent to copies glamor: Cannot use copies when accessing outside of composite source glamor: Call eglBindAPI after eglInitialize xwayland: Call eglBindAPI after eglInitialize dix: Work around non-premultiplied ARGB cursor data glamor: Translate solid text background region after clipping os: Use strtok instead of xstrtokenize in ComputeLocalClient Olivier Fourdan (3): xwayland: Fix compiler warning in GLAMOR Xv glamor: fix wrong offset on composite rectangles wayland: clear resource for pixmap on unrealize Peter Hutterer (3): Xi: don't deliver emulated motion events for non-emulating touches xkb: after changing the keymap, force an indicator update xkb: add a cause to the xkb indicator update after a keymap change Rui Matos (1): xwayland: Update RR state on wl_output.done instead of wl_output.mode Simon Thum (1): dix/ptraccel: Fix memory leak in InitPredictableAccelerationScheme Takashi Iwai (3): modesetting: Fix the error check from DRM_IOCTL_MODE_CURSOR2 modesetting: Use load_cursor_argb_check for sw cursor fallback modesetting: Fix hw cursor check at the first call --- x11/modular-xorg-server/Makefile.common | 4 ++-- x11/modular-xorg-server/distinfo | 11 +++++------ .../patches/patch-exa_exa__render.c | 20 -------------------- 3 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 x11/modular-xorg-server/patches/patch-exa_exa__render.c (limited to 'x11') diff --git a/x11/modular-xorg-server/Makefile.common b/x11/modular-xorg-server/Makefile.common index 2749eef6416..b64b483315f 100644 --- a/x11/modular-xorg-server/Makefile.common +++ b/x11/modular-xorg-server/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.10 2016/04/13 18:43:17 wiz Exp $ +# $NetBSD: Makefile.common,v 1.11 2016/07/19 20:04:04 wiz Exp $ # used by x11/modular-xorg-server/Makefile # used by x11/modular-xorg-xephyr/Makefile -XORG_VERSION= 1.18.3 +XORG_VERSION= 1.18.4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 35e8cf8fdd1..5915ddd579a 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.75 2016/04/13 18:43:17 wiz Exp $ +$NetBSD: distinfo,v 1.76 2016/07/19 20:04:04 wiz Exp $ -SHA1 (xorg-server-1.18.3.tar.bz2) = b3d8818bb3e1deeeb8f02d741c1223a72182e63c -RMD160 (xorg-server-1.18.3.tar.bz2) = a09617c34be796aacd6edcbe470179b2abdcb188 -SHA512 (xorg-server-1.18.3.tar.bz2) = 9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171 -Size (xorg-server-1.18.3.tar.bz2) = 5867330 bytes +SHA1 (xorg-server-1.18.4.tar.bz2) = ff088ee29dee46a2d68925c8df3f0515ef15ec52 +RMD160 (xorg-server-1.18.4.tar.bz2) = 6f58d84d3bbc59a773e6a2e1eafc208827a5923f +SHA512 (xorg-server-1.18.4.tar.bz2) = 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b +Size (xorg-server-1.18.4.tar.bz2) = 6009508 bytes SHA1 (patch-configure) = b3c5ae8cd7aca96dbb5a237dda061e8c2569b2f2 -SHA1 (patch-exa_exa__render.c) = 4e144b977797d9cdc7e08c286aaedb303f1a1aa8 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 diff --git a/x11/modular-xorg-server/patches/patch-exa_exa__render.c b/x11/modular-xorg-server/patches/patch-exa_exa__render.c deleted file mode 100644 index 25fc21c7442..00000000000 --- a/x11/modular-xorg-server/patches/patch-exa_exa__render.c +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-exa_exa__render.c,v 1.2 2015/04/25 11:47:03 tnn Exp $ - -Fix CVE-2013-6424 using -http://lists.x.org/archives/xorg-devel/2013-October/037996.html - -XXX why does upstream not have this patch? -XXX was it fixed differently or is it still unpatched? - ---- exa/exa_render.c.orig 2015-01-17 23:42:52.000000000 +0000 -+++ exa/exa_render.c -@@ -1141,7 +1141,8 @@ exaTrapezoids(CARD8 op, PicturePtr pSrc, - - exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - for (; ntrap; ntrap--, traps++) -- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); -+ if (xTrapezoidValid(traps)) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); - exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - - xRel = bounds.x1 + xSrc - xDst; -- cgit v1.2.3