1 |
commit: b174ffeaa087fdcef1e9400d3f0752d86b07a98c |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Oct 1 13:34:05 2017 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 30 21:26:12 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b174ffea |
7 |
|
8 |
media-libs/cogl: remove unused patches. |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5828 |
11 |
|
12 |
.../cogl/files/cogl-1.22.0-initial-output.patch | 46 ---------------------- |
13 |
media-libs/cogl/files/cogl-1.22.0-wait-flip.patch | 42 -------------------- |
14 |
2 files changed, 88 deletions(-) |
15 |
|
16 |
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 |
17 |
deleted file mode 100644 |
18 |
index d7f9d0ff99f..00000000000 |
19 |
--- a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch |
20 |
+++ /dev/null |
21 |
@@ -1,46 +0,0 @@ |
22 |
-From 188752158701e3a406e7fd5850b3eaf9c4798cd7 Mon Sep 17 00:00:00 2001 |
23 |
-From: Ray Strode <rstrode@××××××.com> |
24 |
-Date: Fri, 13 Nov 2015 13:35:05 -0500 |
25 |
-Subject: winsys-egl-kms: bypass initial output setup if kms fd passed in |
26 |
- |
27 |
-if mutter is handling the output setup, then we shouldn't do it, |
28 |
-too. |
29 |
- |
30 |
-https://bugzilla.gnome.org/show_bug.cgi?id=758073 |
31 |
---- |
32 |
- cogl/winsys/cogl-winsys-egl-kms.c | 12 ++++++++---- |
33 |
- 1 file changed, 8 insertions(+), 4 deletions(-) |
34 |
- |
35 |
-diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c |
36 |
-index b460907..6d7049d 100644 |
37 |
---- a/cogl/winsys/cogl-winsys-egl-kms.c |
38 |
-+++ b/cogl/winsys/cogl-winsys-egl-kms.c |
39 |
-@@ -663,6 +663,14 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display, |
40 |
- return FALSE; |
41 |
- } |
42 |
- |
43 |
-+ /* Force a full modeset / drmModeSetCrtc on |
44 |
-+ * the first swap buffers call. |
45 |
-+ */ |
46 |
-+ kms_display->pending_set_crtc = TRUE; |
47 |
-+ |
48 |
-+ if (kms_renderer->opened_fd < 0) |
49 |
-+ return TRUE; |
50 |
-+ |
51 |
- output0 = find_output (0, |
52 |
- kms_renderer->fd, |
53 |
- resources, |
54 |
-@@ -736,10 +744,6 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display, |
55 |
- kms_display->width = output0->mode.hdisplay; |
56 |
- kms_display->height = output0->mode.vdisplay; |
57 |
- |
58 |
-- /* We defer setting the crtc modes until the first swap_buffers request of a |
59 |
-- * CoglOnscreen framebuffer. */ |
60 |
-- kms_display->pending_set_crtc = TRUE; |
61 |
-- |
62 |
- return TRUE; |
63 |
- } |
64 |
- |
65 |
--- |
66 |
-cgit v0.11.2 |
67 |
- |
68 |
|
69 |
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 |
70 |
deleted file mode 100644 |
71 |
index b7c4d99a281..00000000000 |
72 |
--- a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch |
73 |
+++ /dev/null |
74 |
@@ -1,42 +0,0 @@ |
75 |
-From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001 |
76 |
-From: Ray Strode <rstrode@××××××.com> |
77 |
-Date: Wed, 21 Oct 2015 15:47:01 -0400 |
78 |
-Subject: kms-winsys: don't wait for a flip when page flipping fails |
79 |
- |
80 |
-If we get EACCES from drmPageFlip we're not going to get |
81 |
-a flip event and shouldn't wait for one. |
82 |
- |
83 |
-This commit changes the EACCES path to silently ignore the |
84 |
-failed flip request and just clean up the fb. |
85 |
- |
86 |
-https://bugzilla.gnome.org/show_bug.cgi?id=756926 |
87 |
---- |
88 |
- cogl/winsys/cogl-winsys-egl-kms.c | 5 +++-- |
89 |
- 1 file changed, 3 insertions(+), 2 deletions(-) |
90 |
- |
91 |
-diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c |
92 |
-index 20c325c..b460907 100644 |
93 |
---- a/cogl/winsys/cogl-winsys-egl-kms.c |
94 |
-+++ b/cogl/winsys/cogl-winsys-egl-kms.c |
95 |
-@@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) |
96 |
- for (l = kms_display->crtcs; l; l = l->next) |
97 |
- { |
98 |
- CoglKmsCrtc *crtc = l->data; |
99 |
-- int ret; |
100 |
-+ int ret = 0; |
101 |
- |
102 |
- if (crtc->count == 0 || crtc->ignore) |
103 |
- continue; |
104 |
-@@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id) |
105 |
- } |
106 |
- } |
107 |
- |
108 |
-- flip->pending++; |
109 |
-+ if (ret == 0) |
110 |
-+ flip->pending++; |
111 |
- } |
112 |
- |
113 |
- if (kms_renderer->page_flips_not_supported && needs_flip) |
114 |
--- |
115 |
-cgit v0.11.2 |
116 |
- |