[Midnightbsd-cvs] mports [18406] trunk/graphics/ilmbase/pkg-plist: ilmbase 2.2.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 28 05:51:52 EDT 2015


Revision: 18406
          http://svnweb.midnightbsd.org/mports/?rev=18406
Author:   laffer1
Date:     2015-03-28 05:51:51 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
ilmbase 2.2.0

Modified Paths:
--------------
    trunk/graphics/ilmbase/Makefile
    trunk/graphics/ilmbase/distinfo
    trunk/graphics/ilmbase/pkg-descr
    trunk/graphics/ilmbase/pkg-plist

Added Paths:
-----------
    trunk/graphics/ilmbase/files/patch-CMakeLists.txt
    trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
    trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp
    trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp
    trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp

Property Changed:
----------------
    trunk/graphics/ilmbase/pkg-descr

Modified: trunk/graphics/ilmbase/Makefile
===================================================================
--- trunk/graphics/ilmbase/Makefile	2015-03-28 09:51:14 UTC (rev 18405)
+++ trunk/graphics/ilmbase/Makefile	2015-03-28 09:51:51 UTC (rev 18406)
@@ -1,33 +1,50 @@
 # $MidnightBSD$
 
 PORTNAME=	ilmbase
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	graphics devel
-MASTER_SITES=	${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	openexr
+MASTER_SITES=	SAVANNAH/openexr/
+DISTNAME=	ilmbase-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath and Iex
-LICENSE=	ilm
+COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Imath, and Iex
 
-OPTIONS=	THREAD	"Enable multithreaded file I/O support"	on
+LICENSE=	bsd3
 
-USE_GNOME=	pkgconfig
+USES=		cmake pkgconfig
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	libtool
 
-regression test check:	build
+PORTDOCS=	AUTHORS ChangeLog README
+OPTIONS_DEFINE=		DOCS
+
+OPTIONS_SUB=	yes
+
+THREAD_CONFIGURE_ENABLE=	threading
+
+MAJORVER=	2_2
+VER=		12
+
+PLIST_SUB=	MAJORVER=${MAJORVER}
+PLIST_SUB+=	VER=${VER}
+
+HALF_BIN=	eLut toFloat
+
+regression-test regression test check:	build
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
 
-.include <bsd.port.pre.mk>
+post-install:
+	${STRIP_CMD} ${PREFIX}/lib/libHalf.so.${VER}
+	${RM} -f ${PREFIX}/lib/*.la
+.for l in libIex libIexMath libImath libIlmThread
+	${STRIP_CMD} ${PREFIX}/lib/${l}-${MAJORVER}.so.${VER}
+	${LN} -s ${l}-${MAJORVER}.so.${VER} ${PREFIX}/lib/${l}.so
+.endfor
 
-.if defined(WITH_THREAD)
-CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-.else
-CONFIGURE_ARGS+=--disable-threading
-.endif
+.for e in ${HALF_BIN}
+	${INSTALL_PROGRAM} ${WRKSRC}/Half/${e} ${PREFIX}/bin/${e}
+.endfor
 
-.include <bsd.port.post.mk>
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+
+.include <bsd.port.mk>

Modified: trunk/graphics/ilmbase/distinfo
===================================================================
--- trunk/graphics/ilmbase/distinfo	2015-03-28 09:51:14 UTC (rev 18405)
+++ trunk/graphics/ilmbase/distinfo	2015-03-28 09:51:51 UTC (rev 18406)
@@ -1,3 +1,2 @@
-SHA256 (ilmbase-1.0.1.tar.gz) = 4f14fc7b26a37a391ec5f979697148e6774bc36bc052de26e40ffabe401e397d
-RMD160 (ilmbase-1.0.1.tar.gz) = 124f10b6f4ebefc9bb5dba7715d8897c7d71b947
-SIZE (ilmbase-1.0.1.tar.gz) = 463275
+SHA256 (ilmbase-2.2.0.tar.gz) = ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7
+SIZE (ilmbase-2.2.0.tar.gz) = 525289

Added: trunk/graphics/ilmbase/files/patch-CMakeLists.txt
===================================================================
--- trunk/graphics/ilmbase/files/patch-CMakeLists.txt	                        (rev 0)
+++ trunk/graphics/ilmbase/files/patch-CMakeLists.txt	2015-03-28 09:51:51 UTC (rev 18406)
@@ -0,0 +1,45 @@
+--- ./CMakeLists.txt.orig	2014-08-10 06:23:56.000000000 +0200
++++ ./CMakeLists.txt	2014-08-15 02:01:33.000000000 +0200
+@@ -160,30 +160,30 @@
+ 
+ SET_TARGET_PROPERTIES ( Half
+   PROPERTIES
+-  VERSION 12.0.0
++  VERSION 12
+   SOVERSION 12
+   )
+ SET_TARGET_PROPERTIES ( Iex
+   PROPERTIES
+-  VERSION 12.0.0
++  VERSION 12
+   SOVERSION 12
+   OUTPUT_NAME "Iex${ILMBASE_LIBSUFFIX}"
+   )
+ SET_TARGET_PROPERTIES ( Imath
+   PROPERTIES
+-  VERSION 12.0.0
++  VERSION 12
+   SOVERSION 12
+   OUTPUT_NAME "Imath${ILMBASE_LIBSUFFIX}"
+   )
+ SET_TARGET_PROPERTIES ( IlmThread
+   PROPERTIES
+-  VERSION 12.0.0
++  VERSION 12
+   SOVERSION 12
+   OUTPUT_NAME "IlmThread${ILMBASE_LIBSUFFIX}"
+   )
+ SET_TARGET_PROPERTIES ( IexMath
+   PROPERTIES
+-  VERSION 12.0.0
++  VERSION 12
+   SOVERSION 12
+   OUTPUT_NAME "IexMath${ILMBASE_LIBSUFFIX}"
+   )
+@@ -227,5 +227,5 @@
+ INSTALL ( FILES
+   ${CMAKE_BINARY_DIR}/IlmBase.pc
+   DESTINATION
+-  lib/pkgconfig
++  libdata/pkgconfig
+ )


Property changes on: trunk/graphics/ilmbase/files/patch-CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
===================================================================
--- trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt	                        (rev 0)
+++ trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt	2015-03-28 09:51:51 UTC (rev 18406)
@@ -0,0 +1,19 @@
+--- IlmThread/CMakeLists.txt.orig	2013-11-12 01:10:49.000000000 +0400
++++ IlmThread/CMakeLists.txt	2014-03-27 00:38:30.616700075 +0400
+@@ -18,6 +18,7 @@
+ 	)
+ ENDIF()
+ 
++FIND_PACKAGE(Threads)
+ 
+ IF(BUILD_SHARED_LIBS)
+   ADD_DEFINITIONS(-DILMTHREAD_EXPORTS)
+@@ -26,7 +27,7 @@
+ ADD_LIBRARY ( IlmThread ${LIB_TYPE}
+   ${ILMTHREAD_LIBRARY_SOURCES}
+   )
+-TARGET_LINK_LIBRARIES(IlmThread Iex)
++TARGET_LINK_LIBRARIES(IlmThread Iex ${CMAKE_THREAD_LIBS_INIT})
+ 
+ INSTALL ( TARGETS
+   IlmThread


Property changes on: trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp	                        (rev 0)
+++ trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp	2015-03-28 09:51:51 UTC (rev 18406)
@@ -0,0 +1,11 @@
+--- ./ImathTest/testBoxAlgo.cpp.orig	2013-06-18 21:51:38.000000000 +0200
++++ ./ImathTest/testBoxAlgo.cpp	2014-01-29 13:16:44.000000000 +0100
+@@ -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)
+ 	testEntryAndExitPoints (boxes[i]);
+ }
+ 


Property changes on: trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp	                        (rev 0)
+++ trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp	2015-03-28 09:51:51 UTC (rev 18406)
@@ -0,0 +1,10 @@
+--- ./ImathTest/testShear.cpp.orig	2013-06-18 21:51:38.000000000 +0200
++++ ./ImathTest/testShear.cpp	2014-01-29 13:16:44.000000000 +0100
+@@ -54,7 +54,6 @@
+ 
+     const float         epsilon = IMATH_INTERNAL_NAMESPACE::limits< float >::epsilon();
+ 
+-    float    	        array[6] = { 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F };
+     IMATH_INTERNAL_NAMESPACE::Shear6f    	testConstructor1;
+     IMATH_INTERNAL_NAMESPACE::Shear6f    	testConstructor2( testConstructor1 );
+ 


Property changes on: trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp	                        (rev 0)
+++ trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp	2015-03-28 09:51:51 UTC (rev 18406)
@@ -0,0 +1,44 @@
+--- ./Imath/ImathFun.cpp.orig	2013-10-11 20:40:29.000000000 +0200
++++ ./Imath/ImathFun.cpp	2014-01-29 13:16:44.000000000 +0100
+@@ -33,6 +33,7 @@
+ ///////////////////////////////////////////////////////////////////////////
+ 
+ 
++#include <inttypes.h>
+ #include "ImathFun.h"
+ 
+ IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER
+@@ -41,14 +42,14 @@
+ float
+ succf (float f)
+ {
+-    union {float f; int i;} u;
++    union {float f; int32_t i;} u;
+     u.f = f;
+ 
+     if ((u.i & 0x7f800000) == 0x7f800000)
+     {
+         // Nan or infinity; don't change value.
+     }
+-    else if (u.i == 0x00000000 || u.i == 0x80000000)
++    else if (u.i == (int32_t)0x00000000 || u.i == (int32_t)0x80000000)
+     {
+         // Plus or minus zero.
+ 
+@@ -76,14 +77,14 @@
+ float
+ predf (float f)
+ {
+-    union {float f; int i;} u;
++    union {float f; int32_t i;} u;
+     u.f = f;
+ 
+     if ((u.i & 0x7f800000) == 0x7f800000)
+     {
+         // Nan or infinity; don't change value.
+     }
+-    else if (u.i == 0x00000000 || u.i == 0x80000000)
++    else if (u.i == (int32_t)0x00000000 || u.i == (int32_t)0x80000000)
+     {
+         // Plus or minus zero.
+ 


Property changes on: trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/ilmbase/pkg-descr
===================================================================
--- trunk/graphics/ilmbase/pkg-descr	2015-03-28 09:51:14 UTC (rev 18405)
+++ trunk/graphics/ilmbase/pkg-descr	2015-03-28 09:51:51 UTC (rev 18406)
@@ -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.
 
-WWW:	http://www.openexr.com/
+If you have questions about using the IlmBase libraries, you may want
+to join our developer mailing list.
+
+WWW: http://www.openexr.com/


Property changes on: trunk/graphics/ilmbase/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/ilmbase/pkg-plist
===================================================================
--- trunk/graphics/ilmbase/pkg-plist	2015-03-28 09:51:14 UTC (rev 18405)
+++ trunk/graphics/ilmbase/pkg-plist	2015-03-28 09:51:51 UTC (rev 18406)
@@ -1,29 +1,23 @@
-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
+bin/eLut
+bin/toFloat
 include/OpenEXR/Iex.h
 include/OpenEXR/IexBaseExc.h
 include/OpenEXR/IexErrnoExc.h
+include/OpenEXR/IexExport.h
+include/OpenEXR/IexForward.h
 include/OpenEXR/IexMacros.h
 include/OpenEXR/IexMathExc.h
+include/OpenEXR/IexMathFloatExc.h
+include/OpenEXR/IexMathFpu.h
+include/OpenEXR/IexMathIeeeExc.h
+include/OpenEXR/IexNamespace.h
 include/OpenEXR/IexThrowErrnoExc.h
 include/OpenEXR/IlmBaseConfig.h
 include/OpenEXR/IlmThread.h
+include/OpenEXR/IlmThreadExport.h
+include/OpenEXR/IlmThreadForward.h
 include/OpenEXR/IlmThreadMutex.h
+include/OpenEXR/IlmThreadNamespace.h
 include/OpenEXR/IlmThreadPool.h
 include/OpenEXR/IlmThreadSemaphore.h
 include/OpenEXR/ImathBox.h
@@ -32,8 +26,11 @@
 include/OpenEXR/ImathColorAlgo.h
 include/OpenEXR/ImathEuler.h
 include/OpenEXR/ImathExc.h
+include/OpenEXR/ImathExport.h
+include/OpenEXR/ImathForward.h
 include/OpenEXR/ImathFrame.h
 include/OpenEXR/ImathFrustum.h
+include/OpenEXR/ImathFrustumTest.h
 include/OpenEXR/ImathFun.h
 include/OpenEXR/ImathGL.h
 include/OpenEXR/ImathGLU.h
@@ -46,6 +43,7 @@
 include/OpenEXR/ImathMath.h
 include/OpenEXR/ImathMatrix.h
 include/OpenEXR/ImathMatrixAlgo.h
+include/OpenEXR/ImathNamespace.h
 include/OpenEXR/ImathPlane.h
 include/OpenEXR/ImathPlatform.h
 include/OpenEXR/ImathQuat.h
@@ -56,6 +54,21 @@
 include/OpenEXR/ImathVec.h
 include/OpenEXR/ImathVecAlgo.h
 include/OpenEXR/half.h
+include/OpenEXR/halfExport.h
 include/OpenEXR/halfFunction.h
 include/OpenEXR/halfLimits.h
- at dirrm include/OpenEXR
+lib/libHalf.so
+lib/libHalf.so.%%VER%%
+lib/libIex-%%MAJORVER%%.so
+lib/libIex-%%MAJORVER%%.so.%%VER%%
+lib/libIex.so
+lib/libIexMath-%%MAJORVER%%.so
+lib/libIexMath-%%MAJORVER%%.so.%%VER%%
+lib/libIexMath.so
+lib/libIlmThread-%%MAJORVER%%.so
+lib/libIlmThread-%%MAJORVER%%.so.%%VER%%
+lib/libIlmThread.so
+lib/libImath-%%MAJORVER%%.so
+lib/libImath-%%MAJORVER%%.so.%%VER%%
+lib/libImath.so
+libdata/pkgconfig/IlmBase.pc



More information about the Midnightbsd-cvs mailing list