gentoo resync : 31.10.2017

3 files changed, 0 insertions, 90 deletions

diff --git a/media-libs/cogl/Manifest b/media-libs/cogl/Manifest
index 4268289359ce..fcf0b05157f8 100644
--- a/media-libs/cogl/Manifest
+++ b/media-libs/cogl/Manifest
@@ -1,6 +1,4 @@
 AUX cogl-1.22.0-fglrx.patch 468 SHA256 88c3723c4bd295ba1847c7d4696ddf31e33d19a13918d78644561af5effb4457 SHA512 8587cd9cd7dfe4399333bbe46cda77e6d336fc382493594be809437401f63a61067695e0f7e6d74378cd1b7e3b7310a82530f6e2f693cbe65b32c127003ddab3 WHIRLPOOL e389ab67def02a3703e5eb4a49c6c822361f277ec1182e14843c0d521e7fea0ce6322ba76ec29bd04876434d457226b7290bcc5915b0fd2111a238b951466cf8
-AUX cogl-1.22.0-initial-output.patch 1416 SHA256 308a32de8b0360d9e50c3e9065064ebe400813ca50b6182048ad7f16016bcf76 SHA512 ba8ada5084d7bf8f49f1d9630c0f9c58161b96ac8f33d570385051c791a81315724aa369d8d85fc28ca91153723313aa9c70207c0ccf57c05d9eed28031dba27 WHIRLPOOL b70f6ab4adddcbf40347f8fb8ca100ecbc17b4e3a126e2730b74932f86e7dc6076c7ccebff455a233ff5506f4a01df234d6ef347afdd1d8c87a82277eb240f1b
-AUX cogl-1.22.0-wait-flip.patch 1319 SHA256 f380fd702baa4aa3296a7080a4e26d8e9b5a5a2cd7711649e23ac334187980b9 SHA512 269fb862a90b69bceb2604cc30bd02b6c6ec7dc38884fd88cc166039100fda885c5e0e2bd714157b42d725371be10d5b097293f77f48295d1037840d088dc2a1 WHIRLPOOL deed5e6e0e947d61189405e6cc2b1d71e8754c1f39ece2391787bed94bd412c7ddc74b4dd690ac745d6100be3c5e7402735b6ece11364806481ebe3999ca9d4b
 DIST cogl-1.22.2.tar.xz 1682360 SHA256 39a718cdb64ea45225a7e94f88dddec1869ab37a21b339ad058a9d898782c00d SHA512 2ec99f5ff22683d12925b9a1f748387b47c4506aaf3c5afec851b3b6fe6b7cdfd211fb7e4359bd7a1d1b7cb3cb7fbd257efbcb7d2941d0f133a60bad1c9645e3 WHIRLPOOL 548deef9a92fba1ee183f84eb581add8f366ecb0829467025a48c0eb26e85f86ee85dbffded1174fc426f2e85ed5ede3aea75131dfe6a0df547d1440c2b0e53e
 EBUILD cogl-1.22.2.ebuild 4034 SHA256 d3ca411dfbfdf8dd29abb36a5fc4143e4a080e1a72b1703180ea6b1cf02a2c17 SHA512 7cacd1ada49ecff55757c9d6950d82c7f6794de3ea565228770575bb45d9de15a3c2812d89be024be1d2f7fbc509464b7a3b1c49dc2d5056db3603724f04308b WHIRLPOOL e6cd3eef068f471da2a2aabf52a78606e2ed03ec637e749498524be6e65a4891173e8c4e041edf81808af3aa3ff1b1d1a185da18a2e1e7e660d0d89cd5a45113
 MISC ChangeLog 4685 SHA256 cd2cc0b0abf87126e144abf206c24c9358bbfbbf35fc327c5244ddd86bace945 SHA512 3705b7d49fb0b7ce4c1423525785394914d49aae541e568cd3cfa7cab982fbe50f4ef56c7b054ee666893d5c8438aa4f592ef35b80a3a23191fc589cce9027e2 WHIRLPOOL 0494d02633879237cd074864e7054592a4b4bd1bc94023465598e0070902928376addab88baf67d8ecd5cbbf3f598007fcf9b2bdaea04a9bc2473c147583e3d9
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 d7f9d0ff99f4..000000000000
--- 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 <rstrode@redhat.com>
-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 b7c4d99a2812..000000000000
--- 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 <rstrode@redhat.com>
-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
-