View | Details | Raw Unified | Return to bug 172339 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-15 / +38 lines)
Lines 6-47 Link Here
6
#
6
#
7
7
8
PORTNAME=	OpenEXR
8
PORTNAME=	OpenEXR
9
PORTVERSION=	1.7.0
9
PORTVERSION=	1.7.1
10
DISTNAME=	${PORTNAME:L}-${PORTVERSION}
11
CATEGORIES=	graphics devel
10
CATEGORIES=	graphics devel
12
MASTER_SITES=	${MASTER_SITE_SAVANNAH}
11
MASTER_SITES=	http://cloud.github.com/downloads/openexr/openexr/
13
MASTER_SITE_SUBDIR=	${PORTNAME:L}
12
DISTNAME=	${PORTNAME:L}-${DISTVERSION}
14
13
15
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	nemysis@gmx.ch
16
COMMENT=	A high dynamic-range (HDR) image file format
15
COMMENT=	High dynamic-range (HDR) image file format
17
16
18
LIB_DEPENDS=	Half.6:${PORTSDIR}/graphics/ilmbase
17
LICENSE=	BSD
18
19
LIB_DEPENDS=	Imath:${PORTSDIR}/graphics/ilmbase
20
21
WRKSRC=		${WRKDIR}/${DISTNAME}
19
22
20
USE_GMAKE=	yes
23
USE_GMAKE=	yes
21
USE_GNOME=	pkgconfig
24
USE_PKGCONFIG=	build
22
USE_LDCONFIG=	yes
25
USE_LDCONFIG=	yes
23
USE_AUTOTOOLS=	libtool
26
USE_AUTOTOOLS=	libtool
24
GNU_CONFIGURE=	YES
27
GNU_CONFIGURE=	YES
25
28
26
CONFIGURE_ARGS+=--enable-imfexamples
29
CONFIGURE_ARGS+=--enable-imfexamples
27
30
28
OPTIONS_DEFINE=	LARGE_STACK
31
# must be explicitely linked with -l{thr|pthread}
32
LDFLAGS+=	${PTHREAD_LIBS}
33
34
DOCSRCDIR1=	${WRKSRC}
35
DOC_FILES1=	AUTHORS ChangeLog NEWS README
36
37
DOCSRCDIR2=	${WRKSRC}/doc
38
DOC_FILES2=	MultiViewOpenEXR.pdf OpenEXRFileLayout.pdf \
39
		ReadingAndWritingImageFiles.pdf TechnicalIntroduction.pdf
40
41
OPTIONS_DEFINE=		LARGE_STACK
29
LARGE_STACK_DESC=	Enable sys-dependant large stack optimizations
42
LARGE_STACK_DESC=	Enable sys-dependant large stack optimizations
30
43
31
.include <bsd.port.pre.mk>
44
.include <bsd.port.options.mk>
32
45
33
.if ${PORT_OPTIONS:MLARGE_STACK}
46
.if ${PORT_OPTIONS:MLARGE_STACK}
34
CONFIGURE_ARGS+=--enable-large-stack
47
CONFIGURE_ARGS+=--enable-large-stack
35
.endif
48
.endif
36
49
37
# must be explicitely linked with -l{thr|pthread}
50
post-patch:
38
LDFLAGS+=	${PTHREAD_LIBS}
51
	@${REINPLACE_CMD} -e 's|examplesdir = $$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples|examplesdir = $$(prefix)/share/examples/OpenEXR|' \
39
52
		${WRKSRC}/IlmImfExamples/Makefile.in
40
WRKSRC=		${WRKDIR}/${DISTNAME}
53
	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $$(prefix)/libdata/pkgconfig|' \
54
		${WRKSRC}/Makefile.in
55
	@${REINPLACE_CMD} -e 's|docdir=$$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@|docdir = $$(datadir)/doc/OpenEXR|' \
56
	-e 's|doc_DATA = $$(EXTRA_DIST)|doc_DATA =|' ${WRKSRC}/doc/Makefile.am ${WRKSRC}/doc/Makefile.in
41
57
42
regression-test regression test check:	build
58
regression-test regression test check:	build
43
	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
59
	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
44
60
61
post-install:
62
.if ${PORT_OPTIONS:MDOCS}
63
	${MKDIR} ${DOCSDIR}
64
	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
65
	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR}
66
.endif
67
45
# IlmImfTest hangs indefinitely
68
# IlmImfTest hangs indefinitely
46
#
69
#
47
#.if defined(PACKAGE_BUILDING)
70
#.if defined(PACKAGE_BUILDING)
Lines 52-55 Link Here
52
#.endif
75
#.endif
53
#.endif
76
#.endif
54
77
55
.include <bsd.port.post.mk>
78
.include <bsd.port.mk>
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (openexr-1.7.0.tar.gz) = b68a2164d01bd028d15bd96af2704634a344e291dc7cc2019a662045d8c52ca4
1
SHA256 (openexr-1.7.1.tar.gz) = 692ee6566d49939b2613e63b3afea2d38b871c0202cc829a7e32ced780af55c5
2
SIZE (openexr-1.7.0.tar.gz) = 13542910
2
SIZE (openexr-1.7.1.tar.gz) = 13554138
(-)./files/patch-IlmImfExamples-Makeilfe.in (-11 lines)
Lines 1-11 Link Here
1
--- IlmImfExamples/Makefile.in.orig	2007-08-04 05:07:13.000000000 +0900
2
+++ IlmImfExamples/Makefile.in	2007-10-08 02:22:15.000000000 +0900
3
@@ -225,7 +225,7 @@
4
 		      rgbaInterfaceTiledExamples.h \
