merge patch for #769301 into existing -10 packaging
Tony Mancill
9 years ago
0 | 0 |
java3d (1.5.2+dfsg-10) unstable; urgency=medium
|
1 | 1 |
|
2 | 2 |
* Team upload.
|
3 | |
* Updated Standards-Version to 3.9.5 (no changes)
|
|
3 |
|
|
4 |
[ tony mancill ]
|
|
5 |
* Updated Standards-Version to 3.9.6 (no changes)
|
4 | 6 |
* Update Upstream URL in d/control and d/copyright. (Closes: #758413)
|
5 | 7 |
* Use canonical Vcs URLs for packaging repo.
|
6 | 8 |
* Use debhelper 9.
|
7 | 9 |
|
8 | |
-- tony mancill <tmancill@debian.org> Mon, 18 Aug 2014 22:38:20 -0700
|
|
10 |
[ Markus Koschany ]
|
|
11 |
* Add typedef.patch. Define GLsizeiptr and GLintptr explicitly to
|
|
12 |
prevent a FTBFS. (Closes: #769301)
|
|
13 |
|
|
14 |
-- Markus Koschany <apo@gambaru.de> Sun, 23 Nov 2014 00:10:37 +0100
|
9 | 15 |
|
10 | 16 |
java3d (1.5.2+dfsg-9) unstable; urgency=low
|
11 | 17 |
|
13 | 13 |
libgl1-mesa-dev,
|
14 | 14 |
libxext-dev,
|
15 | 15 |
libxt-dev
|
16 | |
Standards-Version: 3.9.5
|
|
16 |
Standards-Version: 3.9.6
|
17 | 17 |
Homepage: http://java3d.java.net
|
18 | 18 |
Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/java3d/
|
19 | 19 |
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/java3d/
|
4 | 4 |
05_pic_amd64.patch
|
5 | 5 |
05_pic_i586.patch
|
6 | 6 |
06_java-compat.patch
|
|
7 |
typedef.patch
|
|
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_
|