mesa: Changes to 'debian-experimental'
debian/changelog | 6 ++++++
debian/patches/05_kfreebsd-egl-x11.diff | 28 ----------------------------
debian/patches/series | 1 -
debian/rules | 2 +-
src/mapi/glapi/gen/es_EXT.xml | 23 ++++++++++++++---------
5 files changed, 21 insertions(+), 39 deletions(-)
New commits:
commit 1a2b11a25d2c8c92cc372096308eab4300ffb81d
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Jun 3 14:15:28 2013 +0200
debian/changelog: Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index eddcc0e..3f95eab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ mesa (9.1.3-2) UNRELEASED; urgency=low
* debian/patches: Drop 05_kfreebsd-egl-x11.diff, fixed by eglibc (2.17-4)
* debian/rules: Use rm -f instead of rm for deleting libdricore*.so, fixes
build failure on kfreebsd-*.
+ * glapi: Add some missing static_dispatch=false annotations to
+ es_EXT.xml. Fixes FTBFS on powerpc and ia64 (cherry-picked from
+ upstream).
-- Julien Cristau <jcristau@debian.org> Thu, 30 May 2013 11:28:21 +0200
commit cabcbecef6634ebae577dde9e463fb26735fc147
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Thu May 30 13:32:43 2013 +0200
glapi: Add some missing static_dispatch="false" annotations to es_EXT.xml
This fixes the following build errors on powerpc:
CC glapi_dispatch.lo
In file included from glapi_dispatch.c:90:0:
../../../../../src/mapi/glapi/glapitemp.h:1640:1: error: no previous
prototype for 'glReadBufferNV' [-Werror=missing-prototypes]
../../../../../src/mapi/glapi/glapitemp.h:4198:1: error: no previous
prototype for 'glDrawBuffersNV' [-Werror=missing-prototypes]
../../../../../src/mapi/glapi/glapitemp.h:6377:1: error: no previous
prototype for 'glFlushMappedBufferRangeEXT'
[-Werror=missing-prototypes]
../../../../../src/mapi/glapi/glapitemp.h:6389:1: error: no previous
prototype for 'glMapBufferRangeEXT' [-Werror=missing-prototypes]
../../../../../src/mapi/glapi/glapitemp.h:6401:1: error: no previous
prototype for 'glBindVertexArrayOES' [-Werror=missing-prototypes]
../../../../../src/mapi/glapi/glapitemp.h:6413:1: error: no previous
prototype for 'glDeleteVertexArraysOES' [-Werror=missing-prototypes]
../../../../../src/mapi/glapi/glapitemp.h:6433:1: error: no previous
prototype for 'glGenVertexArraysOES' [-Werror=missing-prototypes]
../../../../../src/mapi/glapi/glapitemp.h:6445:1: error: no previous
prototype for 'glIsVertexArrayOES' [-Werror=missing-prototypes]
NOTE: This is a candidate for the 9.0 and 9.1 branches.
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
(cherry picked from commit 5ea43e65498505fc5d11d63668cda165146eb55b)
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index 0f6746d..a7e7b29 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -675,22 +675,25 @@
<!-- 71. GL_OES_vertex_array_object -->
<category name="GL_OES_vertex_array_object" number="71">
- <function name="BindVertexArrayOES" alias="BindVertexArray" es2="2.0">
+ <function name="BindVertexArrayOES" alias="BindVertexArray"
+ static_dispatch="false" es2="2.0">
<param name="array" type="GLuint"/>
</function>
<function name="DeleteVertexArraysOES" alias="DeleteVertexArrays"
- es2="2.0">
+ static_dispatch="false" es2="2.0">
<param name="n" type="GLsizei"/>
<param name="arrays" type="const GLuint *" count="n"/>
</function>
- <function name="GenVertexArraysOES" alias="GenVertexArrays" es2="2.0">
+ <function name="GenVertexArraysOES" alias="GenVertexArrays"
+ static_dispatch="false" es2="2.0">
<param name="n" type="GLsizei"/>
<param name="arrays" type="GLuint *" output="true" count="n"/>
</function>
- <function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0">
+ <function name="IsVertexArrayOES" alias="IsVertexArray"
+ static_dispatch="false" es2="2.0">
<param name="array" type="GLuint"/>
<return type="GLboolean"/>
</function>
@@ -765,7 +768,8 @@
<size name="Get" mode="get"/>
</enum>
- <function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0">
+ <function name="DrawBuffersNV" alias="DrawBuffers"
+ static_dispatch="false" es2="2.0">
<param name="n" type="GLsizei" counter="true"/>
<param name="bufs" type="const GLenum *" count="n"/>
</function>
@@ -773,7 +777,8 @@
<!-- 93. GL_NV_read_buffer -->
<category name="GL_NV_read_buffer">
- <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0">
+ <function name="ReadBufferNV" alias="ReadBuffer"
+ static_dispatch="false" es2="2.0">
<param name="mode" type="GLenum"/>
</function>
</category>
@@ -801,8 +806,8 @@
<enum name="MAP_FLUSH_EXPLICIT_BIT_EXT" value="0x0010"/>
<enum name="MAP_UNSYNCHRONIZED_BIT_EXT" value="0x0020"/>
- <function name="MapBufferRangeEXT" alias="MapBufferRange" es1="1.0"
- es2="2.0">
+ <function name="MapBufferRangeEXT" alias="MapBufferRange"
+ static_dispatch="false" es1="1.0" es2="2.0">
<param name="target" type="GLenum"/>
<param name="offset" type="GLintptr"/>
<param name="size" type="GLsizeiptr"/>
@@ -811,7 +816,7 @@
</function>
<function name="FlushMappedBufferRangeEXT" alias="FlushMappedBufferRange"
- es1="1.0" es2="2.0">
+ static_dispatch="false" es1="1.0" es2="2.0">
<param name="target" type="GLenum"/>
<param name="offset" type="GLintptr"/>
<param name="length" type="GLsizeiptr"/>
commit 412f68cf12beef784d6f20080a2611fb524dea49
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Jun 3 13:54:21 2013 +0200
debian/rules: Use rm -f instead of rm for deleting libdricore*.so
Fixes kfreebsd-* and maybe some more builds.
libdricore*.so is not available on those builds.
diff --git a/debian/changelog b/debian/changelog
index 90751a5..eddcc0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ 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)
+ * debian/rules: Use rm -f instead of rm for deleting libdricore*.so, fixes
+ build failure on kfreebsd-*.
-- Julien Cristau <jcristau@debian.org> Thu, 30 May 2013 11:28:21 +0200
diff --git a/debian/rules b/debian/rules
index fbbd803..a940972 100755
--- a/debian/rules
+++ b/debian/rules
@@ -259,7 +259,7 @@ binary-arch: install
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f debian/tmp/$$file; done
# No need for these .so, they're just convenience libraries:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
- rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
+ rm -f debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
# purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
commit 0ddfcacb970125da13274a5a656f4218e4290dd2
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Jun 3 11:59:58 2013 +0200
debian/patches: Drop 05_kfreebsd-egl-x11.diff, fixed by eglibc (2.17-4)
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 <jcristau@debian.org> 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 <jcristau@debian.org>
-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
Reply to: