diff options
| author | Mateusz Piotrowski <0mp@FreeBSD.org> | 2020-10-04 23:08:37 +0000 |
|---|---|---|
| committer | Mateusz Piotrowski <0mp@FreeBSD.org> | 2020-10-04 23:08:37 +0000 |
| commit | 223d1899815b686cc61d3576dab27b42a4a90d32 (patch) | |
| tree | 2e4bc90f1d4209203e1eba4800049f94bff99727 | |
| parent | 32e49333c77aeb271db57149435dd464033f6988 (diff) | |
| download | ports-223d1899815b686cc61d3576dab27b42a4a90d32.tar.gz ports-223d1899815b686cc61d3576dab27b42a4a90d32.zip | |
MFH: r551440
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)
Notes
Notes:
svn path=/branches/2020Q4/; revision=551469
| -rw-r--r-- | x11-wm/compiz/Makefile | 2 | ||||
| -rw-r--r-- | x11-wm/compiz/files/compiz-manager.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile index 32733ed61d2f..a864af054ce9 100644 --- a/x11-wm/compiz/Makefile +++ b/x11-wm/compiz/Makefile @@ -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/ diff --git a/x11-wm/compiz/files/compiz-manager.in b/x11-wm/compiz/files/compiz-manager.in index 8ed0d4050139..3a4488e303df 100644 --- a/x11-wm/compiz/files/compiz-manager.in +++ b/x11-wm/compiz/files/compiz-manager.in @@ -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.*//') |