Date: Mon, 29 Aug 2016 19:27:41 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421092 - in head/graphics/Coin: . files Message-ID: <201608291927.u7TJRfE3073228@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Mon Aug 29 19:27:41 2016 New Revision: 421092 URL: https://svnweb.freebsd.org/changeset/ports/421092 Log: Do not require GCC. PR: 211760 Submitted by: pfg Added: head/graphics/Coin/files/patch-include_Inventor_C_base_math-undefs.h (contents, props changed) Modified: head/graphics/Coin/Makefile head/graphics/Coin/files/patch-Makefile.in head/graphics/Coin/files/patch-include-Inventor-SbBasic.h head/graphics/Coin/pkg-descr Modified: head/graphics/Coin/Makefile ============================================================================== --- head/graphics/Coin/Makefile Mon Aug 29 19:23:49 2016 (r421091) +++ head/graphics/Coin/Makefile Mon Aug 29 19:27:41 2016 (r421092) @@ -3,7 +3,7 @@ PORTNAME= Coin PORTVERSION= 3.1.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics MASTER_SITES= https://bitbucket.org/Coin3D/coin/downloads/ @@ -14,10 +14,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libsimage.so:graphics/simage -USE_GCC= any USES= openal:al libtool USE_GL= yes -USE_XORG= xt x11 +USE_XORG= ice sm x11 xext xt GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pthread=yes --enable-threadsafe \ --enable-3ds-import --enable-sound \ @@ -26,7 +25,7 @@ USE_LDCONFIG= yes MAKE_ENV= LANG=C INSTALL_TARGET= install-strip -post-patch: +pre-configure: @${REINPLACE_CMD} -e 's|DATA install-data-local|DATA|g' \ ${WRKSRC}/Makefile.in @${FIND} ${WRKSRC} \( -name \*.cpp -o -name \*.h -a \! \ Modified: head/graphics/Coin/files/patch-Makefile.in ============================================================================== --- head/graphics/Coin/files/patch-Makefile.in Mon Aug 29 19:23:49 2016 (r421091) +++ head/graphics/Coin/files/patch-Makefile.in Mon Aug 29 19:27:41 2016 (r421092) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2010-03-02 10:20:09.000000000 -0300 -+++ Makefile.in 2010-03-05 21:39:05.000000000 -0300 -@@ -1399,7 +1399,7 @@ +--- Makefile.in.orig 2010-03-02 13:20:09 UTC ++++ Makefile.in +@@ -1399,7 +1399,7 @@ BOOST_HEADER_FILES = \ include/boost/version.hpp \ include/boost/visit_each.hpp Modified: head/graphics/Coin/files/patch-include-Inventor-SbBasic.h ============================================================================== --- head/graphics/Coin/files/patch-include-Inventor-SbBasic.h Mon Aug 29 19:23:49 2016 (r421091) +++ head/graphics/Coin/files/patch-include-Inventor-SbBasic.h Mon Aug 29 19:27:41 2016 (r421092) @@ -1,10 +1,32 @@ ---- include/Inventor/SbBasic.h.orig 2010-03-02 21:20:09.000000000 +0800 -+++ include/Inventor/SbBasic.h 2013-12-01 05:17:51.275860731 +0800 -@@ -25,6 +25,7 @@ - \**************************************************************************/ +--- include/Inventor/SbBasic.h.orig 2010-03-02 13:20:09 UTC ++++ include/Inventor/SbBasic.h +@@ -88,17 +88,24 @@ inline Type SbSqr(const Type val) { + // warning if so for debug builds. inlined like this to not take much + // screenspace in inline functions. - #include <Inventor/C/basic.h> +-// cc_debugerror_post() is not attempted resolved before the template is +-// used, hence the missing Inventor/errors/SoDebugError.h #include. This +-// "trick" does only work *portably* for functions in the global namespace. ++// Missing include for cc_debugerror_post() added here. The previous "trick" ++// for not needing to resolve symbols in global namespace no longer works ++// with newer compilers. ++#ifndef NDEBUG +#include <Inventor/C/errors/debugerror.h> ++#endif // !NDEBUG + ++ ++#ifndef NDEBUG + template <typename Type> + inline void SbDividerChk(const char * funcname, Type divider) { +-#ifndef NDEBUG + if (!(divider != static_cast<Type>(0))) + cc_debugerror_post(funcname, "divide by zero error.", divider); +-#endif // !NDEBUG + } ++#else ++template <typename Type> ++inline void SbDividerChk(const char *, Type) {} ++#endif // !NDEBUG /* ********************************************************************** */ - /* Trap people trying to use Inventor headers while compiling C source code. + Added: head/graphics/Coin/files/patch-include_Inventor_C_base_math-undefs.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/Coin/files/patch-include_Inventor_C_base_math-undefs.h Mon Aug 29 19:27:41 2016 (r421092) @@ -0,0 +1,21 @@ +--- include/Inventor/C/base/math-undefs.h.orig 2016-08-29 01:17:19 UTC ++++ include/Inventor/C/base/math-undefs.h +@@ -40,6 +40,8 @@ + work as intended. 20070518 larsa + */ + ++#ifndef __clang__ ++ + #undef cosf + #define cosf(x) NO_SINGLEPREC /* whatever that'll give us a compile error... */ + #undef sinf +@@ -59,6 +61,9 @@ + #undef atan2f + #define atan2f(x) NO_SINGLEPREC + ++#endif // !__clang__ ++ ++ + /* *********************************************************************** */ + + #endif // !COIN_MATH_UNDEFS_H Modified: head/graphics/Coin/pkg-descr ============================================================================== --- head/graphics/Coin/pkg-descr Mon Aug 29 19:23:49 2016 (r421091) +++ head/graphics/Coin/pkg-descr Mon Aug 29 19:27:41 2016 (r421092) @@ -1,4 +1,4 @@ -From its README: +Coin3D Coin is a 3D graphics library with a C++ Application Programming Interface based on the Open Inventor 2.1 API. Open Inventor, for those @@ -7,4 +7,6 @@ scene-graph rendering and interaction li facto standard graphics library for 3D visualization and visual simulation software in the scientific and engineering community. +New versions are published under the BSD 3-clause license. + WWW: https://bitbucket.org/Coin3D/coin/wiki/Home
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608291927.u7TJRfE3073228>