From owner-svn-ports-head@freebsd.org Sun Oct 4 19:04:20 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E50D5430642; Sun, 4 Oct 2020 19:04:20 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4Cnw5m43z45KY; Sun, 4 Oct 2020 19:04:20 +0000 (UTC) (envelope-from 0mp@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 A8DBD9583; Sun, 4 Oct 2020 19:04:20 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 094J4KZ1036871; Sun, 4 Oct 2020 19:04:20 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 094J4KOe036869; Sun, 4 Oct 2020 19:04:20 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202010041904.094J4KOe036869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Sun, 4 Oct 2020 19:04:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551440 - in head/x11-wm/compiz: . files X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in head/x11-wm/compiz: . files X-SVN-Commit-Revision: 551440 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.33 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: Sun, 04 Oct 2020 19:04:21 -0000 Author: 0mp Date: Sun Oct 4 19:04:20 2020 New Revision: 551440 URL: https://svnweb.freebsd.org/changeset/ports/551440 Log: x11-wm/compiz: Fix compiz-manager texture size parsing error compiz-manager doesn't cover the possibility of duplicate output from glxinfo at line 238, which causes check_texture_size() to fail. Let's fix it by limiting the number of output lines to 1. PR: 247476 Submitted by: Vladimir Bychik Approved by: maintainer (Chris Hutchinson) MFH: 2020Q4 Modified: head/x11-wm/compiz/Makefile head/x11-wm/compiz/files/compiz-manager.in Modified: head/x11-wm/compiz/Makefile ============================================================================== --- head/x11-wm/compiz/Makefile Sun Oct 4 19:03:58 2020 (r551439) +++ head/x11-wm/compiz/Makefile Sun Oct 4 19:04:20 2020 (r551440) @@ -2,7 +2,7 @@ PORTNAME= compiz PORTVERSION= 0.8.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-wm MASTER_SITES= https://BSDforge.com/projects/source/x11-wm/compiz/ Modified: head/x11-wm/compiz/files/compiz-manager.in ============================================================================== --- head/x11-wm/compiz/files/compiz-manager.in Sun Oct 4 19:03:58 2020 (r551439) +++ head/x11-wm/compiz/files/compiz-manager.in Sun Oct 4 19:04:20 2020 (r551440) @@ -235,7 +235,7 @@ check_nvidia() # Check if the max texture size is large enough compared to the resolution check_texture_size() { - TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g') + TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | head -n 1 | sed 's/.*=[^0-9]//g') RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//') VRES=$(echo $RESOLUTION | sed 's/.*x//') HRES=$(echo $RESOLUTION | sed 's/x.*//')