commit: b174ffeaa087fdcef1e9400d3f0752d86b07a98c Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Oct 1 13:34:05 2017 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Oct 30 21:26:12 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b174ffea
media-libs/cogl: remove unused patches. Closes: https://github.com/gentoo/gentoo/pull/5828 .../cogl/files/cogl-1.22.0-initial-output.patch | 46 ---------------------- media-libs/cogl/files/cogl-1.22.0-wait-flip.patch | 42 -------------------- 2 files changed, 88 deletions(-) diff --git a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch b/media-libs/cogl/files/cogl-1.22.0-initial-output.patch deleted file mode 100644 index d7f9d0ff99f..00000000000 --- a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 188752158701e3a406e7fd5850b3eaf9c4798cd7 Mon Sep 17 00:00:00 2001 -From: Ray Strode <[email protected]> -Date: Fri, 13 Nov 2015 13:35:05 -0500 -Subject: winsys-egl-kms: bypass initial output setup if kms fd passed in - -if mutter is handling the output setup, then we shouldn't do it, -too. - -https://bugzilla.gnome.org/show_bug.cgi?id=758073 ---- - cogl/winsys/cogl-winsys-egl-kms.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c -index b460907..6d7049d 100644 ---- a/cogl/winsys/cogl-winsys-egl-kms.c -+++ b/cogl/winsys/cogl-winsys-egl-kms.c -@@ -663,6 +663,14 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display, - return FALSE; - } - -+ /* Force a full modeset / drmModeSetCrtc on -+ * the first swap buffers call. -+ */ -+ kms_display->pending_set_crtc = TRUE; -+ -+ if (kms_renderer->opened_fd < 0) -+ return TRUE; -+ - output0 = find_output (0, - kms_renderer->fd, - resources, -@@ -736,10 +744,6 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display, - kms_display->width = output0->mode.hdisplay; - kms_display->height = output0->mode.vdisplay; - -- /* We defer setting the crtc modes until the first swap_buffers request of a -- * CoglOnscreen framebuffer. */ -- kms_display->pending_set_crtc = TRUE; -- - return TRUE; - } - --- -cgit v0.11.2 - diff --git a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch b/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch deleted file mode 100644 index b7c4d99a281..00000000000 --- a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 -
