| 1 |
commit: ae997dc2325c0b74ad1c9b6ee8542d44354c60b4 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 29 17:49:52 2015 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 29 17:50:59 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae997dc2 |
| 7 |
|
| 8 |
x11-apps/mesa-progs: Patch out more of EGL_MESA_screen_surface. |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/555186 |
| 11 |
|
| 12 |
...sa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch | 33 ++++++++++++++++++++++ |
| 13 |
x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 4 +++ |
| 14 |
2 files changed, 37 insertions(+) |
| 15 |
|
| 16 |
diff --git a/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..f0389cb |
| 19 |
--- /dev/null |
| 20 |
+++ b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch |
| 21 |
@@ -0,0 +1,33 @@ |
| 22 |
+diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c |
| 23 |
+index 2ee6f15..9921746 100644 |
| 24 |
+--- a/src/egl/eglut/eglut.c |
| 25 |
++++ b/src/egl/eglut/eglut.c |
| 26 |
+@@ -76,8 +76,7 @@ _eglutNow(void) |
| 27 |
+ static void |
| 28 |
+ _eglutDestroyWindow(struct eglut_window *win) |
| 29 |
+ { |
| 30 |
+- if (_eglut->surface_type != EGL_PBUFFER_BIT && |
| 31 |
+- _eglut->surface_type != EGL_SCREEN_BIT_MESA) |
| 32 |
++ if (_eglut->surface_type != EGL_PBUFFER_BIT) |
| 33 |
+ eglDestroySurface(_eglut->dpy, win->surface); |
| 34 |
+ |
| 35 |
+ _eglutNativeFiniWindow(win); |
| 36 |
+@@ -175,7 +174,6 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h) |
| 37 |
+ win->config, win->native.u.pixmap, NULL); |
| 38 |
+ break; |
| 39 |
+ case EGL_PBUFFER_BIT: |
| 40 |
+- case EGL_SCREEN_BIT_MESA: |
| 41 |
+ win->surface = win->native.u.surface; |
| 42 |
+ break; |
| 43 |
+ default: |
| 44 |
+@@ -289,9 +287,7 @@ eglutDestroyWindow(int win) |
| 45 |
+ if (window->index != win) |
| 46 |
+ return; |
| 47 |
+ |
| 48 |
+- /* XXX it causes some bug in st/egl KMS backend */ |
| 49 |
+- if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA) |
| 50 |
+- eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); |
| 51 |
++ eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); |
| 52 |
+ |
| 53 |
+ _eglutDestroyWindow(_eglut->current); |
| 54 |
+ } |
| 55 |
|
| 56 |
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 57 |
index 359aad5..136546b 100644 |
| 58 |
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 59 |
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild |
| 60 |
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND} |
| 61 |
S=${WORKDIR}/${MY_P} |
| 62 |
EGIT_CHECKOUT_DIR=${S} |
| 63 |
|
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}"/${P}-remove-EGL_SCREEN_BIT_MESA.patch |
| 66 |
+) |
| 67 |
+ |
| 68 |
src_unpack() { |
| 69 |
default |
| 70 |
[[ $PV = 9999* ]] && git-r3_src_unpack |
Archives