cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r551440

Browse Source 
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)

Approved by:	ports-secteam (fluffy)
This commit is contained in:
Mateusz Piotrowski 2020-10-04 23:08:37 +00:00
parent 32e49333c7
commit 223d189981
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=551469
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11-wm/compiz/Makefile
View File

@ -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/

2
x11-wm/compiz/files/compiz-manager.in
View File

@ -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.*//')