graphics/anttweakbar: Add patches to fix several build failures
Reported by: fallout
This commit is contained in:
parent
58abcc29b7
commit
63e9bf5280
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=569379
3 changed files with 33 additions and 1 deletions
|
@ -20,7 +20,7 @@ USE_LDCONFIG= yes
|
|||
WRKSRC= ${WRKDIR}/AntTweakBar
|
||||
WRKSRC_SUBDIR= src
|
||||
|
||||
DOS2UNIX_FILES= Makefile
|
||||
DOS2UNIX_FILES= Makefile LoadOGLCore.h TwPrecomp.h
|
||||
|
||||
LDFLAGS+= -L${LOCALBASE}/lib -lX11
|
||||
|
||||
|
|
16
graphics/anttweakbar/files/patch-LoadOGLCore.h
Normal file
16
graphics/anttweakbar/files/patch-LoadOGLCore.h
Normal file
|
@ -0,0 +1,16 @@
|
|||
- typedefs cause error: typedef redefinition with different types ('ptrdiff_t' (aka 'int') vs 'khronos_intptr_t' (aka 'long'))
|
||||
|
||||
--- LoadOGLCore.h.orig 2021-03-28 08:30:01 UTC
|
||||
+++ LoadOGLCore.h
|
||||
@@ -152,9 +152,11 @@ ANT_GL_CORE_DECL(void, glPointParameterfv, (GLenum pna
|
||||
ANT_GL_CORE_DECL(void, glPointParameteri, (GLenum pname, GLint param))
|
||||
ANT_GL_CORE_DECL(void, glPointParameteriv, (GLenum pname, const GLint *params))
|
||||
// GL 1.5
|
||||
+#if !defined(__FreeBSD__)
|
||||
#ifndef ANT_OSX
|
||||
typedef ptrdiff_t GLintptr;
|
||||
typedef ptrdiff_t GLsizeiptr;
|
||||
+#endif
|
||||
#endif
|
||||
ANT_GL_CORE_DECL(void, glGenQueries, (GLsizei n, GLuint *ids))
|
||||
ANT_GL_CORE_DECL(void, glDeleteQueries, (GLsizei n, const GLuint *ids))
|
16
graphics/anttweakbar/files/patch-TwPrecomp.h
Normal file
16
graphics/anttweakbar/files/patch-TwPrecomp.h
Normal file
|
@ -0,0 +1,16 @@
|
|||
- error: "<malloc.h> has been replaced by <stdlib.h>"
|
||||
|
||||
--- TwPrecomp.h.orig 2021-03-28 08:35:14 UTC
|
||||
+++ TwPrecomp.h
|
||||
@@ -51,7 +51,11 @@
|
||||
# include <GL/glx.h>
|
||||
# include <X11/Xatom.h>
|
||||
# include <unistd.h>
|
||||
+#if !defined(__FreeBSD__)
|
||||
# include <malloc.h>
|
||||
+#else
|
||||
+# include <stdlib.h>
|
||||
+#endif
|
||||
# undef _WIN32
|
||||
# undef WIN32
|
||||
# undef _WIN64
|
Loading…
Reference in a new issue