ports/182220: [PATCH] graphics/opencolorio: Fix build on 10.0-ALPHA and pass poudriere testpor

[Tijl Coosemans]

The following reply was made to PR ports/182220; it has been noted by GNATS.

From: Tijl Coosemans <tijl at FreeBSD.org>
To: Shane Ambler <FreeBSD at ShaneWare.Biz>
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/182220: [PATCH] graphics/opencolorio: Fix build on
 10.0-ALPHA and pass poudriere testpor
Date: Tue, 24 Sep 2013 10:02:58 +0200

 --Sig_/ODTF94f19=gnt+Ts2hjoP+o
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: quoted-printable
 
 On Sat, 21 Sep 2013 09:40:01 GMT Shane Ambler wrote:
 > I improved the test to be more specific and added -std=3Dc++11 cxxflags
 > Also remove MAKE_JOBS_SAFE
 > Not certain that the pkg-plist changes are needed but do no harm.
 > =20
 > diff -Nru opencolorio.orig/Makefile opencolorio/Makefile
 > --- opencolorio.orig/Makefile	2013-09-21 18:54:01.756081148 +0930
 > +++ opencolorio/Makefile	2013-09-21 18:52:12.111081631 +0930
 > @@ -3,7 +3,7 @@
 > =20
 >  PORTNAME?=3D	opencolorio
 >  PORTVERSION=3D	1.0.8
 > -PORTREVISION?=3D	0
 > +PORTREVISION?=3D	1
 >  CATEGORIES=3D	graphics multimedia
 > =20
 >  MAINTAINER?=3D	FreeBSD at Shaneware.biz
 > @@ -29,8 +29,6 @@
 >  		-DOCIO_BUILD_STATIC:BOOL=3DOFF \
 >  		-DOCIO_BUILD_PYGLUE:BOOL=3DON
 > =20
 > -MAKE_JOBS_SAFE?=3D	yes
 > -
 >  PLIST=3D		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
 > =20
 > .if !defined(OCIO_TOOLS)
 > @@ -61,6 +59,10 @@
 >  CFLAGS+=3D	-march=3Dpentium2
 >  .endif
 > =20
 > +.if (${CXX:T} =3D=3D "clang++" && ${OSVERSION} > 902000) || ${OSVERSION}=
  > 1000054
 > +CXXFLAGS+=3D -stdlib=3Dlibc++ -std=3Dc++11
 > +.endif
 > +
 
 The problem with this is that now all C++ ports that link with this
 library have to be build with libc++ too.  You can remove this entire
 .if block if you adjust the patch below.
 
 >  post-patch:
 >  .if defined(OCIO_TOOLS)
 >  	@${FIND} ${WRKSRC}/src/apps -name "main.cpp" -exec \
 > diff -Nru opencolorio.orig/files/patch-export__OpenColorIO__OpenColorABI.=
 h.in opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in
 > --- opencolorio.orig/files/patch-export__OpenColorIO__OpenColorABI.h.in	2=
 013-09-21 18:54:01.743091115 +0930
 > +++ opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in	2013-0=
 9-21 18:52:12.111081631 +0930
 > @@ -1,6 +1,17 @@
 >  --- export/OpenColorIO/OpenColorABI.h.in.orig	2012-12-12 09:51:23.000000=
 000 +1030
 > -+++ export/OpenColorIO/OpenColorABI.h.in	2013-01-29 21:13:34.104857600 +=
 1030
 > -@@ -65,7 +65,7 @@
 > ++++ export/OpenColorIO/OpenColorABI.h.in	2013-09-19 22:38:40.141969294 +=
 0930
 > +@@ -55,6 +55,10 @@
 > + #include <boost/shared_ptr.hpp>
 > + #define OCIO_SHARED_PTR boost::shared_ptr
 > + #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast
 > ++#elif __cplusplus >=3D 201103 && defined(_LIBCPP_VERSION)
 
 Remove "__cplusplus >=3D 201103 &&" here.
 
 > ++#include <memory>
 > ++#define OCIO_SHARED_PTR std::shared_ptr
 > ++#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
 > + #elif __GNUC__ >=3D 4
 > + #include <tr1/memory>
 > + #define OCIO_SHARED_PTR std::tr1::shared_ptr
 > +@@ -65,7 +69,7 @@
 >  =20
 >   // If supported, define OCIOEXPORT, OCIOHIDDEN
 >   // (used to choose which symbols to export from OpenColorIO)
 
 --Sig_/ODTF94f19=gnt+Ts2hjoP+o
 Content-Type: application/pgp-signature; name=signature.asc
 Content-Disposition: attachment; filename=signature.asc
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (FreeBSD)
 
 iF4EAREIAAYFAlJBRzcACgkQfoCS2CCgtisBSAD/cs3QsMjd9fjHBs0kLeI9JgNQ
 lhr/Ax6XT4X0MFtpQ6AA/RyxVMN0h2uLDwH8LouMAeZTpxHHkGIP2urJePesYd1P
 =3Az6
 -----END PGP SIGNATURE-----
 
 --Sig_/ODTF94f19=gnt+Ts2hjoP+o--