Signed-off-by: Andreas Boll <[email protected]> --- debian/changelog | 1 + debian/patches/05_kfreebsd-egl-x11.diff | 28 ---------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 debian/patches/05_kfreebsd-egl-x11.diff
diff --git a/debian/changelog b/debian/changelog index 88232e2..90751a5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ mesa (9.1.3-2) UNRELEASED; urgency=low [ Andreas Boll ] * debian/not-installed: Remove glut headers + * debian/patches: Drop 05_kfreebsd-egl-x11.diff, fixed by eglibc (2.17-4) -- Julien Cristau <[email protected]> Thu, 30 May 2013 11:28:21 +0200 diff --git a/debian/patches/05_kfreebsd-egl-x11.diff b/debian/patches/05_kfreebsd-egl-x11.diff deleted file mode 100644 index 3a050b4..0000000 --- a/debian/patches/05_kfreebsd-egl-x11.diff +++ /dev/null @@ -1,28 +0,0 @@ -From 8aec01a4d5d098430cdb369a69a85cdbf20ebc99 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <[email protected]> -Date: Thu, 25 Aug 2011 23:08:05 +0200 -Subject: [PATCH] Work around the lack of O_CLOEXEC on kbsd - -Not that dri2 is going to work there, but well. ---- - src/egl/drivers/dri2/platform_x11.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -Index: mesa/src/egl/drivers/dri2/platform_x11.c -=================================================================== ---- mesa.orig/src/egl/drivers/dri2/platform_x11.c 2012-01-18 16:04:58.294653499 +0200 -+++ mesa/src/egl/drivers/dri2/platform_x11.c 2012-01-18 16:05:08.790968112 +0200 -@@ -1083,7 +1083,13 @@ - if (!dri2_load_driver(disp)) - goto cleanup_conn; - -+#ifdef O_CLOEXEC - dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR | O_CLOEXEC); -+#else -+ dri2_dpy->fd = open(dri2_dpy->device_name, O_RDWR); -+ if (dri2_dpy->fd >= 0) -+ fcntl(dri2_dpy->fd, F_SETFD, fcntl(dri2_dpy->fd, F_GETFD) | FD_CLOEXEC); -+#endif - if (dri2_dpy->fd == -1) { - _eglLog(_EGL_WARNING, - "DRI2: could not open %s (%s)", dri2_dpy->device_name, diff --git a/debian/patches/series b/debian/patches/series index 68bced5..cf3211b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 04_osmesa_version.diff -#05_kfreebsd-egl-x11.diff 06_kfreebsd-ftbfs.diff 08-kfreebsd-gallium.diff #11-hurd-ftbfs-again.diff -- 1.7.10.4 -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
