Date: Sat, 21 Feb 2015 01:33:00 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379476 - head/java/java3d/files Message-ID: <201502210133.t1L1X0hf016688@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Sat Feb 21 01:33:00 2015 New Revision: 379476 URL: https://svnweb.freebsd.org/changeset/ports/379476 QAT: https://qat.redports.org/buildarchive/r379476/ Log: Fix build with old Mesa3D. r378494 fixed new Mesa3D but it broke old ones. Added: head/java/java3d/files/patch-glext.h (contents, props changed) Modified: head/java/java3d/files/patch-gldefs.h Modified: head/java/java3d/files/patch-gldefs.h ============================================================================== --- head/java/java3d/files/patch-gldefs.h Sat Feb 21 00:20:31 2015 (r379475) +++ head/java/java3d/files/patch-gldefs.h Sat Feb 21 01:33:00 2015 (r379476) @@ -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_ Added: head/java/java3d/files/patch-glext.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/java/java3d/files/patch-glext.h Sat Feb 21 01:33:00 2015 (r379476) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502210133.t1L1X0hf016688>