diff options
| author | kwm <kwm@FreeBSD.org> | 2011-08-07 15:17:59 +0800 |
|---|---|---|
| committer | kwm <kwm@FreeBSD.org> | 2011-08-07 15:17:59 +0800 |
| commit | b8140efedd0b1993051421994aedbcc2349d80e2 (patch) | |
| tree | a1cb2f1e85dc860fdfb1bb610004a04ceaae6349 /x11-servers | |
| parent | eced82b72961e4aaa915c38f895d1f8dc4cd9c40 (diff) | |
| download | freebsd-ports-gnome-b8140efedd0b1993051421994aedbcc2349d80e2.tar.gz freebsd-ports-gnome-b8140efedd0b1993051421994aedbcc2349d80e2.tar.zst freebsd-ports-gnome-b8140efedd0b1993051421994aedbcc2349d80e2.zip | |
Fix the "exaGetPixmapFirstPixel called for invalid bpp" problem. This bug
is more visible with XFCE.
PR: ports/156721
Submitted by: Alexey Shuvaev <shuvaev@physik.uni-wuerzburg.de>
Obtained from: xorg-server upstream
With hat: x11@
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-exa__exa_accel.c | 26 |
2 files changed, 27 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 4a9fe928d3dd..5cfede912f3b 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= xorg-server PORTVERSION= 1.7.7 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= x11-servers MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ diff --git a/x11-servers/xorg-server/files/patch-exa__exa_accel.c b/x11-servers/xorg-server/files/patch-exa__exa_accel.c new file mode 100644 index 000000000000..83f04ee754f4 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-exa__exa_accel.c @@ -0,0 +1,26 @@ +diff --git a/exa/exa_accel.c b/exa/exa_accel.c +index 6c677c7..b4c0f83 100644 +--- exa/exa_accel.c ++++ exa/exa_accel.c +@@ -1057,6 +1057,8 @@ exaFillRegionSolid (DrawablePtr pDrawable, RegionPtr pRegion, Pixel pixel, + *(CARD16*)pExaPixmap->sys_ptr = pixel; + break; + case 8: ++ case 4: ++ case 1: + *(CARD8*)pExaPixmap->sys_ptr = pixel; + } + +diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c +index a078cc1..855146b 100644 +--- exa/exa_unaccel.c ++++ exa/exa_unaccel.c +@@ -748,6 +757,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap) + return pixel; + } + case 8: ++ case 4: ++ case 1: + { + CARD8 pixel; + |