From owner-svn-ports-head@freebsd.org Sun Mar 28 08:39:47 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 515355BA504; Sun, 28 Mar 2021 08:39:47 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F7TfW1vpYz3rjC; Sun, 28 Mar 2021 08:39:47 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 29BA71CC7F; Sun, 28 Mar 2021 08:39:47 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12S8dkaS048119; Sun, 28 Mar 2021 08:39:46 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12S8dk3h048116; Sun, 28 Mar 2021 08:39:46 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202103280839.12S8dk3h048116@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 28 Mar 2021 08:39:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r569379 - in head/graphics/anttweakbar: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/graphics/anttweakbar: . files X-SVN-Commit-Revision: 569379 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2021 08:39:47 -0000 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: " has been replaced by " + +--- TwPrecomp.h.orig 2021-03-28 08:35:14 UTC ++++ TwPrecomp.h +@@ -51,7 +51,11 @@ + # include + # include + # include ++#if !defined(__FreeBSD__) + # include ++#else ++# include ++#endif + # undef _WIN32 + # undef WIN32 + # undef _WIN64