5
 		      lowLevelIoExamples.h previewImageExamples.h
6
 
7
-examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples
8
+examplesdir = $(prefix)/share/examples/OpenEXR
9
 examples_DATA = $(imfexamples_SOURCES)
10
 imfexamplesdir = $(examplesdir)
11
 all: all-am
(-)./files/patch-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.in.orig	2007-08-04 05:07:15.000000000 +0900
2
+++ Makefile.in	2007-10-08 02:14:58.000000000 +0900
3
@@ -214,7 +214,7 @@
4
 	openexr.m4 \
5
 	config.windows/OpenEXRConfig.h
6
 
7
-pkgconfigdir = $(libdir)/pkgconfig
8
+pkgconfigdir = $(prefix)/libdata/pkgconfig
9
 pkgconfig_DATA = OpenEXR.pc
10
 m4datadir = $(datadir)/aclocal
11
 m4data_DATA = openexr.m4
(-)./files/patch-doc-Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- doc/Makefile.in.orig	2007-08-04 05:07:14.000000000 +0900
2
+++ doc/Makefile.in	2007-10-08 02:19:31.000000000 +0900
3
@@ -177,7 +177,7 @@
4
 	TechnicalIntroduction.pdf \
5
 	OpenEXRFileLayout.pdf
6
 
7
-docdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@
8
+docdir = $(datadir)/doc/OpenEXR
9
 doc_DATA = $(EXTRA_DIST)
10
 all: all-am
11
 
(-)./files/patch-exrenvmap-main.cpp (-6 / +6 lines)
Lines 1-10 Link Here
1
--- exrenvmap/main.cpp~
1
--- exrenvmap/main.cpp.orig	2012-07-18 01:27:28.000000000 +0200
2
+++ exrenvmap/main.cpp
2
+++ exrenvmap/main.cpp	2012-10-04 10:44:12.000000000 +0200
3
@@ -43,6 +43,7 @@
3
@@ -46,6 +46,7 @@
4
 #include <makeLatLongMap.h>
5
 #include <ImfEnvmap.h>
4
 #include <ImfEnvmap.h>
5
 #include <ImfHeader.h>
6
 #include <iostream>
6
 #include <iostream>
7
+#include <cstring>
7
+#include <cstring>
8
 #include <exception>
8
 #include <exception>
9
 #include <stdlib.h>
9
 #include <string>
10
 
10
 #include <string.h>
(-)./files/patch-exrmaketiled-main.cpp (-3 / +3 lines)
Lines 1-10 Link Here
1
--- exrmaketiled/main.cpp~
1
--- exrmaketiled/main.cpp.orig	2012-07-18 01:27:28.000000000 +0200
2
+++ exrmaketiled/main.cpp
2
+++ exrmaketiled/main.cpp	2012-10-04 10:45:18.000000000 +0200
3
@@ -44,6 +44,7 @@
3
@@ -44,6 +44,7 @@
4
 
4
 
5
 #include <iostream>
5
 #include <iostream>
6
 #include <exception>
6
 #include <exception>
7
+#include <cstring>
7
+#include <cstring>
8
 #include <string>
8
 #include <string>
9
 #include <string.h>
9
 #include <stdlib.h>
10
 #include <stdlib.h>
10
 
(-)./pkg-descr (-14 / +20 lines)
Lines 1-18 Link Here
1
Industrial Light & Magic(ILM), a division of Lucas Digital
1
OpenEXR is a high dynamic-range (HDR) image file format developed by
2
Ltd. LLC, implemented its own extended dynamic range file
2
Industrial Light & Magic for use in computer imaging applications.
3
format in Summer 2000.  The existing 8-bit file format used
4
at the time could not accurately reproduce images with
5
extreme contrast between the darkest and brightest regions,
6
or images with very subtle color gradations.
7
3
8
ILM's extended dynamic range file format has been employed
4
OpenEXR is used by ILM on all motion pictures currently in production.
9
successfully in the movies Harry Potter, Men in Black II,
5
The first movies to employ OpenEXR were Harry Potter and the Sorcerers Stone,
10
and Signs. Several shows currently in production at ILM are
6
Men in Black II, Gangs of New York, and Signs. Since then, OpenEXR has become
11
using the new format.
7
ILM's main image file format.
12
8
13
Realizing that various other parties are interested in an
9
OpenEXR's features include:
14
extended dynamic range file format, ILM decided to polish
10
* Higher dynamic range and color precision than existing 8- and 10-bit
15
its new file format a bit, and to publish it.  OpenEXR is
11
  image file formats.
