Attachment #128466 for bug #172337




#

PORTNAME=	ilmbase
PORTVERSION=	1.0.3
CATEGORIES=	graphics devel
MASTER_SITES=	https://github.com/downloads/openexr/openexr/
MASTER_SITE_SUBDIR=	openexr

MAINTAINER=	nemysis@gmx.ch
COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex

LICENSE=	BSD

CONFLICTS=	OpenEXR-1.[0-4].*
OPTIONS_DEFAULT=	THREAD
THREAD_DESC=		Enable multithreaded file I/O support

FETCH_ARGS?=	-Fpr
USE_GNOME=	pkgconfig
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_AUTOTOOLS=	libtool

PORTDOCS=	AUTHORS ChangeLog README

OPTIONS_DEFINE=		THREAD
OPTIONS_DEFAULT=	THREAD
THREAD_DESC=		Enable multithreaded file I/O support

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MTHREAD}
CONFIGURE_ARGS+=--enable-threading
CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}"
.else
CONFIGURE_ARGS+=--disable-threading
.endif

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

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (ilmbase-1.0.2.tar.gz) = 2e5cda799ffdfca9b1a16bb120d49c74a39af1457ef22f968918c6200ba62e44	1	SHA256 (ilmbase-1.0.3.tar.gz) = a998e064d6960ba258731fa5c8e7a3870b0eaa7ba9c1a5e5078263e9d9f76502
2	SIZE (ilmbase-1.0.2.tar.gz) = 496540	2	SIZE (ilmbase-1.0.3.tar.gz) = 534980




--- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
+++ IexMath/IexMathFpu.cpp	2012-10-04 15:30:47.000000000 +0200
@@ -27,8 +27,7 @@
 #endif
 
 
-#ifdef HAVE_UCONTEXT_H
-
+#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
 
 #include <ucontext.h>
 #include <signal.h>

Lines 1-5 Link Here

(-)./files/patch-Imath-ImathFun.cpp (-2 / +2 lines)
1	--- Imath/ImathFun.cpp.orig 2006-12-09 06:59:37.000000000 +0900	1	--- Imath/ImathFun.cpp.orig 2012-07-18 01:27:25.000000000 +0200
2	+++ Imath/ImathFun.cpp 2007-10-07 23:23:38.000000000 +0900	2	+++ Imath/ImathFun.cpp 2012-10-04 15:43:22.000000000 +0200
3	@@ -33,6 +33,7 @@	3	@@ -33,6 +33,7 @@
4	///////////////////////////////////////////////////////////////////////////	4	///////////////////////////////////////////////////////////////////////////
5		5

Lines 1-11 Link Here

(-)./files/patch-ImathTest-testBoxAlgo.cpp (-4 / +4 lines)
1	--- ImathTest/testBoxAlgo.cpp.orig 2007-07-13 13:48:45.000000000 +0900	1	--- ImathTest/testBoxAlgo.cpp.orig 2012-07-18 01:27:26.000000000 +0200
2	+++ ImathTest/testBoxAlgo.cpp 2007-10-07 23:26:22.000000000 +0900	2	+++ ImathTest/testBoxAlgo.cpp 2012-10-04 15:45:00.000000000 +0200
3	@@ -336,7 +336,7 @@	3	@@ -356,7 +356,7 @@
4	Box3f ()	4	Box3f ()
5	};	5	};
6		6
7	- for (int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)	7	- for (int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
8	+ for (unsigned int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)	8	+ for (unsigned int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
9	testRayBoxIntersection (boxes[i]);	9	testEntryAndExitPoints (boxes[i]);
10	}	10	}
11		11

Lines 1-10 Link Here

