ports/172339: [PATCH] graphics/OpenEXR: update to 1.7.1, take maintainership, Makefile changed, OptionsNG

nemysis nemysis at gmx.ch
Thu Oct 4 22:40:11 UTC 2012


>Number:         172339
>Category:       ports
>Synopsis:       [PATCH] graphics/OpenEXR: update to 1.7.1, take maintainership, Makefile changed, OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 04 22:40:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

- Update to 1.7.1
- Take maintainership

Added file(s):
- files/patch-IlmImfExamples-Makefile.in

Removed file(s):
- files/patch-IlmImfExamples-Makeilfe.in


- Changed MASTER_SITES

+MASTER_SITES=	https://github.com/downloads/openexr/openexr/

- Changed COMMENT

+COMMENT=	High dynamic-range (HDR) image file format


- Added LICENSE

+LICENSE=	BSD


- Changed LIB_DEPENDS

+LIB_DEPENDS=	Imath:${PORTSDIR}/graphics/ilmbase


- Added OptionsNG

+.include <bsd.port.options.mk>


- Added post-install for PORTDOCS

+post-install:

- Rework

pkg-descr and pkg-plist

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
WARN: /usr/local/ports/local/work/graphics/OpenEXR/pkg-plist:
Both ``%%PORTDOCS%%@dirrm %%DOCSDIR%%'' and ``%%PORTDOCS%%@unexec %D/%%DOCSDIR%% 2>/dev/null || true'' are missing.  At least one should be used.
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: only one MASTER_SITE configured.  Consider adding additional mirrors.
0 fatal errors and 3 warnings found.

WARN: /usr/local/ports/local/work/graphics/OpenEXR/pkg-plist: because is used PORTDOCS and Port self install documentation

%%PORTDOCS%%@dirrmtry %%DOCSDIR%%


port test: clean


Build log RedPorts

https://redports.org/buildarchive/20121004171826-39854/

>Fix:

--- OpenEXR-1.7.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/Makefile ./Makefile
--- /usr/ports/graphics/OpenEXR/Makefile	2012-09-20 16:38:19.000000000 +0200
+++ ./Makefile	2012-10-04 18:18:24.000000000 +0200
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	OpenEXR
-PORTVERSION=	1.7.0
-DISTNAME=	${PORTNAME:L}-${PORTVERSION}
+PORTVERSION=	1.7.1
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME:L}
+MASTER_SITES=	https://github.com/downloads/openexr/openexr/
+DISTNAME=	${PORTNAME:L}-${DISTVERSION}
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A high dynamic-range (HDR) image file format
+MAINTAINER=	nemysis at gmx.ch
+COMMENT=	High dynamic-range (HDR) image file format
 
-LIB_DEPENDS=	Half.6:${PORTSDIR}/graphics/ilmbase
+LICENSE=	BSD
 
+LIB_DEPENDS=	Imath:${PORTSDIR}/graphics/ilmbase
+
+FETCH_ARGS?=	-Fpr
 USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
@@ -25,10 +27,12 @@
 
 CONFIGURE_ARGS+=--enable-imfexamples
 
-OPTIONS_DEFINE=	LARGE_STACK
+PORTDOCS=	AUTHORS ChangeLog NEWS README
+
+OPTIONS_DEFINE=		LARGE_STACK
 LARGE_STACK_DESC=	Enable sys-dependant large stack optimizations
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLARGE_STACK}
 CONFIGURE_ARGS+=--enable-large-stack
@@ -42,6 +46,12 @@
 regression-test regression test check:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
+
 # IlmImfTest hangs indefinitely
 #
 #.if defined(PACKAGE_BUILDING)
@@ -52,4 +62,4 @@
 #.endif
 #.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/distinfo ./distinfo
