From owner-svn-ports-head@freebsd.org Wed Nov 29 07:21:06 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1D33DFB8A9; Wed, 29 Nov 2017 07:21:05 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BC00C692C4; Wed, 29 Nov 2017 07:21:05 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAT7L4CP041340; Wed, 29 Nov 2017 07:21:04 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAT7L4SF041338; Wed, 29 Nov 2017 07:21:04 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201711290721.vAT7L4SF041338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Wed, 29 Nov 2017 07:21:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455095 - in head/x11-servers/xorg-server: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11-servers/xorg-server: . files X-SVN-Commit-Revision: 455095 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Nov 2017 07:21:06 -0000 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 +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 + +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 +Reviewed-by: Keith Packard +Reviewed-by: Michel Dänzer + +--- 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;