Date: Sun, 28 Mar 2021 08:39:46 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569379 - in head/graphics/anttweakbar: . files Message-ID: <202103280839.12S8dk3h048116@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Sun Mar 28 08:39:46 2021 New Revision: 569379 URL: https://svnweb.freebsd.org/changeset/ports/569379 Log: graphics/anttweakbar: Add patches to fix several build failures Reported by: fallout Added: head/graphics/anttweakbar/files/patch-LoadOGLCore.h (contents, props changed) head/graphics/anttweakbar/files/patch-TwPrecomp.h (contents, props changed) Modified: head/graphics/anttweakbar/Makefile Modified: head/graphics/anttweakbar/Makefile ============================================================================== --- head/graphics/anttweakbar/Makefile Sun Mar 28 07:56:12 2021 (r569378) +++ head/graphics/anttweakbar/Makefile Sun Mar 28 08:39:46 2021 (r569379) @@ -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 Added: head/graphics/anttweakbar/files/patch-LoadOGLCore.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/anttweakbar/files/patch-LoadOGLCore.h Sun Mar 28 08:39:46 2021 (r569379) @@ -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)) Added: head/graphics/anttweakbar/files/patch-TwPrecomp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/anttweakbar/files/patch-TwPrecomp.h Sun Mar 28 08:39:46 2021 (r569379) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103280839.12S8dk3h048116>