--- /usr/ports/graphics/OpenEXR/distinfo	2012-09-20 16:38:19.000000000 +0200
+++ ./distinfo	2012-10-04 12:53:18.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (openexr-1.7.0.tar.gz) = b68a2164d01bd028d15bd96af2704634a344e291dc7cc2019a662045d8c52ca4
-SIZE (openexr-1.7.0.tar.gz) = 13542910
+SHA256 (openexr-1.7.1.tar.gz) = 692ee6566d49939b2613e63b3afea2d38b871c0202cc829a7e32ced780af55c5
+SIZE (openexr-1.7.1.tar.gz) = 13554138
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/files/patch-IlmImfExamples-Makefile.in ./files/patch-IlmImfExamples-Makefile.in
--- /usr/ports/graphics/OpenEXR/files/patch-IlmImfExamples-Makefile.in	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-IlmImfExamples-Makefile.in	2012-10-04 11:21:04.000000000 +0200
@@ -0,0 +1,11 @@
+--- IlmImfExamples/Makefile.in.orig	2012-07-31 22:13:13.000000000 +0200
++++ IlmImfExamples/Makefile.in	2012-10-04 10:29:46.000000000 +0200
+@@ -244,7 +244,7 @@
+ 		      rgbaInterfaceTiledExamples.h \
+ 		      lowLevelIoExamples.h previewImageExamples.h
+ 
+-examplesdir = $(datadir)/doc/OpenEXR- at OPENEXR_VERSION@/examples
++examplesdir = $(prefix)/share/examples/OpenEXR
+ examples_DATA = $(imfexamples_SOURCES)
+ imfexamplesdir = $(examplesdir)
+ all: all-am
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/files/patch-IlmImfExamples-Makeilfe.in ./files/patch-IlmImfExamples-Makeilfe.in
--- /usr/ports/graphics/OpenEXR/files/patch-IlmImfExamples-Makeilfe.in	2007-10-07 19:45:39.000000000 +0200
+++ ./files/patch-IlmImfExamples-Makeilfe.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- IlmImfExamples/Makefile.in.orig	2007-08-04 05:07:13.000000000 +0900
-+++ IlmImfExamples/Makefile.in	2007-10-08 02:22:15.000000000 +0900
-@@ -225,7 +225,7 @@
- 		      rgbaInterfaceTiledExamples.h \
- 		      lowLevelIoExamples.h previewImageExamples.h
- 
--examplesdir = $(datadir)/doc/OpenEXR- at OPENEXR_VERSION@/examples
-+examplesdir = $(prefix)/share/examples/OpenEXR
- examples_DATA = $(imfexamples_SOURCES)
- imfexamplesdir = $(examplesdir)
- all: all-am
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/graphics/OpenEXR/files/patch-Makefile.in	2007-10-07 19:45:39.000000000 +0200
+++ ./files/patch-Makefile.in	2012-10-04 11:32:34.000000000 +0200
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2007-08-04 05:07:15.000000000 +0900
-+++ Makefile.in	2007-10-08 02:14:58.000000000 +0900
-@@ -214,7 +214,7 @@
+--- Makefile.in.orig	2012-07-31 22:13:14.000000000 +0200
++++ Makefile.in	2012-10-04 10:32:09.000000000 +0200
+@@ -235,7 +235,7 @@
  	openexr.m4 \
  	config.windows/OpenEXRConfig.h
  
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/files/patch-doc-Makefile.in ./files/patch-doc-Makefile.in
--- /usr/ports/graphics/OpenEXR/files/patch-doc-Makefile.in	2007-10-07 19:45:39.000000000 +0200
+++ ./files/patch-doc-Makefile.in	2012-10-04 11:32:20.000000000 +0200
@@ -1,8 +1,8 @@
---- doc/Makefile.in.orig	2007-08-04 05:07:14.000000000 +0900
-+++ doc/Makefile.in	2007-10-08 02:19:31.000000000 +0900
-@@ -177,7 +177,7 @@
- 	TechnicalIntroduction.pdf \
- 	OpenEXRFileLayout.pdf
+--- doc/Makefile.in.orig	2012-07-31 22:13:14.000000000 +0200
++++ doc/Makefile.in	2012-10-04 10:33:37.000000000 +0200
+@@ -199,7 +199,7 @@
+ 	OpenEXRFileLayout.pdf \
+ 	MultiViewOpenEXR.pdf
  
 -docdir = $(datadir)/doc/OpenEXR- at OPENEXR_VERSION@
 +docdir = $(datadir)/doc/OpenEXR
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/files/patch-exrenvmap-main.cpp ./files/patch-exrenvmap-main.cpp
--- /usr/ports/graphics/OpenEXR/files/patch-exrenvmap-main.cpp	2010-12-11 00:03:35.000000000 +0100
+++ ./files/patch-exrenvmap-main.cpp	2012-10-04 11:33:46.000000000 +0200
@@ -1,10 +1,10 @@
---- exrenvmap/main.cpp~
-+++ exrenvmap/main.cpp
-@@ -43,6 +43,7 @@
- #include <makeLatLongMap.h>
+--- exrenvmap/main.cpp.orig	2012-07-18 01:27:28.000000000 +0200
++++ exrenvmap/main.cpp	2012-10-04 10:44:12.000000000 +0200
+@@ -46,6 +46,7 @@
  #include <ImfEnvmap.h>
