Package list java3d / 223e8cb
Update patch for GLsizeiptr typedef Closes: #983760 Jochen Sprickerhof 6 months ago
3 changed file(s) with 41 addition(s) and 28 deletion(s). Raw diff Collapse all Expand all
0 From: Jochen Sprickerhof <jspricke@debian.org>
1 Date: Mon, 29 Mar 2021 19:48:13 +0200
2 Subject: Fix definition of GLsizeiptr
3
4 ---
5 j3d-core/src/native/ogl/glext.h | 10 ++++++----
6 1 file changed, 6 insertions(+), 4 deletions(-)
7
8 diff --git a/j3d-core/src/native/ogl/glext.h b/j3d-core/src/native/ogl/glext.h
9 index 2519a6c..71ff798 100644
10 --- a/j3d-core/src/native/ogl/glext.h
11 +++ b/j3d-core/src/native/ogl/glext.h
12 @@ -43,6 +43,8 @@ extern "C" {
13 #define GLAPI extern
14 #endif
15
16 +#include <KHR/khrplatform.h>
17 +
18 /*************************************************************/
19
20 /* Header file version number, required by OpenGL ABI for Linux */
21 @@ -3390,14 +3392,14 @@ typedef char GLchar; /* native character */
22
23 #ifndef GL_VERSION_1_5
24 /* GL types for handling large vertex buffer objects */
25 -typedef ptrdiff_t GLintptr;
26 -typedef ptrdiff_t GLsizeiptr;
27 +typedef khronos_intptr_t GLintptr;
28 +typedef khronos_ssize_t GLsizeiptr;
29 #endif
30
31 #ifndef GL_ARB_vertex_buffer_object
32 /* GL types for handling large vertex buffer objects */
33 -typedef ptrdiff_t GLintptrARB;
34 -typedef ptrdiff_t GLsizeiptrARB;
35 +typedef khronos_intptr_t GLintptrARB;
36 +typedef khronos_ssize_t GLsizeiptrARB;
37 #endif
38
39 #ifndef GL_ARB_shader_objects
44 05_pic_amd64.patch
55 05_pic_i586.patch
66 06_java-compat.patch
7 typedef.patch
87 07_java9_compatibility.patch
98 08_java10_compatibility.patch
9 0011-Fix-definition-of-GLsizeiptr.patch
+0
-27
debian/patches/typedef.patch less more
0 From: Markus Koschany <apo@gambaru.de>
1 Date: Sat, 22 Nov 2014 23:54:59 +0100
2 Subject: typedef
3
4 Define GLsizeiptr and GLintptr explicitly to prevent a FTBFS.
5 This patch may be removed in the future when
6 https://bugs.debian.org/765933 gets fixed.
7
8 Bug: https://bugs.debian.org/769301
9 Forwarded: no
10 ---
11 j3d-core/src/native/ogl/gldefs.h | 2 ++
12 1 file changed, 2 insertions(+)
13
14 diff --git a/j3d-core/src/native/ogl/gldefs.h b/j3d-core/src/native/ogl/gldefs.h
15 index bf4434f..d20de17 100644
16 --- a/j3d-core/src/native/ogl/gldefs.h
17 +++ b/j3d-core/src/native/ogl/gldefs.h
18 @@ -65,6 +65,8 @@
19 #include <X11/Xlib.h>
20 #include <X11/Xutil.h>
21
22 +typedef ptrdiff_t GLsizeiptr;
23 +typedef ptrdiff_t GLintptr;
24 #include <GL/gl.h>
25 #include <GL/glx.h>
26 #ifdef Java3D_undef__glext_h_