Attachment #174171 for bug #211760





PORTNAME=	Coin
PORTVERSION=	3.1.3
PORTREVISION=	10
CATEGORIES=	graphics
MASTER_SITES=	https://bitbucket.org/Coin3D/coin/downloads/



LIB_DEPENDS=	libsimage.so:graphics/simage

USE_GCC=	any
USES=		openal:al libtool
USE_GL=		yes
USE_XORG=	xt x11

MAKE_ENV=	LANG=C
INSTALL_TARGET=	install-strip

pre-configure:
	@${REINPLACE_CMD} -e 's|DATA install-data-local|DATA|g' \
		${WRKSRC}/Makefile.in
	@${FIND} ${WRKSRC} \( -name \*.cpp -o -name \*.h -a \! \

Lines 1-6 Link Here

(-)graphics/Coin/files/patch-Makefile.in (-3 / +3 lines)
1	--- Makefile.in.orig 2010-03-02 10:20:09.000000000 -0300	1	--- Makefile.in.orig 2010-03-02 13:20:09 UTC
2	+++ Makefile.in 2010-03-05 21:39:05.000000000 -0300	2	+++ Makefile.in
3	@@ -1399,7 +1399,7 @@	3	@@ -1399,7 +1399,7 @@ BOOST_HEADER_FILES = \
4	include/boost/version.hpp \	4	include/boost/version.hpp \
5	include/boost/visit_each.hpp	5	include/boost/visit_each.hpp
6		6




--- 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.
 
-// 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
 
 /* ********************************************************************** */
 




--- 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

Lines 1-4 Link Here

(-)graphics/Coin/pkg-descr (-1 / +3 lines)
1	From its README:	1	Coin3D
2		2
3	Coin is a 3D graphics library with a C++ Application Programming	3	Coin is a 3D graphics library with a C++ Application Programming
4	Interface based on the Open Inventor 2.1 API. Open Inventor, for those	4	Interface based on the Open Inventor 2.1 API. Open Inventor, for those
Lines 7-10 Link Here
7	facto standard graphics library for 3D visualization and visual	7	facto standard graphics library for 3D visualization and visual
8	simulation software in the scientific and engineering community.	8	simulation software in the scientific and engineering community.
9		9
		10	New versions are published under the BSD 3-clause license.
		11
10	WWW: https://bitbucket.org/Coin3D/coin/wiki/Home	12	WWW: https://bitbucket.org/Coin3D/coin/wiki/Home

Return to bug 211760

Lines 3-9 Link Here

(-)graphics/Coin/Makefile (-3 / +2 lines)
3		3
4	PORTNAME= Coin	4	PORTNAME= Coin
5	PORTVERSION= 3.1.3	5	PORTVERSION= 3.1.3
6	PORTREVISION= 9	6	PORTREVISION= 10
7	CATEGORIES= graphics	7	CATEGORIES= graphics
8	MASTER_SITES= https://bitbucket.org/Coin3D/coin/downloads/	8	MASTER_SITES= https://bitbucket.org/Coin3D/coin/downloads/
9		9
Lines 14-20 Link Here
14		14
15	LIB_DEPENDS= libsimage.so:graphics/simage	15	LIB_DEPENDS= libsimage.so:graphics/simage
16		16
17	USE_GCC= any
18	USES= openal:al libtool	17	USES= openal:al libtool
19	USE_GL= yes	18	USE_GL= yes
20	USE_XORG= xt x11	19	USE_XORG= xt x11
Lines 26-32 Link Here
26	MAKE_ENV= LANG=C	25	MAKE_ENV= LANG=C
27	INSTALL_TARGET= install-strip	26	INSTALL_TARGET= install-strip
28		27
29	post-patch:	28	pre-configure:
30	@${REINPLACE_CMD} -e 's\|DATA install-data-local\|DATA\|g' \	29	@${REINPLACE_CMD} -e 's\|DATA install-data-local\|DATA\|g' \
31	${WRKSRC}/Makefile.in	30	${WRKSRC}/Makefile.in
32	@${FIND} ${WRKSRC} \( -name \.cpp -o -name \.h -a \! \	31	@${FIND} ${WRKSRC} \( -name \.cpp -o -name \.h -a \! \

Lines 1-10 Link Here

(-)graphics/Coin/files/patch-include-Inventor-SbBasic.h (-6 / +28 lines)
1	--- include/Inventor/SbBasic.h.orig 2010-03-02 21:20:09.000000000 +0800	1	--- include/Inventor/SbBasic.h.orig 2010-03-02 13:20:09 UTC
2	+++ include/Inventor/SbBasic.h 2013-12-01 05:17:51.275860731 +0800	2	+++ include/Inventor/SbBasic.h
3	@@ -25,6 +25,7 @@	3	@@ -88,17 +88,24 @@ inline Type SbSqr(const Type val) {
4	\**************************************************************************/	4	// warning if so for debug builds. inlined like this to not take much
		5	// screenspace in inline functions.
5		6
6	#include <Inventor/C/basic.h>	7	-// cc_debugerror_post() is not attempted resolved before the template is
		8	-// used, hence the missing Inventor/errors/SoDebugError.h #include. This
		9	-// "trick" does only work portably for functions in the global namespace.
		10	+// Missing include for cc_debugerror_post() added here. The previous "trick"
		11	+// for not needing to resolve symbols in global namespace no longer works
		12	+// with newer compilers.
		13	+#ifndef NDEBUG
7	+#include <Inventor/C/errors/debugerror.h>	14	+#include <Inventor/C/errors/debugerror.h>
		15	+#endif // !NDEBUG
8		16
		17	+
		18	+#ifndef NDEBUG
		19	template <typename Type>
		20	inline void SbDividerChk(const char * funcname, Type divider) {
		21	-#ifndef NDEBUG
		22	if (!(divider != static_cast<Type>(0)))
		23	cc_debugerror_post(funcname, "divide by zero error.", divider);
		24	-#endif // !NDEBUG
		25	}
		26	+#else
		27	+template <typename Type>
		28	+inline void SbDividerChk(const char *, Type) {}
		29	+#endif // !NDEBUG
		30
9	/* ********************************************************************** */	31	/* ********************************************************************** */
10	/* Trap people trying to use Inventor headers while compiling C source code.	32

Line 0 Link Here

(-)graphics/Coin/files/patch-include_Inventor_C_base_math-undefs.h (+21 lines)
	1	--- include/Inventor/C/base/math-undefs.h.orig 2016-08-29 01:17:19 UTC
	2	+++ include/Inventor/C/base/math-undefs.h
	3	@@ -40,6 +40,8 @@
	4	work as intended. 20070518 larsa
	5	*/
	6
	7	+#ifndef __clang__
	8	+
	9	#undef cosf
	10	#define cosf(x) NO_SINGLEPREC /* whatever that'll give us a compile error... */
	11	#undef sinf
	12	@@ -59,6 +61,9 @@
	13	#undef atan2f
	14	#define atan2f(x) NO_SINGLEPREC
	15
	16	+#endif // !__clang__
	17	+
	18	+
	19	/* *********************************************************************** */
	20
	21	#endif // !COIN_MATH_UNDEFS_H