From owner-svn-ports-all@freebsd.org Sun Apr 8 21:32:10 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E4E07F81C7C; Sun, 8 Apr 2018 21:32:09 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9148D74229; Sun, 8 Apr 2018 21:32:09 +0000 (UTC) (envelope-from adridg@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8B20515754; Sun, 8 Apr 2018 21:32:09 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w38LW9kU056314; Sun, 8 Apr 2018 21:32:09 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w38LW9Pr056312; Sun, 8 Apr 2018 21:32:09 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804082132.w38LW9Pr056312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sun, 8 Apr 2018 21:32:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466833 - in head/x11-toolkits/qt5-gui: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/x11-toolkits/qt5-gui: . files X-SVN-Commit-Revision: 466833 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2018 21:32:10 -0000 Author: adridg Date: Sun Apr 8 21:32:09 2018 New Revision: 466833 URL: https://svnweb.freebsd.org/changeset/ports/466833 Log: Avoid BGR visuals with Qt5 on i915 (well, all) platforms. Explanation is in the patch and PR. PR: 223638 Submitted by: Bengt Ahlgren Reported by: Jason W Bacon Reviewed by: Philipp Engel Approved by: tcberner (mentor, implicit) Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_glxconvenience_qglxconvenience.cpp (contents, props changed) Modified: head/x11-toolkits/qt5-gui/Makefile Modified: head/x11-toolkits/qt5-gui/Makefile ============================================================================== --- head/x11-toolkits/qt5-gui/Makefile Sun Apr 8 21:11:08 2018 (r466832) +++ head/x11-toolkits/qt5-gui/Makefile Sun Apr 8 21:32:09 2018 (r466833) @@ -2,7 +2,7 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- Added: head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_glxconvenience_qglxconvenience.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/qt5-gui/files/patch-src_platformsupport_glxconvenience_qglxconvenience.cpp Sun Apr 8 21:32:09 2018 (r466833) @@ -0,0 +1,17 @@ +Avoid selecting BGR visuals. On Intel i915 systems, selecting one of +these results in red-blue swapping later in the graphics pipeline. +PR 223638 has an extensive discussion. + +--- src/platformsupport/glxconvenience/qglxconvenience.cpp.orig 2018-01-16 06:53:43 UTC ++++ src/platformsupport/glxconvenience/qglxconvenience.cpp +@@ -220,6 +220,10 @@ GLXFBConfig qglx_findConfig(Display *dis + if (requestedAlpha && actualAlpha != requestedAlpha) + continue; + ++ // avoid BGR visuals due to bugs elsewhere ++ if ((visual->red_mask & 0x1) == 0x1) ++ continue; ++ + return candidate; + } + } while (qglx_reduceFormat(&format));