(-)./files/patch-ImathTest-testLineAlgo.cpp (-10 lines)
1	--- ImathTest/testLineAlgo.cpp.orig 2006-12-09 06:59:38.000000000 +0900
2	+++ ImathTest/testLineAlgo.cpp 2007-10-07 23:24:58.000000000 +0900
3	@@ -399,7 +399,6 @@
4	V3f p1 = v0 * b.x + v1 * b.y + v2 * b.z;
5
6	V3f p0;
7	- int j = 0;
8
9	do
10	{

Lines 1-5 Link Here

(-)./files/patch-ImathTest-testShear.cpp (-2 / +2 lines)
1	--- ImathTest/testShear.cpp.orig 2006-12-09 06:59:38.000000000 +0900	1	--- ImathTest/testShear.cpp.orig 2012-07-18 01:27:26.000000000 +0200
2	+++ ImathTest/testShear.cpp 2007-10-07 23:24:27.000000000 +0900	2	+++ ImathTest/testShear.cpp 2012-10-04 15:52:16.000000000 +0200
3	@@ -54,7 +54,6 @@	3	@@ -54,7 +54,6 @@
4		4
5	const float epsilon = Imath::limits< float >::epsilon();	5	const float epsilon = Imath::limits< float >::epsilon();

Lines 1-11 Link Here

(-)./files/patch-Makefile (-11 lines)
1	--- Makefile.in.orig 2007-08-04 02:28:25.000000000 +0900
2	+++ Makefile.in 2007-10-07 03:17:50.000000000 +0900
3	@@ -205,7 +205,7 @@
4	README README.CVS README.OSX README.win32 bootstrap \
5	config.windows/IlmBaseConfig.h
6
7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
9	pkgconfig_DATA = IlmBase.pc
10	all: all-recursive
11

Line 0 Link Here

(-)./files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig 2012-07-31 22:09:25.000000000 +0200
	2	+++ Makefile.in 2012-10-04 14:25:06.000000000 +0200
	3	@@ -224,7 +224,7 @@
	4	README README.CVS README.OSX README.win32 bootstrap \
	5	config.windows/IlmBaseConfig.h
	6
	7	-pkgconfigdir = $(libdir)/pkgconfig
	8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
	9	pkgconfig_DATA = IlmBase.pc
	10	all: all-recursive
	11

Lines 1-6 Link Here

(-)./files/patch-configure (-3 / +3 lines)
1	--- configure.orig 2012-09-19 00:48:14.000000000 +0000	1	--- configure.orig 2012-07-31 00:11:22.000000000 +0200
2	+++ configure 2012-09-19 00:51:54.000000000 +0000	2	+++ configure 2012-10-04 14:20:16.000000000 +0200
3	@@ -20384,25 +20384,25 @@	3	@@ -15978,25 +15978,25 @@
4	osx_arch=default	4	osx_arch=default
5	fi;	5	fi;
6		6




ABOUT THE ILMBASE LIBRARIES
----------------------------

Half is a class that encapsulates our 16-bit floating-point format.

IlmThread is a thread abstraction library for use with OpenEXR
and other software packages.  It currently supports pthreads and
Windows threads.

Imath implements 2D and 3D vectors, 3x3 and 4x4 matrices, quaternions
and other useful 2D and 3D math functions.

Iex is an exception-handling library.

If you have questions about using the IlmBase libraries, you may want
to join our developer mailing list.

WWW:	http://www.openexr.com/




lib/libHalf.a
lib/libHalf.la
lib/libHalf.so
lib/libHalf.so.6
lib/libIex.a
lib/libIex.la
lib/libIex.so
lib/libIex.so.6
lib/libIlmThread.a
lib/libIlmThread.la
lib/libIlmThread.so
lib/libIlmThread.so.6
lib/libImath.a
lib/libImath.la
lib/libImath.so
lib/libImath.so.6
libdata/pkgconfig/IlmBase.pc
include/OpenEXR/Iex.h
include/OpenEXR/IexBaseExc.h
include/OpenEXR/IexErrnoExc.h
include/OpenEXR/IexMacros.h
include/OpenEXR/IexMathExc.h
include/OpenEXR/IexMathFloatExc.h
include/OpenEXR/IexMathFpu.h
include/OpenEXR/IexMathIeeeExc.h
include/OpenEXR/IexThrowErrnoExc.h
include/OpenEXR/IlmBaseConfig.h
include/OpenEXR/IlmThread.h

include/OpenEXR/half.h
include/OpenEXR/halfFunction.h
include/OpenEXR/halfLimits.h
lib/libHalf.a
lib/libHalf.la
lib/libHalf.so
lib/libHalf.so.7
lib/libIex.a
lib/libIex.la
lib/libIex.so
lib/libIex.so.7
lib/libIexMath.a
lib/libIexMath.la
lib/libIexMath.so
lib/libIexMath.so.7
lib/libIlmThread.a
lib/libIlmThread.la
lib/libIlmThread.so
lib/libIlmThread.so.7
lib/libImath.a
lib/libImath.la
lib/libImath.so
lib/libImath.so.7
libdata/pkgconfig/IlmBase.pc
@dirrmtry share/applications
@dirrmtry include/OpenEXR

Return to bug 172337

Lines 6-40 Link Here

(-)./Makefile (-12 / +23 lines)
6	#	6	#
7		7
8	PORTNAME= ilmbase	8	PORTNAME= ilmbase
9	PORTVERSION= 1.0.2	9	PORTVERSION= 1.0.3
10	CATEGORIES= graphics devel	10	CATEGORIES= graphics devel
11	MASTER_SITES= ${MASTER_SITE_SAVANNAH}	11	MASTER_SITES= https://github.com/downloads/openexr/openexr/
12	MASTER_SITE_SUBDIR= openexr
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= nemysis@gmx.ch
15	COMMENT= ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex	14	COMMENT= ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
16		15
17	CONFLICTS= OpenEXR-1.[0-4].*	16	LICENSE= BSD
18		17
19	OPTIONS_DEFINE= THREAD	18	CONFLICTS= OpenEXR-1.[0-4].*
20	OPTIONS_DEFAULT= THREAD
21	THREAD_DESC= Enable multithreaded file I/O support
22		19
		20	FETCH_ARGS?= -Fpr
23	USE_GNOME= pkgconfig	21	USE_GNOME= pkgconfig
24	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
25	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
26	USE_AUTOTOOLS= libtool	24	USE_AUTOTOOLS= libtool
27		25
28	regression-test regression test check: build	26	PORTDOCS= AUTHORS ChangeLog README
29	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)	27
		28	OPTIONS_DEFINE= THREAD
		29	OPTIONS_DEFAULT= THREAD
		30	THREAD_DESC= Enable multithreaded file I/O support
30		31
31	.include <bsd.port.pre.mk>	32	.include <bsd.port.options.mk>
32		33
33	.if ${PORT_OPTIONS:MTHREAD}	34	.if ${PORT_OPTIONS:MTHREAD}
		35	CONFIGURE_ARGS+=--enable-threading
34	CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	36	CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
35	PTHREAD_LIBS="${PTHREAD_LIBS}"	37	PTHREAD_LIBS="${PTHREAD_LIBS}"
36	.else	38	.else
37	CONFIGURE_ARGS+=--disable-threading	39	CONFIGURE_ARGS+=--disable-threading
38	.endif	40	.endif
39		41
40	.include <bsd.port.post.mk>	42	regression-test regression test check: build
		43	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
		44
		45	post-install:
		46	.if ${PORT_OPTIONS:MDOCS}
		47	${MKDIR} ${DOCSDIR}
		48	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${DOCSDIR}
		49	.endif
		50
		51	.include <bsd.port.mk>

Line 0 Link Here

(-)./files/patch-IexMath-IexMathFpu.cpp (+12 lines)
	1	--- IexMath/IexMathFpu.cpp.orig 2012-07-26 20:51:55.000000000 +0200
	2	+++ IexMath/IexMathFpu.cpp 2012-10-04 15:30:47.000000000 +0200
	3	@@ -27,8 +27,7 @@
	4	#endif
	5
	6
	7	-#ifdef HAVE_UCONTEXT_H
	8	-
	9	+#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) \|\| defined(i386_))
	10
	11	#include <ucontext.h>
	12	#include <signal.h>

