diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2021-03-28 08:39:46 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2021-03-28 08:39:46 +0000 |
| commit | 63e9bf5280a3733a390ec2cd8aaa3afb8a6e55ab (patch) | |
| tree | c685c574a2c6a3b53d52f44eda0d10368d27c221 /graphics | |
| parent | 58abcc29b70aea8b26a481a2671949f0c60bf1a1 (diff) | |
| download | ports-63e9bf5280a3733a390ec2cd8aaa3afb8a6e55ab.tar.gz ports-63e9bf5280a3733a390ec2cd8aaa3afb8a6e55ab.zip | |
graphics/anttweakbar: Add patches to fix several build failures
Reported by: fallout
Notes
Notes:
svn path=/head/; revision=569379
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/anttweakbar/Makefile | 2 | ||||
| -rw-r--r-- | graphics/anttweakbar/files/patch-LoadOGLCore.h | 16 | ||||
| -rw-r--r-- | graphics/anttweakbar/files/patch-TwPrecomp.h | 16 |
3 files changed, 33 insertions, 1 deletions
diff --git a/graphics/anttweakbar/Makefile b/graphics/anttweakbar/Makefile index 1bb4d8dfe2d6..cf0453bfb469 100644 --- a/graphics/anttweakbar/Makefile +++ b/graphics/anttweakbar/Makefile @@ -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 diff --git a/graphics/anttweakbar/files/patch-LoadOGLCore.h b/graphics/anttweakbar/files/patch-LoadOGLCore.h new file mode 100644 index 000000000000..9d348a0e2a37 --- /dev/null +++ b/graphics/anttweakbar/files/patch-LoadOGLCore.h @@ -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)) diff --git a/graphics/anttweakbar/files/patch-TwPrecomp.h b/graphics/anttweakbar/files/patch-TwPrecomp.h new file mode 100644 index 000000000000..e2c7fb84de8e --- /dev/null +++ b/graphics/anttweakbar/files/patch-TwPrecomp.h @@ -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 |