+ #include <ImfHeader.h>
  #include <iostream>
 +#include <cstring>
  #include <exception>
- #include <stdlib.h>
- 
+ #include <string>
+ #include <string.h>
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp ./files/patch-exrmaketiled-main.cpp
--- /usr/ports/graphics/OpenEXR/files/patch-exrmaketiled-main.cpp	2010-12-11 00:03:35.000000000 +0100
+++ ./files/patch-exrmaketiled-main.cpp	2012-10-04 11:35:26.000000000 +0200
@@ -1,10 +1,10 @@
---- exrmaketiled/main.cpp~
-+++ exrmaketiled/main.cpp
+--- exrmaketiled/main.cpp.orig	2012-07-18 01:27:28.000000000 +0200
++++ exrmaketiled/main.cpp	2012-10-04 10:45:18.000000000 +0200
 @@ -44,6 +44,7 @@
  
  #include <iostream>
  #include <exception>
 +#include <cstring>
  #include <string>
+ #include <string.h>
  #include <stdlib.h>
- 
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/pkg-descr ./pkg-descr
--- /usr/ports/graphics/OpenEXR/pkg-descr	2003-01-26 13:39:22.000000000 +0100
+++ ./pkg-descr	2012-10-04 13:21:19.000000000 +0200
@@ -1,18 +1,24 @@
-Industrial Light & Magic(ILM), a division of Lucas Digital
-Ltd. LLC, implemented its own extended dynamic range file
-format in Summer 2000.  The existing 8-bit file format used
-at the time could not accurately reproduce images with
-extreme contrast between the darkest and brightest regions,
-or images with very subtle color gradations.
+OpenEXR is a high dynamic-range (HDR) image file format developed by
+Industrial Light & Magic for use in computer imaging applications.
 
-ILM's extended dynamic range file format has been employed
-successfully in the movies Harry Potter, Men in Black II,
-and Signs. Several shows currently in production at ILM are
-using the new format.
+OpenEXR is used by ILM on all motion pictures currently in production.
+The first movies to employ OpenEXR were Harry Potter and the Sorcerers Stone,
+Men in Black II, Gangs of New York, and Signs. Since then, OpenEXR has become
+ILM's main image file format.
 
