From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 15 13:40:12 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78F42106567D for ; Sat, 15 Sep 2012 13:40:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 409618FC0A for ; Sat, 15 Sep 2012 13:40:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8FDeBTM021355 for ; Sat, 15 Sep 2012 13:40:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8FDeB59021343; Sat, 15 Sep 2012 13:40:11 GMT (envelope-from gnats) Resent-Date: Sat, 15 Sep 2012 13:40:11 GMT Resent-Message-Id: <201209151340.q8FDeB59021343@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Shane Ambler Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D4D5106564A for ; Sat, 15 Sep 2012 13:35:27 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 3FA898FC12 for ; Sat, 15 Sep 2012 13:35:27 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q8FDZQbr001582 for ; Sat, 15 Sep 2012 13:35:26 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q8FDZQ3t001581; Sat, 15 Sep 2012 13:35:26 GMT (envelope-from nobody) Message-Id: <201209151335.q8FDZQ3t001581@red.freebsd.org> Date: Sat, 15 Sep 2012 13:35:26 GMT From: Shane Ambler To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/171665: [maintainer update] update graphics/openimageio X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Sep 2012 13:40:12 -0000 >Number: 171665 >Category: ports >Synopsis: [maintainer update] update 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: Sat Sep 15 13:40:10 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Shane Ambler >Release: 9.0-RELEASE-p1 >Organization: >Environment: FreeBSD leader.local 9.0-RELEASE-p1 FreeBSD 9.0-RELEASE-p1 #1: Tue May 15 12:34:33 CST 2012 shane@leader.local:/usr/obj/usr/src/sys/GENERIC amd64 >Description: update graphics/openimageio to v1.0.9 includes addition of conflict with graphics/fbm >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Nu openimageio.orig/Makefile openimageio/Makefile --- openimageio.orig/Makefile 2012-09-15 22:55:20.295949610 +0930 +++ openimageio/Makefile 2012-09-15 22:54:18.945948633 +0930 @@ -6,7 +6,7 @@ # PORTNAME= openimageio -PORTVERSION= 1.0.6 +PORTVERSION= 1.0.9 CATEGORIES= graphics multimedia MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/ DISTNAME= Release-${PORTVERSION} @@ -26,6 +26,9 @@ tbb:${PORTSDIR}/devel/tbb \ webp:${PORTSDIR}/graphics/webp +# fbm also installs bin/idiff +CONFLICTS= fbm-[0-9]* + FETCH_ARGS= -pRr USE_CMAKE= yes CMAKE_VERBOSE= yes @@ -36,17 +39,19 @@ -DUSE_TBB:BOOL=ON LDFLAGS+= -ltbb USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/OpenImageIO-oiio-f0a566a/src +WRKSRC= ${WRKDIR}/OpenImageIO-oiio-0d48631/src MAKE_JOBS_SAFE= yes -OPTIONS_DEFINE= IMAGEVIEWER THREADS +OPTIONS_DEFINE= DOCS IMAGEVIEWER THREADS OPTIONS_DEFAULT= DOCS IMAGEVIEWER THREADS IMAGEVIEWER_DESC= Build image viewer .include -.if empty(PORT_OPTIONS:MDOCS) +.if ${PORT_OPTIONS:MDOCS} +CMAKE_ARGS+= -DINSTALL_DOCS:BOOL=ON +.else CMAKE_ARGS+= -DINSTALL_DOCS:BOOL=OFF .endif @@ -61,7 +66,7 @@ PLIST_SUB+= IMAGEVIEWER="@comment " .endif -.if empty(PORT_OPTIONS:MTHREADS) +.if ${PORT_OPTIONS:MTHREADS} CMAKE_ARGS+= -DNOTHREADS:BOOL=ON .else CMAKE_ARGS+= -DNOTHREADS:BOOL=OFF diff -Nu openimageio.orig/distinfo openimageio/distinfo --- openimageio.orig/distinfo 2012-09-15 22:55:20.295949610 +0930 +++ openimageio/distinfo 2012-09-14 02:12:43.369947989 +0930 @@ -1,2 +1,2 @@ -SHA256 (openimageio/Release-1.0.6) = b6ca648f13973b517135edbc9bc34367cdc54a8ca87f6b8014f363803825aa1e -SIZE (openimageio/Release-1.0.6) = 4196479 +SHA256 (openimageio/Release-1.0.9) = 59ebc09f3d3e5ac780adc4a3e0020d6986721f6be1c84dd01da7899a565b5204 +SIZE (openimageio/Release-1.0.9) = 4208590 diff -Nu openimageio.orig/pkg-plist openimageio/pkg-plist --- openimageio.orig/pkg-plist 2012-09-15 22:55:20.295949610 +0930 +++ openimageio/pkg-plist 2012-09-14 02:11:10.875947983 +0930 @@ -60,7 +60,7 @@ lib/libOpenImageIO.so lib/libOpenImageIO.so.1 lib/libOpenImageIO.so.1.0 -lib/libOpenImageIO.so.1.0.6 +lib/libOpenImageIO.so.1.0.9 %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/openimageio.pdf >Release-Note: >Audit-Trail: >Unformatted: