svn commit: r455095 - in head/x11-servers/xorg-server: . files

[Alexey Dokuchaev]

Author: danfe
Date: Wed Nov 29 07:21:04 2017
New Revision: 455095
URL: https://svnweb.freebsd.org/changeset/ports/455095

Log:
  x11-servers/xorg-server: Fix dashed/dotted line rendering with GLAMOR.
  
  When drawing dashed lines with GLAMOR, they were drawn partially or as
  a regular (solid) line, depending on the OpenGL backend.  It behaved
  so because screen pixmap was bound as the dash and sampling its alpha,
  which is usually just 1.0 (no dashing at all).
  
  Upstream bug:	https://bugs.freedesktop.org/show_bug.cgi?id=99708
  Fixed by:	Eric Anholt (it's a pity that anholt@ no longer works
  		on FreeBSD)
  Silence from:	x11@

Added:
  head/x11-servers/xorg-server/files/patch-glamor_glamor__dash.c   (contents, props changed)
Modified:
  head/x11-servers/xorg-server/Makefile

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Wed Nov 29 04:42:33 2017	(r455094)
+++ head/x11-servers/xorg-server/Makefile	Wed Nov 29 07:21:04 2017	(r455095)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION?=	1.18.4
-PORTREVISION?=	5
+PORTREVISION?=	6
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver

Added: head/x11-servers/xorg-server/files/patch-glamor_glamor__dash.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/xorg-server/files/patch-glamor_glamor__dash.c	Wed Nov 29 07:21:04 2017	(r455095)
@@ -0,0 +1,27 @@
+From: Eric Anholt <eric at anholt.net>
+Date: Wed Mar 15 17:51:46 2017 -0700
+Subject: [PATCH]glamor: Fix dashed line rendering.
+Patch-mainline: fe0b297420fc1de8a7fab28457d0864b3182e967
+References: boo#1021803
+Signed-off-by: Max Staudt <mstaudt at suse.de>
+
+We were binding the screen pixmap as the dash and sampling its alpha,
+which is usually just 1.0 (no dashing at all).
+
+Please cherry-pick this to active stable branches.
+
+Signed-off-by: Eric Anholt <eric at anholt.net>
+Reviewed-by: Keith Packard <keithp at keithp.com>
+Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
+
+--- glamor/glamor_dash.c.orig	2016-07-18 19:08:16 UTC
++++ glamor/glamor_dash.c
+@@ -146,7 +146,7 @@ glamor_dash_setup(DrawablePtr drawable, GCPtr gc)
+         goto bail;
+ 
+     dash_pixmap = glamor_get_dash_pixmap(gc);
+-    dash_priv = glamor_get_pixmap_private(pixmap);
++    dash_priv = glamor_get_pixmap_private(dash_pixmap);
+ 
+     if (!GLAMOR_PIXMAP_PRIV_HAS_FBO(dash_priv))
+         goto bail;