From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D6C561384C0 for ; Sat, 29 Aug 2015 17:47:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7E135E0871; Sat, 29 Aug 2015 17:47:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 26ECDE0871 for ; Sat, 29 Aug 2015 17:47:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 521D73408BE for ; Sat, 29 Aug 2015 17:47:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECD64144 for ; Sat, 29 Aug 2015 17:47:02 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1440870659.ae997dc2325c0b74ad1c9b6ee8542d44354c60b4.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild X-VCS-Directories: x11-apps/mesa-progs/ x11-apps/mesa-progs/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: ae997dc2325c0b74ad1c9b6ee8542d44354c60b4 X-VCS-Branch: master Date: Sat, 29 Aug 2015 17:47:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f8f4b7d7-6b53-4a37-8fe8-d085941faf49 X-Archives-Hash: 23e1177c9dde73ff8ab183882fab26ec commit: ae997dc2325c0b74ad1c9b6ee8542d44354c60b4 Author: Matt Turner gentoo org> AuthorDate: Sat Aug 29 17:49:52 2015 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Aug 29 17:50:59 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae997dc2 x11-apps/mesa-progs: Patch out more of EGL_MESA_screen_surface. Bug: https://bugs.gentoo.org/555186 ...sa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch | 33 ++++++++++++++++++++++ x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild | 4 +++ 2 files changed, 37 insertions(+) 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 0000000..f0389cb --- /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 359aad5..136546b 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