svn commit: r551469 - in branches/2020Q4/x11-wm/compiz: . files

[Mateusz Piotrowski]

Author: 0mp
Date: Sun Oct  4 23:08:37 2020
New Revision: 551469
URL: https://svnweb.freebsd.org/changeset/ports/551469

Log:
  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)

Modified:
  branches/2020Q4/x11-wm/compiz/Makefile
  branches/2020Q4/x11-wm/compiz/files/compiz-manager.in
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/x11-wm/compiz/Makefile
==============================================================================
--- branches/2020Q4/x11-wm/compiz/Makefile	Sun Oct  4 23:07:43 2020	(r551468)
+++ branches/2020Q4/x11-wm/compiz/Makefile	Sun Oct  4 23:08:37 2020	(r551469)
@@ -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: branches/2020Q4/x11-wm/compiz/files/compiz-manager.in
==============================================================================
--- branches/2020Q4/x11-wm/compiz/files/compiz-manager.in	Sun Oct  4 23:07:43 2020	(r551468)
+++ branches/2020Q4/x11-wm/compiz/files/compiz-manager.in	Sun Oct  4 23:08:37 2020	(r551469)
@@ -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.*//')