Date: Mon, 18 Feb 2013 14:24:18 GMT From: Shane Ambler <FreeBSD@Shaneware.biz> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/176241: [maintainer update] for graphics/openimageio Message-ID: <201302181424.r1IEOInw040134@red.freebsd.org> Resent-Message-ID: <201302181430.r1IEU0Au001299@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176241 >Category: ports >Synopsis: [maintainer update] for graphics/openimageio >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Feb 18 14:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Shane Ambler >Release: 9.1-RELEASE >Organization: >Environment: FreeBSD leader.local 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r246600: Sun Feb 10 16:13:27 CST 2013 shane@leader.local:/usr/obj/usr/src/sys/dtracekern amd64 >Description: Update to v1.1.6 Includes patch submitted in pr/173558 Removes files/patch-include__thread.h New patch patch-include__fmath.h is added to provide support for 8.2-STABLE in response to a user that failed upgrading to 8.3 and fell back to 8-STABLE ALSO - graphics/py-openimageio as a slave of this port didn't get updated properly last time. distinfo pkg-descr and files/patch-src_CMakeLists.txt should be removed leaving just Makefile for the port. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Nru openimageio.orig/Makefile openimageio/Makefile --- openimageio.orig/Makefile 2013-02-19 00:18:22.002610777 +1030 +++ openimageio/Makefile 2013-02-13 20:54:28.775705039 +1030 @@ -2,10 +2,9 @@ # $FreeBSD: head/graphics/openimageio/Makefile 311310 2013-01-31 13:38:42Z bapt $ PORTNAME?= openimageio -PORTVERSION= 1.1.2 -PORTREVISION?= 2 +PORTVERSION= 1.1.6 +PORTREVISION?= 0 CATEGORIES?= graphics multimedia -MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/ MAINTAINER= FreeBSD@Shaneware.biz COMMENT= OpenImageIO graphics library @@ -14,7 +13,7 @@ LIB_DEPENDS?= IlmImf:${PORTSDIR}/graphics/OpenEXR \ boost_thread:${PORTSDIR}/devel/boost-libs \ - hdf5:${PORTSDIR}/science/hdf5 \ + hdf5:${PORTSDIR}/science/hdf5-18 \ opencv_legacy:${PORTSDIR}/graphics/opencv \ openjpeg:${PORTSDIR}/graphics/openjpeg \ webp:${PORTSDIR}/graphics/webp @@ -23,7 +22,8 @@ GH_ACCOUNT= OpenImageIO GH_PROJECT= oiio GH_TAGNAME= Release-${PORTVERSION} -GH_COMMIT= db9df57 +GH_COMMIT= 5fcd523 +WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src # fbm also installs bin/idiff CONFLICTS= fbm-[0-9]* @@ -37,7 +37,6 @@ -DUSE_TBB:BOOL=OFF USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/OpenImageIO-oiio-${GH_COMMIT}/src MAKE_JOBS_SAFE= yes .if defined(OIIO_PYBIND) @@ -85,11 +84,6 @@ .include <bsd.port.pre.mk> -.if ${ARCH} == "i386" -# for gcc atomics we need to have an arch > i486 -CFLAGS+= -march=i586 -.endif - .if ${OSVERSION} < 800000 IGNORE= requires FreeBSD 8.0 or higher .endif diff -Nru openimageio.orig/distinfo openimageio/distinfo --- openimageio.orig/distinfo 2013-02-19 00:18:22.003611452 +1030 +++ openimageio/distinfo 2013-02-13 20:50:13.050703606 +1030 @@ -1,2 +1,2 @@ -SHA256 (openimageio-1.1.2.tar.gz) = 8c41094ce6a842bb85ba1523f3dd368afe742b1207a012f3459b7ee6c2bc4d46 -SIZE (openimageio-1.1.2.tar.gz) = 8217176 +SHA256 (openimageio-1.1.6.tar.gz) = a4d8bf7cedade3b3177bc5f46c3f0bb45de9ba32720d273d6334c03c3dfa2815 +SIZE (openimageio-1.1.6.tar.gz) = 8300662 diff -Nru openimageio.orig/files/patch-include__fmath.h openimageio/files/patch-include__fmath.h --- openimageio.orig/files/patch-include__fmath.h 1970-01-01 09:30:00.000000000 +0930 +++ openimageio/files/patch-include__fmath.h 2013-01-28 16:22:21.187856910 +1030 @@ -0,0 +1,11 @@ +--- include/fmath.h.orig 2013-01-21 11:39:43.845857535 +1030 ++++ include/fmath.h 2013-01-21 11:39:52.142857433 +1030 +@@ -972,7 +972,7 @@ + + + // Functions missing from FreeBSD +-#if (defined(__FreeBSD__) && (__FreeBSD_version < 803000)) ++#if (defined(__FreeBSD__) && (__FreeBSD_version < 802502)) + + inline float + log2f (float val) { diff -Nru openimageio.orig/files/patch-include__thread.h openimageio/files/patch-include__thread.h --- openimageio.orig/files/patch-include__thread.h 2013-02-19 00:18:21.968610128 +1030 +++ openimageio/files/patch-include__thread.h 1970-01-01 09:30:00.000000000 +0930 @@ -1,30 +0,0 @@ ---- ./include/thread.h.orig 2012-11-10 05:51:18.000000000 +1030 -+++ ./include/thread.h 2012-11-11 17:25:34.547296939 +1030 -@@ -70,9 +70,14 @@ - #pragma GCC diagnostic error "-Wunused-variable" - #endif - -+#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) -+#define USE_GCC_ATOMICS 1 -+#undef USE_TBB -+#else - #ifndef USE_TBB - # define USE_TBB 0 - #endif -+#endif - - // Include files we need for atomic counters. - // Some day, we hope this is all replaced by use of std::atomic<>. -@@ -97,12 +102,6 @@ - # include <libkern/OSAtomic.h> - #endif - --#if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) --#if !defined(__FreeBSD__) || defined(__x86_64__) --#define USE_GCC_ATOMICS --#endif --#endif -- - OIIO_NAMESPACE_ENTER - { - diff -Nru openimageio.orig/pkg-plist openimageio/pkg-plist --- openimageio.orig/pkg-plist 2013-02-19 00:18:22.013610819 +1030 +++ openimageio/pkg-plist 2013-02-13 20:50:55.103707659 +1030 @@ -38,7 +38,7 @@ lib/libOpenImageIO.so lib/libOpenImageIO.so.1 lib/libOpenImageIO.so.1.1 -lib/libOpenImageIO.so.1.1.2 +lib/libOpenImageIO.so.1.1.6 %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302181424.r1IEOInw040134>