Lines 1-13 Link Here

(-)./pkg-descr (-7 / +12 lines)
1	ILM Base libraries have following four libraries.	1	ABOUT THE ILMBASE LIBRARIES
		2	----------------------------
2		3
3	*Half is a class that encapsulates ILM's 16-bit floating-point format.	4	Half is a class that encapsulates our 16-bit floating-point format.
4		5
5	*IlmThread is a thread abstraction library for use with OpenEXR	6	IlmThread is a thread abstraction library for use with OpenEXR
6	and other software packages.	7	and other software packages. It currently supports pthreads and
		8	Windows threads.
7		9
8	*Imath implements 2D and 3D vectors, 3x3 and 4x4 matrices, quaternions	10	Imath implements 2D and 3D vectors, 3x3 and 4x4 matrices, quaternions
9	and other useful 2D and 3D math functions.	11	and other useful 2D and 3D math functions.
10		12
11	*Iex is an exception-handling library.	13	Iex is an exception-handling library.
		14
		15	If you have questions about using the IlmBase libraries, you may want
		16	to join our developer mailing list.
12		17
13	WWW: http://www.openexr.com/	18	WWW: http://www.openexr.com/

Lines 1-25 Link Here

(-)./pkg-plist (-18 / +26 lines)
1	lib/libHalf.a
2	lib/libHalf.la
3	lib/libHalf.so
4	lib/libHalf.so.6
5	lib/libIex.a
6	lib/libIex.la
7	lib/libIex.so
8	lib/libIex.so.6
9	lib/libIlmThread.a
10	lib/libIlmThread.la
11	lib/libIlmThread.so
12	lib/libIlmThread.so.6
13	lib/libImath.a
14	lib/libImath.la
15	lib/libImath.so
16	lib/libImath.so.6
17	libdata/pkgconfig/IlmBase.pc
18	include/OpenEXR/Iex.h	1	include/OpenEXR/Iex.h
19	include/OpenEXR/IexBaseExc.h	2	include/OpenEXR/IexBaseExc.h
20	include/OpenEXR/IexErrnoExc.h	3	include/OpenEXR/IexErrnoExc.h
21	include/OpenEXR/IexMacros.h	4	include/OpenEXR/IexMacros.h
22	include/OpenEXR/IexMathExc.h	5	include/OpenEXR/IexMathExc.h
		6	include/OpenEXR/IexMathFloatExc.h
		7	include/OpenEXR/IexMathFpu.h
		8	include/OpenEXR/IexMathIeeeExc.h
23	include/OpenEXR/IexThrowErrnoExc.h	9	include/OpenEXR/IexThrowErrnoExc.h
24	include/OpenEXR/IlmBaseConfig.h	10	include/OpenEXR/IlmBaseConfig.h
25	include/OpenEXR/IlmThread.h	11	include/OpenEXR/IlmThread.h
Lines 58-61 Link Here
58	include/OpenEXR/half.h	44	include/OpenEXR/half.h
59	include/OpenEXR/halfFunction.h	45	include/OpenEXR/halfFunction.h
60	include/OpenEXR/halfLimits.h	46	include/OpenEXR/halfLimits.h
61	@dirrm include/OpenEXR	47	lib/libHalf.a
		48	lib/libHalf.la
		49	lib/libHalf.so
		50	lib/libHalf.so.7
		51	lib/libIex.a
		52	lib/libIex.la
		53	lib/libIex.so
		54	lib/libIex.so.7
		55	lib/libIexMath.a
		56	lib/libIexMath.la
		57	lib/libIexMath.so
		58	lib/libIexMath.so.7
		59	lib/libIlmThread.a
		60	lib/libIlmThread.la
		61	lib/libIlmThread.so
		62	lib/libIlmThread.so.7
		63	lib/libImath.a
		64	lib/libImath.la
		65	lib/libImath.so
		66	lib/libImath.so.7
		67	libdata/pkgconfig/IlmBase.pc
		68	@dirrmtry share/applications
		69	@dirrmtry include/OpenEXR