diff options
| author | jkim <jkim@FreeBSD.org> | 2015-02-21 09:33:00 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-02-21 09:33:00 +0800 |
| commit | e4263f936805f6d46fe74a1794f765decf762757 (patch) | |
| tree | 24613a665048b96658f218f52a38609691f3c800 /java/java3d | |
| parent | 91c278004e2ce8f68aa48586c2e04cd47206a0dc (diff) | |
| download | freebsd-ports-gnome-e4263f936805f6d46fe74a1794f765decf762757.tar.gz freebsd-ports-gnome-e4263f936805f6d46fe74a1794f765decf762757.tar.zst freebsd-ports-gnome-e4263f936805f6d46fe74a1794f765decf762757.zip | |
Fix build with old Mesa3D. r378494 fixed new Mesa3D but it broke old ones.
Diffstat (limited to 'java/java3d')
| -rw-r--r-- | java/java3d/files/patch-gldefs.h | 8 | ||||
| -rw-r--r-- | java/java3d/files/patch-glext.h | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/java/java3d/files/patch-gldefs.h b/java/java3d/files/patch-gldefs.h index 2b0b7ccfc16c..160db7dfcb05 100644 --- a/java/java3d/files/patch-gldefs.h +++ b/java/java3d/files/patch-gldefs.h @@ -1,11 +1,13 @@ --- j3d-core/src/native/ogl/gldefs.h.orig 2008-02-28 15:18:01.000000000 -0500 -+++ j3d-core/src/native/ogl/gldefs.h 2015-02-05 16:38:10.813942000 -0500 -@@ -65,6 +65,8 @@ ++++ j3d-core/src/native/ogl/gldefs.h 2015-02-20 17:51:50.420236000 -0500 +@@ -65,6 +65,10 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -+typedef ptrdiff_t GLsizeiptr; ++#define GL_VERSION_1_5_TYPES_DEFINED +typedef ptrdiff_t GLintptr; ++typedef ptrdiff_t GLsizeiptr; ++ #include <GL/gl.h> #include <GL/glx.h> #ifdef Java3D_undef__glext_h_ diff --git a/java/java3d/files/patch-glext.h b/java/java3d/files/patch-glext.h new file mode 100644 index 000000000000..379ba08c6c14 --- /dev/null +++ b/java/java3d/files/patch-glext.h @@ -0,0 +1,15 @@ +--- j3d-core/src/native/ogl/glext.h.orig 2007-02-26 13:37:09.000000000 -0500 ++++ j3d-core/src/native/ogl/glext.h 2015-02-20 17:50:53.517494000 -0500 +@@ -3389,10 +3389,12 @@ + #endif + + #ifndef GL_VERSION_1_5 ++#ifndef GL_VERSION_1_5_TYPES_DEFINED + /* GL types for handling large vertex buffer objects */ + typedef ptrdiff_t GLintptr; + typedef ptrdiff_t GLsizeiptr; + #endif ++#endif + + #ifndef GL_ARB_vertex_buffer_object + /* GL types for handling large vertex buffer objects */ |