Date: Sat, 19 Oct 2013 16:10:01 GMT From: Shane Ambler <FreeBSD@ShaneWare.Biz> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/182220: [PATCH] graphics/opencolorio: Fix build on 10.0-ALPHA and pass poudriere testpor Message-ID: <201310191610.r9JGA1Oj003996@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/182220; it has been noted by GNATS.
From: Shane Ambler <FreeBSD@ShaneWare.Biz>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/182220: [PATCH] graphics/opencolorio: Fix build on 10.0-ALPHA
and pass poudriere testpor
Date: Sun, 20 Oct 2013 02:31:05 +1030
This is a multi-part message in MIME format.
--------------050101040300050708020204
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
As this is still open, an updated patch to also include staging update
--------------050101040300050708020204
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-10-20 02:24:18.547416075 +1030
+++ opencolorio/Makefile 2013-10-20 02:24:10.621417531 +1030
@@ -3,7 +3,7 @@
PORTNAME?= opencolorio
PORTVERSION= 1.0.8
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= graphics multimedia
MAINTAINER?= FreeBSD@Shaneware.biz
@@ -11,25 +11,30 @@
LICENSE?= BSD
+LIB_DEPENDS?= libtinyxml.so:${PORTSDIR}/textproc/tinyxml \
+ libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp
+
USE_GITHUB= yes
GH_ACCOUNT= imageworks
GH_PROJECT= OpenColorIO
GH_TAGNAME= v${PORTVERSION}
GH_COMMIT= 8883824
+LDFLAGS+= -L${LOCALBASE}/lib
+
.if !defined(OCIO_TOOLS)
USE_PYTHON= 2.6+
USE_LDCONFIG= yes
.endif
-USES= cmake:outsource
+USES= cmake:outsource pkgconfig
CMAKE_ARGS?= -DOCIO_BUILD_APPS:BOOL=OFF \
-DOCIO_BUILD_JNIGLUE:BOOL=OFF \
-DOCIO_BUILD_NUKE:BOOL=OFF \
-DOCIO_BUILD_STATIC:BOOL=OFF \
- -DOCIO_BUILD_PYGLUE:BOOL=ON
-
-MAKE_JOBS_SAFE?= yes
+ -DOCIO_BUILD_PYGLUE:BOOL=ON \
+ -DUSE_EXTERNAL_TINYXML:BOOL=ON \
+ -DUSE_EXTERNAL_YAML:BOOL=ON
PLIST= ${PKGDIR}/pkg-plist${PKGNAMESUFFIX}
@@ -38,7 +43,6 @@
OPTIONS_DEFAULT= DOCS SSE
.endif
-NO_STAGE= yes
.include <bsd.port.options.mk>
.if empty(PORT_OPTIONS:MDOCS) || 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-10-20 02:24:18.434416907 +1030
+++ opencolorio/files/patch-export__OpenColorIO__OpenColorABI.h.in 2013-10-15 15:37:27.591480634 +1030
@@ -1,4 +1,16 @@
--- export/OpenColorIO/OpenColorABI.h.in.orig 2012-12-12 09:51:23.000000000 +1030
++++ 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
+++ export/OpenColorIO/OpenColorABI.h.in 2013-01-29 21:13:34.104857600 +1030
@@ -65,7 +65,7 @@
diff -Nru opencolorio.orig/pkg-plist opencolorio/pkg-plist
--- opencolorio.orig/pkg-plist 2013-10-20 02:24:18.491416190 +1030
+++ opencolorio/pkg-plist 2013-10-15 15:37:27.592480480 +1030
@@ -116,7 +116,6 @@
%%PORTDOCS%%%%DOCSDIR%%/userguide/tool_overview.html
@dirrm include/OpenColorIO
@dirrm include/PyOpenColorIO
-@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%%
+@dirrmtry %%PYTHON_SITELIBDIR%%
+@dirrmtry %%PYTHON_LIBDIR%%
--------------050101040300050708020204--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310191610.r9JGA1Oj003996>