16
the result.
12
* Support for 16-bit floating-point, 32-bit floating-point, and 32-bit
13
  integer pixels. The 16-bit floating-point format, called "half", is compatible
14
  with the half data type in NVIDIA's Cg graphics language and is supported
15
  natively on their new GeForce FX and Quadro FX 3D graphics solutions.
16
* Multiple lossless image compression algorithms. Some of the included codecs
17
  can achieve 2:1 lossless compression ratios on images with film grain.
18
* Extensibility. New compression codecs and image types can easily be added
19
  by extending the C++ classes included in the OpenEXR software distribution.
20
  New image attributes (strings, vectors, integers, etc.) can be added to
21
  OpenEXR image headers without affecting backward compatibility with existing
22
  OpenEXR applications.
17
23
18
WWW: http://www.openexr.org/
24
WWW: http://www.openexr.org/
(-)./pkg-plist (-25 / +31 lines)
Lines 5-14 Link Here
5
bin/exrmaketiled
5
bin/exrmaketiled
6
bin/exrmultiview
6
bin/exrmultiview
7
bin/exrstdattr
7
bin/exrstdattr
8
lib/libIlmImf.a
9
lib/libIlmImf.la
10
lib/libIlmImf.so
11
lib/libIlmImf.so.6
12
include/OpenEXR/ImfAcesFile.h
8
include/OpenEXR/ImfAcesFile.h
13
include/OpenEXR/ImfArray.h
9
include/OpenEXR/ImfArray.h
14
include/OpenEXR/ImfAttribute.h
10
include/OpenEXR/ImfAttribute.h
Lines 69-94 Link Here
69
include/OpenEXR/ImfWav.h
65
include/OpenEXR/ImfWav.h
70
include/OpenEXR/ImfXdr.h
66
include/OpenEXR/ImfXdr.h
71
include/OpenEXR/OpenEXRConfig.h
67
include/OpenEXR/OpenEXRConfig.h
68
lib/libIlmImf.a
69
lib/libIlmImf.la
70
lib/libIlmImf.so
71
lib/libIlmImf.so.7
72
libdata/pkgconfig/OpenEXR.pc
72
libdata/pkgconfig/OpenEXR.pc
73
share/aclocal/openexr.m4
73
share/aclocal/openexr.m4
74
%%DOCSDIR%%/MultiViewOpenEXR.pdf
74
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
75
%%DOCSDIR%%/OpenEXRFileLayout.pdf
75
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
76
%%DOCSDIR%%/ReadingAndWritingImageFiles.pdf
76
%%PORTDOCS%%%%DOCSDIR%%/MultiViewOpenEXR.pdf
77
%%DOCSDIR%%/TechnicalIntroduction.pdf
77
%%PORTDOCS%%%%DOCSDIR%%/NEWS
78
%%EXAMPLESDIR%%/drawImage.cpp
78
%%PORTDOCS%%%%DOCSDIR%%/OpenEXRFileLayout.pdf
79
%%EXAMPLESDIR%%/drawImage.h
79
%%PORTDOCS%%%%DOCSDIR%%/README
80
%%EXAMPLESDIR%%/generalInterfaceExamples.cpp
80
%%PORTDOCS%%%%DOCSDIR%%/ReadingAndWritingImageFiles.pdf
81
%%EXAMPLESDIR%%/generalInterfaceExamples.h
81
%%PORTDOCS%%%%DOCSDIR%%/TechnicalIntroduction.pdf
82
%%EXAMPLESDIR%%/generalInterfaceTiledExamples.cpp
82
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawImage.cpp
83
%%EXAMPLESDIR%%/generalInterfaceTiledExamples.h
83
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/drawImage.h
84
%%EXAMPLESDIR%%/lowLevelIoExamples.cpp
84
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceExamples.cpp
85
%%EXAMPLESDIR%%/lowLevelIoExamples.h
85
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceExamples.h
86
%%EXAMPLESDIR%%/main.cpp
86
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceTiledExamples.cpp
87
%%EXAMPLESDIR%%/previewImageExamples.cpp
87
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/generalInterfaceTiledExamples.h
88
%%EXAMPLESDIR%%/previewImageExamples.h
88
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lowLevelIoExamples.cpp
89
%%EXAMPLESDIR%%/rgbaInterfaceExamples.cpp
89
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/lowLevelIoExamples.h
90
%%EXAMPLESDIR%%/rgbaInterfaceExamples.h
90
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.cpp
91
%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp
91
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/previewImageExamples.cpp
92
%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h
92
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/previewImageExamples.h
93
@dirrm %%EXAMPLESDIR%%
93
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceExamples.cpp
94
@dirrm %%DOCSDIR%%
94
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceExamples.h
95
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.cpp
96
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rgbaInterfaceTiledExamples.h
97
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
98
%%PORTDOCS%%@dirrm %%DOCSDIR%%-1.7.1
99
%%PORTDOCS%%@dirrm %%DOCSDIR%%
100
@dirrmtry include/OpenEXR

Return to bug 172339