[Midnightbsd-cvs] mports [23501] trunk/graphics/ilmbase: update ilmbase port to 2.2.1
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri May 11 08:56:09 EDT 2018
Revision: 23501
http://svnweb.midnightbsd.org/mports/?rev=23501
Author: laffer1
Date: 2018-05-11 08:56:08 -0400 (Fri, 11 May 2018)
Log Message:
-----------
update ilmbase port to 2.2.1
Modified Paths:
--------------
trunk/graphics/ilmbase/Makefile
trunk/graphics/ilmbase/distinfo
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
trunk/graphics/ilmbase/pkg-plist
Added Paths:
-----------
trunk/graphics/ilmbase/files/patch-git_8eed7012
Modified: trunk/graphics/ilmbase/Makefile
===================================================================
--- trunk/graphics/ilmbase/Makefile 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/Makefile 2018-05-11 12:56:08 UTC (rev 23501)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= ilmbase
-PORTVERSION= 2.2.0
+PORTVERSION= 2.2.1
CATEGORIES= graphics devel
MASTER_SITES= SAVANNAH/openexr/
DISTNAME= ilmbase-${PORTVERSION}
@@ -22,7 +22,7 @@
THREAD_CONFIGURE_ENABLE= threading
MAJORVER= 2_2
-VER= 12
+VER= 23
PLIST_SUB= MAJORVER=${MAJORVER}
PLIST_SUB+= VER=${VER}
@@ -30,7 +30,7 @@
HALF_BIN= eLut toFloat
regression-test regression test check: build
- @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
+ @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
post-install:
${STRIP_CMD} ${PREFIX}/lib/libHalf.so.${VER}
Modified: trunk/graphics/ilmbase/distinfo
===================================================================
--- trunk/graphics/ilmbase/distinfo 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/distinfo 2018-05-11 12:56:08 UTC (rev 23501)
@@ -1,2 +1,3 @@
-SHA256 (ilmbase-2.2.0.tar.gz) = ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7
-SIZE (ilmbase-2.2.0.tar.gz) = 525289
+TIMESTAMP = 1512081439
+SHA256 (ilmbase-2.2.1.tar.gz) = cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e
+SIZE (ilmbase-2.2.1.tar.gz) = 573073
Modified: trunk/graphics/ilmbase/files/patch-CMakeLists.txt
===================================================================
--- trunk/graphics/ilmbase/files/patch-CMakeLists.txt 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/files/patch-CMakeLists.txt 2018-05-11 12:56:08 UTC (rev 23501)
@@ -1,42 +1,6 @@
---- ./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 @@
+--- CMakeLists.txt.orig 2017-11-17 23:00:23 UTC
++++ CMakeLists.txt
+@@ -227,5 +227,5 @@ Cflags: -pthread -I\${OpenEXR_includedir
INSTALL ( FILES
${CMAKE_BINARY_DIR}/IlmBase.pc
DESTINATION
Modified: trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt
===================================================================
--- trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/files/patch-IlmThread__CMakeLists.txt 2018-05-11 12:56:08 UTC (rev 23501)
@@ -1,6 +1,6 @@
---- 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 @@
+--- IlmThread/CMakeLists.txt.orig 2017-11-17 23:00:23 UTC
++++ IlmThread/CMakeLists.txt
+@@ -18,6 +18,7 @@ IF (WIN32)
)
ENDIF()
@@ -8,7 +8,7 @@
IF(BUILD_SHARED_LIBS)
ADD_DEFINITIONS(-DILMTHREAD_EXPORTS)
-@@ -26,7 +27,7 @@
+@@ -26,7 +27,7 @@ ENDIF()
ADD_LIBRARY ( IlmThread ${LIB_TYPE}
${ILMTHREAD_LIBRARY_SOURCES}
)
Modified: trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/files/patch-ImathTest__testBoxAlgo.cpp 2018-05-11 12:56:08 UTC (rev 23501)
@@ -1,6 +1,6 @@
---- ./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 @@
+--- ImathTest/testBoxAlgo.cpp.orig 2017-11-17 23:00:23 UTC
++++ ImathTest/testBoxAlgo.cpp
+@@ -356,7 +356,7 @@ entryAndExitPoints1 ()
Box3f ()
};
Modified: trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/files/patch-ImathTest__testShear.cpp 2018-05-11 12:56:08 UTC (rev 23501)
@@ -1,6 +1,6 @@
---- ./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 @@
+--- ImathTest/testShear.cpp.orig 2017-11-17 23:00:23 UTC
++++ ImathTest/testShear.cpp
+@@ -54,7 +54,6 @@ testShear ()
const float epsilon = IMATH_INTERNAL_NAMESPACE::limits< float >::epsilon();
Modified: trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/files/patch-Imath__ImathFun.cpp 2018-05-11 12:56:08 UTC (rev 23501)
@@ -1,5 +1,5 @@
---- ./Imath/ImathFun.cpp.orig 2013-10-11 20:40:29.000000000 +0200
-+++ ./Imath/ImathFun.cpp 2014-01-29 13:16:44.000000000 +0100
+--- Imath/ImathFun.cpp.orig 2017-11-17 23:00:23 UTC
++++ Imath/ImathFun.cpp
@@ -33,6 +33,7 @@
///////////////////////////////////////////////////////////////////////////
@@ -8,7 +8,7 @@
#include "ImathFun.h"
IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER
-@@ -41,14 +42,14 @@
+@@ -41,14 +42,14 @@ IMATH_INTERNAL_NAMESPACE_SOURCE_ENTER
float
succf (float f)
{
@@ -25,7 +25,7 @@
{
// Plus or minus zero.
-@@ -76,14 +77,14 @@
+@@ -76,14 +77,14 @@ succf (float f)
float
predf (float f)
{
Added: trunk/graphics/ilmbase/files/patch-git_8eed7012
===================================================================
--- trunk/graphics/ilmbase/files/patch-git_8eed7012 (rev 0)
+++ trunk/graphics/ilmbase/files/patch-git_8eed7012 2018-05-11 12:56:08 UTC (rev 23501)
@@ -0,0 +1,59 @@
+From 8eed7012c10f1a835385d750fd55f228d1d35df9 Mon Sep 17 00:00:00 2001
+From: Ralph Potter <r.potter at bath.ac.uk>
+Date: Wed, 5 Nov 2014 16:16:55 +0000
+Subject: [PATCH] Resolve dependency issue building eLut.h/toFloat.h with
+ CMake/Ninja.
+
+---
+ IlmBase/Half/CMakeLists.txt | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/IlmBase/Half/CMakeLists.txt b/IlmBase/Half/CMakeLists.txt
+index 6f9714d..958d1b0 100644
+--- Half/CMakeLists.txt
++++ Half/CMakeLists.txt
+@@ -1,23 +1,24 @@
+ # yue.nicholas at gmail.com
+
+ ADD_EXECUTABLE ( eLut eLut.cpp )
+-
+-ADD_CUSTOM_COMMAND (
+- TARGET eLut POST_BUILD
+- COMMAND eLut > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++ COMMAND eLut ARGS > ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
++ DEPENDS eLut
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-)
++ )
+ SET_SOURCE_FILES_PROPERTIES(
+ ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+ PROPERTIES HEADER_FILE_ONLY TRUE
+ )
+
+ ADD_EXECUTABLE ( toFloat toFloat.cpp )
+-ADD_CUSTOM_COMMAND (
+- TARGET toFloat POST_BUILD
+- COMMAND toFloat > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ COMMAND toFloat ARGS > ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ DEPENDS toFloat
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+-)
++ )
+ SET_SOURCE_FILES_PROPERTIES(
+ ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
+ PROPERTIES HEADER_FILE_ONLY TRUE
+@@ -27,9 +28,7 @@ SET_SOURCE_FILES_PROPERTIES(
+ half.cpp
+ PROPERTIES
+ OBJECT_DEPENDS
+- ${CMAKE_CURRENT_BINARY_DIR}/eLut.h
+- OBJECT_DEPENDS
+- ${CMAKE_CURRENT_BINARY_DIR}/toFloat.h
++ "${CMAKE_CURRENT_BINARY_DIR}/eLut.h;${CMAKE_CURRENT_BINARY_DIR}/toFloat.h"
+ )
+
+ IF(BUILD_SHARED_LIBS)
Property changes on: trunk/graphics/ilmbase/files/patch-git_8eed7012
___________________________________________________________________
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-plist
===================================================================
--- trunk/graphics/ilmbase/pkg-plist 2018-05-11 12:52:31 UTC (rev 23500)
+++ trunk/graphics/ilmbase/pkg-plist 2018-05-11 12:56:08 UTC (rev 23501)
@@ -59,16 +59,21 @@
include/OpenEXR/halfLimits.h
lib/libHalf.so
lib/libHalf.so.%%VER%%
+lib/libHalf.so.%%VER%%.0.0
lib/libIex-%%MAJORVER%%.so
lib/libIex-%%MAJORVER%%.so.%%VER%%
+lib/libIex-%%MAJORVER%%.so.%%VER%%.0.0
lib/libIex.so
lib/libIexMath-%%MAJORVER%%.so
lib/libIexMath-%%MAJORVER%%.so.%%VER%%
+lib/libIexMath-%%MAJORVER%%.so.%%VER%%.0.0
lib/libIexMath.so
lib/libIlmThread-%%MAJORVER%%.so
lib/libIlmThread-%%MAJORVER%%.so.%%VER%%
+lib/libIlmThread-%%MAJORVER%%.so.%%VER%%.0.0
lib/libIlmThread.so
lib/libImath-%%MAJORVER%%.so
lib/libImath-%%MAJORVER%%.so.%%VER%%
+lib/libImath-%%MAJORVER%%.so.%%VER%%.0.0
lib/libImath.so
libdata/pkgconfig/IlmBase.pc
More information about the Midnightbsd-cvs
mailing list