Attachment 128471 Details for Bug 172337 – ilmbase.diff

[patch] ilmbase.diff

ilmbase.diff (text/x-patch), 10.02 KB, created by nemysis on 2012-11-01 14:03:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-11-01 14:03:32 UTC

Size: 10.02 KB

patch

obsolete

>===> Generating patch
>===> Viewing diff with more
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/Makefile ./Makefile
>--- /usr/ports/graphics/ilmbase/Makefile	2012-09-20 16:37:41.000000000 +0200
>+++ ./Makefile	2012-11-01 10:57:07.000000000 +0100
>@@ -6,35 +6,46 @@
> #
> 
> PORTNAME=	ilmbase
>-PORTVERSION=	1.0.2
>+PORTVERSION=	1.0.3
> CATEGORIES=	graphics devel
>-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
>-MASTER_SITE_SUBDIR=	openexr
>+MASTER_SITES=	http://cloud.github.com/downloads/openexr/openexr/
>+DIST_SUBDIR=	OpenEXR
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	nemysis@gmx.ch
> COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
> 
>-CONFLICTS=	OpenEXR-1.[0-4].*
>+LICENSE=	BSD
> 
>-OPTIONS_DEFINE=		THREAD
>-OPTIONS_DEFAULT=	THREAD
>-THREAD_DESC=		Enable multithreaded file I/O support
>+CONFLICTS=	OpenEXR-1.[0-4].*
> 
>-USE_GNOME=	pkgconfig
>+USE_PKGCONFIG=	build
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> USE_AUTOTOOLS=	libtool
> 
>-regression-test regression test check:	build
>-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
>+PORTDOCS=	AUTHORS ChangeLog README
>+
>+OPTIONS_DEFINE=		THREAD
>+OPTIONS_DEFAULT=	THREAD
>+THREAD_DESC=		Enable multithreaded file I/O support
> 
>-.include <bsd.port.pre.mk>
>+.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
> 
>-.include <bsd.port.post.mk>
>+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>
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/distinfo ./distinfo
>--- /usr/ports/graphics/ilmbase/distinfo	2012-09-20 16:37:41.000000000 +0200
>+++ ./distinfo	2012-11-01 11:03:44.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (ilmbase-1.0.2.tar.gz) = 2e5cda799ffdfca9b1a16bb120d49c74a39af1457ef22f968918c6200ba62e44
>-SIZE (ilmbase-1.0.2.tar.gz) = 496540
>+SHA256 (OpenEXR/ilmbase-1.0.3.tar.gz) = a998e064d6960ba258731fa5c8e7a3870b0eaa7ba9c1a5e5078263e9d9f76502
>+SIZE (OpenEXR/ilmbase-1.0.3.tar.gz) = 534980
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp ./files/patch-IexMath-IexMathFpu.cpp
>--- /usr/ports/graphics/ilmbase/files/patch-IexMath-IexMathFpu.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-IexMath-IexMathFpu.cpp	2012-11-01 12:03:52.000000000 +0100
>@@ -0,0 +1,11 @@
>+--- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
>++++ IexMath/IexMathFpu.cpp	2012-11-01 12:00:36.000000000 +0100
>+@@ -27,7 +27,7 @@
>+ #endif
>+ 
>+ 
>+-#ifdef HAVE_UCONTEXT_H
>++#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
>+ 
>+ 
>+ #include <ucontext.h>
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-Imath-ImathFun.cpp ./files/patch-Imath-ImathFun.cpp
>--- /usr/ports/graphics/ilmbase/files/patch-Imath-ImathFun.cpp	2007-10-07 16:47:38.000000000 +0200
>+++ ./files/patch-Imath-ImathFun.cpp	2012-11-01 12:10:50.000000000 +0100
>@@ -1,5 +1,5 @@
>---- Imath/ImathFun.cpp.orig	2006-12-09 06:59:37.000000000 +0900
>-+++ Imath/ImathFun.cpp	2007-10-07 23:23:38.000000000 +0900
>+--- Imath/ImathFun.cpp.orig	2012-07-18 01:27:25.000000000 +0200
>++++ Imath/ImathFun.cpp	2012-11-01 12:10:46.000000000 +0100
> @@ -33,6 +33,7 @@
>  ///////////////////////////////////////////////////////////////////////////
>  
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp ./files/patch-ImathTest-testBoxAlgo.cpp
>--- /usr/ports/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp	2007-10-07 16:47:38.000000000 +0200
>+++ ./files/patch-ImathTest-testBoxAlgo.cpp	2012-10-04 15:46:07.000000000 +0200
>@@ -1,11 +1,11 @@
>---- ImathTest/testBoxAlgo.cpp.orig	2007-07-13 13:48:45.000000000 +0900
>-+++ ImathTest/testBoxAlgo.cpp	2007-10-07 23:26:22.000000000 +0900
>-@@ -336,7 +336,7 @@
>+--- ImathTest/testBoxAlgo.cpp.orig	2012-07-18 01:27:26.000000000 +0200
>++++ ImathTest/testBoxAlgo.cpp	2012-10-04 15:45:00.000000000 +0200
>+@@ -356,7 +356,7 @@
>  	Box3f ()
>      };
>  
> -    for (int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
> +    for (unsigned int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
>- 	testRayBoxIntersection (boxes[i]);
>+ 	testEntryAndExitPoints (boxes[i]);
>  }
>  
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-ImathTest-testLineAlgo.cpp ./files/patch-ImathTest-testLineAlgo.cpp
>--- /usr/ports/graphics/ilmbase/files/patch-ImathTest-testLineAlgo.cpp	2007-10-07 16:47:38.000000000 +0200
>+++ ./files/patch-ImathTest-testLineAlgo.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ImathTest/testLineAlgo.cpp.orig	2006-12-09 06:59:38.000000000 +0900
>-+++ ImathTest/testLineAlgo.cpp	2007-10-07 23:24:58.000000000 +0900
>-@@ -399,7 +399,6 @@
>- 	    V3f p1 = v0 * b.x + v1 * b.y + v2 * b.z;
>- 
>- 	    V3f p0;
>--	    int j = 0;
>- 
>- 	    do
>- 	    {
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-ImathTest-testShear.cpp ./files/patch-ImathTest-testShear.cpp
>--- /usr/ports/graphics/ilmbase/files/patch-ImathTest-testShear.cpp	2007-10-07 16:47:38.000000000 +0200
>+++ ./files/patch-ImathTest-testShear.cpp	2012-10-04 15:53:36.000000000 +0200
>@@ -1,5 +1,5 @@
>---- ImathTest/testShear.cpp.orig	2006-12-09 06:59:38.000000000 +0900
>-+++ ImathTest/testShear.cpp	2007-10-07 23:24:27.000000000 +0900
>+--- ImathTest/testShear.cpp.orig	2012-07-18 01:27:26.000000000 +0200
>++++ ImathTest/testShear.cpp	2012-10-04 15:52:16.000000000 +0200
> @@ -54,7 +54,6 @@
>  
>      const float         epsilon = Imath::limits< float >::epsilon();
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-Makefile ./files/patch-Makefile
>--- /usr/ports/graphics/ilmbase/files/patch-Makefile	2007-10-06 20:36:51.000000000 +0200
>+++ ./files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- Makefile.in.orig	2007-08-04 02:28:25.000000000 +0900
>-+++ Makefile.in	2007-10-07 03:17:50.000000000 +0900
>-@@ -205,7 +205,7 @@
>-         README README.CVS README.OSX README.win32 bootstrap \
>- 	config.windows/IlmBaseConfig.h
>- 
>--pkgconfigdir = $(libdir)/pkgconfig
>-+pkgconfigdir = $(prefix)/libdata/pkgconfig
>- pkgconfig_DATA = IlmBase.pc
>- all: all-recursive
>- 
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-Makefile.in ./files/patch-Makefile.in
>--- /usr/ports/graphics/ilmbase/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
>+++ ./files/patch-Makefile.in	2012-10-04 14:26:00.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- Makefile.in.orig	2012-07-31 22:09:25.000000000 +0200
>++++ Makefile.in	2012-10-04 14:25:06.000000000 +0200
>+@@ -224,7 +224,7 @@
>+         README README.CVS README.OSX README.win32 bootstrap \
>+ 	config.windows/IlmBaseConfig.h
>+ 
>+-pkgconfigdir = $(libdir)/pkgconfig
>++pkgconfigdir = $(prefix)/libdata/pkgconfig
>+ pkgconfig_DATA = IlmBase.pc
>+ all: all-recursive
>+ 
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/files/patch-configure ./files/patch-configure
>--- /usr/ports/graphics/ilmbase/files/patch-configure	2012-09-20 16:37:41.000000000 +0200
>+++ ./files/patch-configure	2012-10-04 14:22:43.000000000 +0200
>@@ -1,6 +1,6 @@
>---- configure.orig	2012-09-19 00:48:14.000000000 +0000
>-+++ configure	2012-09-19 00:51:54.000000000 +0000
>-@@ -20384,25 +20384,25 @@
>+--- configure.orig	2012-07-31 00:11:22.000000000 +0200
>++++ configure	2012-10-04 14:20:16.000000000 +0200
>+@@ -15978,25 +15978,25 @@
>    osx_arch=default
>  fi;
>  
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/pkg-descr ./pkg-descr
>--- /usr/ports/graphics/ilmbase/pkg-descr	2007-10-06 20:36:50.000000000 +0200
>+++ ./pkg-descr	2012-10-04 13:47:06.000000000 +0200
>@@ -1,13 +1,18 @@
>-ILM Base libraries have following four libraries.
>+ABOUT THE ILMBASE LIBRARIES
>+----------------------------
> 
>-*Half is a class that encapsulates ILM's 16-bit floating-point format.
>+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.
>+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.
>+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.
>+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/
>diff -ruN --exclude=CVS /usr/ports/graphics/ilmbase/pkg-plist ./pkg-plist
>--- /usr/ports/graphics/ilmbase/pkg-plist	2008-07-23 19:17:10.000000000 +0200
>+++ ./pkg-plist	2012-10-04 16:08:55.000000000 +0200
>@@ -1,25 +1,11 @@
>-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
>@@ -58,4 +44,26 @@
> include/OpenEXR/half.h
> include/OpenEXR/halfFunction.h
> include/OpenEXR/halfLimits.h
>-@dirrm include/OpenEXR
>+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
>===> Done

Actions: View | Diff

Attachments on bug 172337: 128466 | 128467 | 128468 | 128469 | 128470 | 128471 | 128472