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

[Shane Ambler]

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

From: Shane Ambler <FreeBSD at ShaneWare.Biz>
To: bug-followup at FreeBSD.org, swills at freebsd.org
Cc:  
Subject: Re: ports/182220: [PATCH] graphics/opencolorio: Fix build on 10.0-ALPHA
 and pass poudriere testpor
Date: Fri, 27 Sep 2013 04:51:02 +0930

 This is a multi-part message in MIME format.
 --------------090204040808090405040500
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 >>
 >> +.if (${CXX:T} == "clang++" && ${OSVERSION} > 902000) || ${OSVERSION} > 1000054
 >> +CXXFLAGS+= -stdlib=libc++ -std=c++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.
 >
 >> + #include <boost/shared_ptr.hpp>
 >> + #define OCIO_SHARED_PTR boost::shared_ptr
 >> + #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast
 >> ++#elif __cplusplus >= 201103 && defined(_LIBCPP_VERSION)
 >
 > Remove "__cplusplus >= 201103 &&" here.
 
 This works so adjusting patch to suit.
 
 
 --------------090204040808090405040500
 Content-Type: text/plain; charset=UTF-8;
  name="opencolorio.patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="opencolorio.patch.txt"
 
 diff -Nru opencolorio.orig/Makefile opencolorio/Makefile
 --- opencolorio.orig/Makefile	2013-09-27 04:45:29.645512501 +0930
 +++ opencolorio/Makefile	2013-09-27 04:44:27.402513537 +0930
 @@ -3,7 +3,7 @@
  
  PORTNAME?=	opencolorio
  PORTVERSION=	1.0.8
 -PORTREVISION?=	0
 +PORTREVISION?=	1
  CATEGORIES=	graphics multimedia
  
  MAINTAINER?=	FreeBSD at Shaneware.biz
 @@ -29,8 +29,6 @@
  		-DOCIO_BUILD_STATIC:BOOL=OFF \
  		-DOCIO_BUILD_PYGLUE:BOOL=ON
  
 -MAKE_JOBS_SAFE?=	yes
 -
  PLIST=		${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
  
  .if !defined(OCIO_TOOLS)
 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	2013-09-27 04:45:29.625527690 +0930
 +++ opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in	2013-09-27 04:44:13.738513909 +0930
 @@ -1,6 +1,17 @@
  --- export/OpenColorIO/OpenColorABI.h.in.orig	2012-12-12 09:51:23.000000000 +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 defined(_LIBCPP_VERSION)
 ++#include <memory>
 ++#define OCIO_SHARED_PTR std::shared_ptr
 ++#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
 + #elif __GNUC__ >= 4
 + #include <tr1/memory>
 + #define OCIO_SHARED_PTR std::tr1::shared_ptr
 +@@ -65,7 +69,7 @@
   
   // If supported, define OCIOEXPORT, OCIOHIDDEN
   // (used to choose which symbols to export from OpenColorIO)
 diff -Nru opencolorio.orig/pkg-plist opencolorio/pkg-plist
 --- opencolorio.orig/pkg-plist	2013-09-27 04:45:29.636512599 +0930
 +++ opencolorio/pkg-plist	2013-09-27 04:42:57.702304080 +0930
 @@ -116,7 +116,6 @@
  %%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html
  @dirrm include/OpenColorIO
  @dirrm include/PyOpenColorIO
 - at dirrmtry libdata/pkgconfig
  @dirrm share/ocio
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/userguide
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/developers/bindings
 @@ -132,3 +131,5 @@
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/_sources
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/_images
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
 + at dirrmtry %%PYTHON_LIBDIR%%/site-packages
 + at dirrmtry %%PYTHON_LIBDIR%%
 
 --------------090204040808090405040500--