diff options
| author | tijl <tijl@35697150-7ecd-e111-bb59-0022644237b5> | 2020-12-29 20:47:14 +0000 |
|---|---|---|
| committer | tijl <tijl@35697150-7ecd-e111-bb59-0022644237b5> | 2020-12-29 20:47:14 +0000 |
| commit | df5f808b1e8b1ce8e5d364bbec4a1da9dea6b0c0 (patch) | |
| tree | 333c5125c50269e778d12aff0a3309c4ec6ea66c /java | |
| parent | eea3a6492adf6c2553d328e89055a1a6311422eb (diff) | |
| download | freebsd-ports-df5f808b1e8b1ce8e5d364bbec4a1da9dea6b0c0.tar.gz freebsd-ports-df5f808b1e8b1ce8e5d364bbec4a1da9dea6b0c0.tar.bz2 | |
Fix build on i386 by removing two old patches that worked around a bug in
the Mesa headers that has since been fixed.
git-svn-id: http://svn.freebsd.org/ports/head@559610 35697150-7ecd-e111-bb59-0022644237b5
Diffstat (limited to 'java')
| -rw-r--r-- | java/java3d/Makefile | 2 | ||||
| -rw-r--r-- | java/java3d/files/patch-gldefs.h | 13 | ||||
| -rw-r--r-- | java/java3d/files/patch-glext.h | 15 |
3 files changed, 1 insertions, 29 deletions
diff --git a/java/java3d/Makefile b/java/java3d/Makefile index b3bf1a57bc68..23b72b52ff8e 100644 --- a/java/java3d/Makefile +++ b/java/java3d/Makefile @@ -3,7 +3,7 @@ PORTNAME= java3d PORTVERSION= 1.5.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= java graphics games devel MASTER_SITES= https://sites.google.com/site/daemonwizard/ diff --git a/java/java3d/files/patch-gldefs.h b/java/java3d/files/patch-gldefs.h deleted file mode 100644 index 160db7dfcb05..000000000000 --- a/java/java3d/files/patch-gldefs.h +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-20 17:51:50.420236000 -0500 -@@ -65,6 +65,10 @@ - #include <X11/Xlib.h> - #include <X11/Xutil.h> - -+#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 deleted file mode 100644 index 379ba08c6c14..000000000000 --- a/java/java3d/files/patch-glext.h +++ /dev/null @@ -1,15 +0,0 @@ ---- 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 */ |