[Git][java-team/java3d][master] 3 commits: Update patch for GLsizeiptr typedef

[Jochen Sprickerhof]

Jochen Sprickerhof pushed to branch master at Debian Java Maintainers / java3d


Commits:
223e8cb8 by Jochen Sprickerhof at 2021-03-29T20:13:22+02:00
Update patch for GLsizeiptr typedef

Closes: #983760

- - - - -
4ef172d3 by Jochen Sprickerhof at 2021-03-29T20:13:22+02:00
Update homepage

Closes: #911055

- - - - -
11246443 by Jochen Sprickerhof at 2021-03-29T20:13:22+02:00
Update changelog for 1.5.2+dfsg-17 release

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/0011-Fix-definition-of-GLsizeiptr.patch
- debian/patches/series
- − debian/patches/typedef.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+java3d (1.5.2+dfsg-17) unstable; urgency=medium
+
+  * Team upload.
+  * Update patch for GLsizeiptr typedef (Closes: #983760)
+  * Update homepage (Closes: #911055)
+
+ -- Jochen Sprickerhof <jspricke at debian.org>  Mon, 29 Mar 2021 20:11:36 +0200
+
 java3d (1.5.2+dfsg-16) unstable; urgency=medium
 
   * No longer build the applet to fix the build failure with Java 11


=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends:
 Standards-Version: 4.2.1
 Vcs-Git: https://salsa.debian.org/java-team/java3d.git
 Vcs-Browser: https://salsa.debian.org/java-team/java3d
-Homepage: http://java3d.java.net
+Homepage: https://www.oracle.com/java/technologies/javase/java-3d.html
 
 Package: libjava3d-java
 Architecture: all


=====================================
debian/patches/0011-Fix-definition-of-GLsizeiptr.patch
=====================================
@@ -0,0 +1,40 @@
+From: Jochen Sprickerhof <jspricke at debian.org>
+Date: Mon, 29 Mar 2021 19:48:13 +0200
+Subject: Fix definition of GLsizeiptr
+
+---
+ j3d-core/src/native/ogl/glext.h | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/j3d-core/src/native/ogl/glext.h b/j3d-core/src/native/ogl/glext.h
+index 2519a6c..71ff798 100644
+--- a/j3d-core/src/native/ogl/glext.h
++++ b/j3d-core/src/native/ogl/glext.h
+@@ -43,6 +43,8 @@ extern "C" {
+ #define GLAPI extern
+ #endif
+ 
++#include <KHR/khrplatform.h>
++
+ /*************************************************************/
+ 
+ /* Header file version number, required by OpenGL ABI for Linux */
+@@ -3390,14 +3392,14 @@ typedef char GLchar;			/* native character */
+ 
+ #ifndef GL_VERSION_1_5
+ /* GL types for handling large vertex buffer objects */
+-typedef ptrdiff_t GLintptr;
+-typedef ptrdiff_t GLsizeiptr;
++typedef khronos_intptr_t GLintptr;
++typedef khronos_ssize_t GLsizeiptr;
+ #endif
+ 
+ #ifndef GL_ARB_vertex_buffer_object
+ /* GL types for handling large vertex buffer objects */
+-typedef ptrdiff_t GLintptrARB;
+-typedef ptrdiff_t GLsizeiptrARB;
++typedef khronos_intptr_t GLintptrARB;
++typedef khronos_ssize_t GLsizeiptrARB;
+ #endif
+ 
+ #ifndef GL_ARB_shader_objects


=====================================
debian/patches/series
=====================================
@@ -5,6 +5,6 @@
 05_pic_amd64.patch
 05_pic_i586.patch
 06_java-compat.patch
-typedef.patch
 07_java9_compatibility.patch
 08_java10_compatibility.patch
+0011-Fix-definition-of-GLsizeiptr.patch


=====================================
debian/patches/typedef.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From: Markus Koschany <apo at gambaru.de>
-Date: Sat, 22 Nov 2014 23:54:59 +0100
-Subject: typedef
-
-Define GLsizeiptr and GLintptr explicitly to prevent a FTBFS.
-This patch may be removed in the future when
-https://bugs.debian.org/765933 gets fixed.
-
-Bug: https://bugs.debian.org/769301
-Forwarded: no
----
- j3d-core/src/native/ogl/gldefs.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/j3d-core/src/native/ogl/gldefs.h b/j3d-core/src/native/ogl/gldefs.h
-index bf4434f..d20de17 100644
---- a/j3d-core/src/native/ogl/gldefs.h
-+++ b/j3d-core/src/native/ogl/gldefs.h
-@@ -65,6 +65,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- 
-+typedef ptrdiff_t GLsizeiptr;
-+typedef ptrdiff_t GLintptr;
- #include <GL/gl.h>
- #include <GL/glx.h>
- #ifdef Java3D_undef__glext_h_



View it on GitLab: https://salsa.debian.org/java-team/java3d/-/compare/195610e7d5afae80519220878638c18c99b5e439...112464434f6598d11e6a69bf176c286a754884d2

-- 
View it on GitLab: https://salsa.debian.org/java-team/java3d/-/compare/195610e7d5afae80519220878638c18c99b5e439...112464434f6598d11e6a69bf176c286a754884d2
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20210329/1b9321be/attachment.htm>