-Realizing that various other parties are interested in an
-extended dynamic range file format, ILM decided to polish
-its new file format a bit, and to publish it.  OpenEXR is
-the result.
+OpenEXR's features include:
+* Higher dynamic range and color precision than existing 8- and 10-bit
+  image file formats.
+* Support for 16-bit floating-point, 32-bit floating-point, and 32-bit
+  integer pixels. The 16-bit floating-point format, called "half", is compatible
+  with the half data type in NVIDIA's Cg graphics language and is supported
+  natively on their new GeForce FX and Quadro FX 3D graphics solutions.
+* Multiple lossless image compression algorithms. Some of the included codecs
+  can achieve 2:1 lossless compression ratios on images with film grain.
+* Extensibility. New compression codecs and image types can easily be added
+  by extending the C++ classes included in the OpenEXR software distribution.
+  New image attributes (strings, vectors, integers, etc.) can be added to
+  OpenEXR image headers without affecting backward compatibility with existing
+  OpenEXR applications.
 
 WWW: http://www.openexr.org/
diff -ruN --exclude=CVS /usr/ports/graphics/OpenEXR/pkg-plist ./pkg-plist
--- /usr/ports/graphics/OpenEXR/pkg-plist	2012-09-20 16:38:19.000000000 +0200
+++ ./pkg-plist	2012-10-04 13:07:35.000000000 +0200
@@ -5,10 +5,6 @@
 bin/exrmaketiled
 bin/exrmultiview
 bin/exrstdattr
-lib/libIlmImf.a
-lib/libIlmImf.la
-lib/libIlmImf.so
-lib/libIlmImf.so.6
 include/OpenEXR/ImfAcesFile.h
 include/OpenEXR/ImfArray.h
 include/OpenEXR/ImfAttribute.h
@@ -69,26 +65,32 @@
 include/OpenEXR/ImfWav.h
 include/OpenEXR/ImfXdr.h
 include/OpenEXR/OpenEXRConfig.h
+lib/libIlmImf.a
+lib/libIlmImf.la
+lib/libIlmImf.so
+lib/libIlmImf.so.7
 libdata/pkgconfig/OpenEXR.pc
 share/aclocal/openexr.m4
-%%DOCSDIR%%/MultiViewOpenEXR.pdf
-%%DOCSDIR%%/OpenEXRFileLayout.pdf
-%%DOCSDIR%%/ReadingAndWritingImageFiles.pdf
-%%DOCSDIR%%/TechnicalIntroduction.pdf
-%%EXAMPLESDIR%%/drawImage.cpp
-%%EXAMPLESDIR%%/drawImage.h
-%%EXAMPLESDIR%%/generalInterfaceExamples.cpp
-%%EXAMPLESDIR%%/generalInterfaceExamples.h
-%%EXAMPLESDIR%%/generalInterfaceTiledExamples.cpp
-%%EXAMPLESDIR%%/generalInterfaceTiledExamples.h
-%%EXAMPLESDIR%%/lowLevelIoExamples.cpp
-%%EXAMPLESDIR%%/lowLevelIoExamples.h
-%%EXAMPLESDIR%%/main.cpp
-%%EXAMPLESDIR%%/previewImageExamples.cpp
-%%EXAMPLESDIR%%/previewImageExamples.h
-%%EXAMPLESDIR%%/rgbaInterfaceExamples.cpp
-%%EXAMPLESDIR%%/rgbaInterfaceExamples.h
-%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp
-%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h
- at dirrm %%EXAMPLESDIR%%
- at dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/MultiViewOpenEXR.pdf
+%%PORTDOCS%%%%DOCSDIR%%/OpenEXRFileLayout.pdf
+%%PORTDOCS%%%%DOCSDIR%%/ReadingAndWritingImageFiles.pdf
+%%PORTDOCS%%%%DOCSDIR%%/TechnicalIntroduction.pdf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawImage.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawImage.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceExamples.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceExamples.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceTiledExamples.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceTiledExamples.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lowLevelIoExamples.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lowLevelIoExamples.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/previewImageExamples.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/previewImageExamples.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceExamples.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceExamples.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h
+ at dirrm %%PORTEXAMPLES%%%%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrmtry share/applications
+ at dirrmtry include/OpenEXR
--- OpenEXR-1.7.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list