Attachment 173632 Details for Bug 211760 – Fix with upstream changes

[patch] Fix with upstream changes

graphics-Coin.diff (text/plain), 3.69 KB, created by Pedro F. Giffuni on 2016-08-13 16:58:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2016-08-13 16:58:30 UTC

Size: 3.69 KB

patch

obsolete

>Index: graphics/Coin/Makefile
>===================================================================
>--- graphics/Coin/Makefile	(revision 420161)
>+++ graphics/Coin/Makefile	(working copy)
>@@ -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,7 +14,6 @@
> 
> LIB_DEPENDS=	libsimage.so:graphics/simage
> 
>-USE_GCC=	any
> USES=		openal:al libtool
> USE_GL=		yes
> USE_XORG=	xt x11
>@@ -26,7 +25,7 @@
> 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 \! \
>Index: graphics/Coin/files/patch-Makefile.in
>===================================================================
>--- graphics/Coin/files/patch-Makefile.in	(revision 420161)
>+++ graphics/Coin/files/patch-Makefile.in	(working copy)
>@@ -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
>  
>Index: graphics/Coin/files/patch-include-Inventor-SbBasic.h
>===================================================================
>--- graphics/Coin/files/patch-include-Inventor-SbBasic.h	(revision 420161)
>+++ graphics/Coin/files/patch-include-Inventor-SbBasic.h	(working copy)
>@@ -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.
>+ 
>Index: graphics/Coin/pkg-descr
>===================================================================
>--- graphics/Coin/pkg-descr	(revision 420161)
>+++ graphics/Coin/pkg-descr	(working copy)
>@@ -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 @@
> 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

Actions: View | Diff

Attachments on bug 211760: 173557 | 173560 | 173561 | 173632 | 174161 | 174170 | 174171