Hello community, here is the log from the commit of package cogl for openSUSE:Factory checked in at 2016-01-01 19:46:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cogl (Old) and /work/SRC/openSUSE:Factory/.cogl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cogl" Changes: -------- --- /work/SRC/openSUSE:Factory/cogl/cogl.changes 2015-12-25 13:05:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cogl.new/cogl.changes 2016-01-01 19:46:58.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 23 10:29:31 UTC 2015 - [email protected] + +- Add cogl-fix-black-login-screen.patch: Fix black and frozen + login screen after logout when using gdm in wayland mode and + session in x11 mode (boo#958885, bgo#758112, bgo#756926). + +------------------------------------------------------------------- New: ---- cogl-fix-black-login-screen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cogl.spec ++++++ --- /var/tmp/diff_new_pack.HCEaC3/_old 2016-01-01 19:46:59.000000000 +0100 +++ /var/tmp/diff_new_pack.HCEaC3/_new 2016-01-01 19:46:59.000000000 +0100 @@ -34,6 +34,8 @@ Source99: baselibs.conf # PATCH-FIX-UPSTREAM cogl-GLES-Support-glMapBufferRange.patch [email protected] -- Support glmapbufferrange, patch from upstream git, stable branch. Patch0: cogl-GLES-Support-glMapBufferRange.patch +# PATCH-FIX-UPSTREAM cogl-fix-black-login-screen.patch boo#958885 [email protected] -- Fix black and frozen login screen after logout. +Patch1: cogl-fix-black-login-screen.patch BuildRequires: fdupes BuildRequires: gtk-doc >= 1.13 BuildRequires: pkgconfig(cairo) >= 1.10 @@ -187,6 +189,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure \ ++++++ cogl-fix-black-login-screen.patch ++++++ >From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001 From: Ray Strode <[email protected]> Date: Wed, 21 Oct 2015 15:47:01 -0400 Subject: kms-winsys: don't wait for a flip when page flipping fails If we get EACCES from drmPageFlip we're not going to get a flip event and shouldn't wait for one. This commit changes the EACCES path to silently ignore the failed flip request and just clean up the fb. https://bugzilla.gnome.org/show_bug.cgi?id=756926 --- cogl/winsys/cogl-winsys-egl-kms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c index 20c325c..b460907 100644 --- a/cogl/winsys/cogl-winsys-egl-kms.c +++ b/cogl/winsys/cogl-winsys-egl-kms.c @@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) for (l = kms_display->crtcs; l; l = l->next) { CoglKmsCrtc *crtc = l->data; - int ret; + int ret = 0; if (crtc->count == 0 || crtc->ignore) continue; @@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) } } - flip->pending++; + if (ret == 0) + flip->pending++; } if (kms_renderer->page_flips_not_supported && needs_flip) -- cgit v0.11.2
