summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2015-08-29 10:49:52 -0700
committerMatt Turner <mattst88@gentoo.org>2015-08-29 10:50:59 -0700
commitae997dc2325c0b74ad1c9b6ee8542d44354c60b4 (patch)
tree63e08e4fe585498127a77382b720fda3ad9bd0f9 /x11-apps/mesa-progs
parentdev-python/trollius: version bump to 2.0 (diff)
downloadgentoo-ae997dc2325c0b74ad1c9b6ee8542d44354c60b4.tar.gz
gentoo-ae997dc2325c0b74ad1c9b6ee8542d44354c60b4.tar.bz2
gentoo-ae997dc2325c0b74ad1c9b6ee8542d44354c60b4.zip
x11-apps/mesa-progs: Patch out more of EGL_MESA_screen_surface.
Bug: https://bugs.gentoo.org/555186
Diffstat (limited to 'x11-apps/mesa-progs')
-rw-r--r--x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch33
-rw-r--r--x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild4
2 files changed, 37 insertions, 0 deletions
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
new file mode 100644
index 00000000000..f0389cb8d9c
--- /dev/null
+++ b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
@@ -0,0 +1,33 @@
+diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c
+index 2ee6f15..9921746 100644
+--- a/src/egl/eglut/eglut.c
++++ b/src/egl/eglut/eglut.c
+@@ -76,8 +76,7 @@ _eglutNow(void)
+ static void
+ _eglutDestroyWindow(struct eglut_window *win)
+ {
+- if (_eglut->surface_type != EGL_PBUFFER_BIT &&
+- _eglut->surface_type != EGL_SCREEN_BIT_MESA)
++ if (_eglut->surface_type != EGL_PBUFFER_BIT)
+ eglDestroySurface(_eglut->dpy, win->surface);
+
+ _eglutNativeFiniWindow(win);
+@@ -175,7 +174,6 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h)
+ win->config, win->native.u.pixmap, NULL);
+ break;
+ case EGL_PBUFFER_BIT:
+- case EGL_SCREEN_BIT_MESA:
+ win->surface = win->native.u.surface;
+ break;
+ default:
+@@ -289,9 +287,7 @@ eglutDestroyWindow(int win)
+ if (window->index != win)
+ return;
+
+- /* XXX it causes some bug in st/egl KMS backend */
+- if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA)
+- eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
++ eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+
+ _eglutDestroyWindow(_eglut->current);
+ }
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index 359aad5ebef..136546b02fc 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -42,6 +42,10 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${MY_P}
EGIT_CHECKOUT_DIR=${S}
+PATCHES=(
+ "${FILESDIR}"/${P}-remove-EGL_SCREEN_BIT_MESA.patch
+)
+
src_unpack() {
default
[[ $PV = 9999* ]] && git-r3_src_unpack