diff --git a/U_fb-Fix-invalid-bpp-for-24bit-depth-window.patch b/U_fb-Fix-invalid-bpp-for-24bit-depth-window.patch deleted file mode 100644 index 75bc9b7..0000000 --- a/U_fb-Fix-invalid-bpp-for-24bit-depth-window.patch +++ /dev/null @@ -1,40 +0,0 @@ -From fe5018e0564118a7a8198fa286186fdb9ed818c7 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 19 Aug 2014 15:57:22 -0500 -Subject: [PATCH] fb: Fix invalid bpp for 24bit depth window - -We have a hack in fb layer for a 24bpp screen to use 32bpp images, and -fbCreateWindow() replaces its drawable.bitsPerPixel field -appropriately. But, the problem is that it always replaces when 32bpp -is passed. If the depth is 32, this results in bpp < depth, which is -actually invalid. - -Meanwhile, fbCreatePixmap() has a more check and it creates with 24bpp -only when the passed depth <= 24 for avoiding such a problem. - -This oneliner patch just adds the similar check in fbCreateWindow(). -This (hopefully) fixes the long-standing broken graphics mess of -cirrus KMS with 24bpp. - -Signed-off-by: Takashi Iwai -Reviewed-by: Keith Packard ---- - fb/fbwindow.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fb/fbwindow.c b/fb/fbwindow.c -index 368c4b883b31..c90175faa078 100644 ---- a/fb/fbwindow.c -+++ b/fb/fbwindow.c -@@ -33,7 +33,7 @@ fbCreateWindow(WindowPtr pWin) - { - dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(pWin), - fbGetScreenPixmap(pWin->drawable.pScreen)); -- if (pWin->drawable.bitsPerPixel == 32) -+ if (pWin->drawable.bitsPerPixel == 32 && pWin->drawable.depth <= 24) - pWin->drawable.bitsPerPixel = - fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp; - return TRUE; --- -2.0.4 - diff --git a/xorg-server-1.16.1.tar.bz2 b/xorg-server-1.16.1.tar.bz2 deleted file mode 100644 index 87b895d..0000000 --- a/xorg-server-1.16.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f4677c6ec9fb7b59648321737087aeb9963b60bcea50ee3773fe46be1a37e060 -size 5802984 diff --git a/xorg-server-1.16.2.tar.bz2 b/xorg-server-1.16.2.tar.bz2 new file mode 100644 index 0000000..e3c615c --- /dev/null +++ b/xorg-server-1.16.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:446e0c3ebd556aced78ec0000ba9ae73f1e5317117d497f827afba48b787ce64 +size 5805059 diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 69147c5..93cdaea 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Nov 18 10:34:53 UTC 2014 - sndirsch@suse.com + +- Update to version 1.16.2 + - Fix present_pixmap when using present_notify_msc + - Fix present_notify to return right away when querying current + or past msc.Xext/shm: Detach SHM segment after Pixmap is released + - xkb: ignore floating slave devices when updating from master (#81885) + - fb: Fix invalid bpp for 24bit depth window +- supersedes U_fb-Fix-invalid-bpp-for-24bit-depth-window.patch + ------------------------------------------------------------------- Mon Nov 10 00:50:00 UTC 2014 - Led diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 179357b..fab3d2a 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -18,7 +18,7 @@ Name: xorg-x11-server -%define dirsuffix 1.16.1 +%define dirsuffix 1.16.2 Summary: X License: MIT @@ -157,7 +157,6 @@ Patch110: u_connection-avoid-crash-when-CloseWellKnownConnections-gets-cal Patch111: u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch Patch130: U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch -Patch131: U_fb-Fix-invalid-bpp-for-24bit-depth-window.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch @@ -243,7 +242,6 @@ cp %{SOURCE90} . %patch111 -p1 %patch112 -p1 %patch130 -p1 -%patch131 -p1 %patch1000 -p1 ### disabled for now