pool/xorg-x11-server
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 236460 from X11:XOrg

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/236460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xorg-x11-server?expand=0&rev=290
This commit is contained in:
Stephan Kulow 2014-06-17 09:22:48 +00:00 committed by Git OBS Bridge
commit fc3f620165
5 changed files with 61 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch Normal file
View File

@ -0,0 +1,41 @@
From: Egbert Eich <eich@hammer45.arch.suse.de>
Date: Fri May 30 19:08:00 2014 -0400
Subject: [PATCH]render: Cast color masks to unsigned long before shifting them
Patch-mainline: to be upstreamed
Git-commit: 6ec9a78f9b79668239c3a1519d715cbecf186cef
Git-repo:
References: bnc#876757
Signed-off-by: Egbert Eich <eich@suse.com>
The color masks in DirectFormatRec are CARD16. Shifting them may lead
to unexpected results. Cast them to unsigned long to make sure the
shifted value will still fit into that type.
Signed-off-by: Egbert Eich <eich@suse.de>
---
render/picture.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/render/picture.c b/render/picture.c
index 2908b76..74369de 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -548,12 +548,12 @@ PictureMatchVisual(ScreenPtr pScreen, int depth, VisualPtr pVisual)
return format;
}
else {
- if (format->direct.redMask << format->direct.red ==
- pVisual->redMask &&
- format->direct.greenMask << format->direct.green ==
- pVisual->greenMask &&
- format->direct.blueMask << format->direct.blue ==
- pVisual->blueMask) {
+ if (((unsigned long)format->direct.redMask) <<
+ format->direct.red == pVisual->redMask &&
+ ((unsigned long)format->direct.greenMask) <<
+ format->direct.green == pVisual->greenMask &&
+ ((unsigned long)format->direct.blueMask) <<
+ format->direct.blue == pVisual->blueMask) {
return format;
}
}

3
xorg-server-1.15.99.902.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d491f4193177620a35c2a3f736bac1b40721a5381c2a878334d820380382792
size 3805432

3
xorg-server-1.15.99.903.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:69b5863e1f8ade2db47e3733708972700acc20465a3f57819cace5f783496c14
size 5813761

14
xorg-x11-server.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Jun 5 13:30:12 UTC 2014 - tobias.johannes.klausmann@mni.thm.de
- Update to 1.16RC3
- Bugfixes all over the place
-------------------------------------------------------------------
Fri May 30 23:44:55 UTC 2014 - eich@suse.com
- u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch:
Make sure result of shift operation fits into type of variable. This
fixes finding the correct visual for RENDER with a BGRA framebuffer
(bnc#876757).
-------------------------------------------------------------------
Wed May 28 11:00:49 UTC 2014 - sndirsch@suse.com

4
xorg-x11-server.spec
View File

@ -18,7 +18,7 @@
Name: xorg-x11-server
%define dirsuffix 1.15.99.902.5
%define dirsuffix 1.15.99.903
Summary: X
License: MIT
@ -152,6 +152,7 @@ Patch106: u_exa-only-draw-valid-trapezoids.patch
Patch107: u_arch-Fix-image-and-bitmap-byte-order-for-ppc64le.patch
Patch110: u_connection-avoid-crash-when-CloseWellKnownConnections-gets-called-twice.patch
Patch111: u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch
Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
Patch162: b_cache-xkbcomp-output-for-fast-start-up.patch
Patch211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch
@ -229,6 +230,7 @@ cp %{SOURCE90} .
%patch107 -p1
%patch110 -p1
%patch111 -p1
%patch112 -p1
### disabled for now
#%patch162 -p1