Update diff ctl to version 1.5.3. Passed a full bulk build.
Concerns, okays?
diff --git a/graphics/ctl/Makefile b/graphics/ctl/Makefile
index 43e6490b23c..69ede534fdc 100644
--- a/graphics/ctl/Makefile
+++ b/graphics/ctl/Makefile
@@ -2,11 +2,10 @@ COMMENT = Color Transformation Language
interpreter
GH_ACCOUNT = ampas
GH_PROJECT = CTL
-GH_TAGNAME = ctl-1.5.2
+GH_TAGNAME = ctl-1.5.3
DISTNAME = ${GH_TAGNAME}
-REVISION = 8
-SHARED_LIBS += IlmCtl 1.0 # .2.0
+SHARED_LIBS += IlmCtl 2.0 # .2.0
SHARED_LIBS += IlmCtlMath 1.0 # .2.0
SHARED_LIBS += IlmCtlSimd 1.0 # .2.0
SHARED_LIBS += IlmImfCtl 1.0 # 1.5
@@ -17,8 +16,8 @@ HOMEPAGE = https://github.com/ampas/CTL/
# 3-clause BSD license
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Iex-3_2 IlmThread-3_2 Imath-3_1 c
-WANTLIB += OpenEXR-3_2 m tiff
+WANTLIB += ${COMPILER_LIBCXX} Iex-3_2 IlmThread-3_2 Imath-3_1
+WANTLIB += OpenEXR-3_2 OpenEXRCore-3_2 c m tiff
COMPILER = base-clang ports-gcc base-gcc
@@ -28,10 +27,11 @@ MODULES = devel/cmake
LIB_DEPENDS = graphics/openexr \
graphics/tiff
+CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON
+
# Fix build with OpenEXR>=3 (Imath split)
CXXFLAGS += -I${LOCALBASE}/include/OpenEXR
-I${LOCALBASE}/include/Imath
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/configure.cmake
.include <bsd.port.mk>
+LIB_DEPENDS += math/imath
diff --git a/graphics/ctl/distinfo b/graphics/ctl/distinfo
index 23504a688eb..54e69bf8562 100644
--- a/graphics/ctl/distinfo
+++ b/graphics/ctl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ctl-1.5.2.tar.gz) = 1/rBQ5MyxNhKvDwoWzZWMKzyDqBBAzsVSqMCvv0l4L0=
-SIZE (ctl-1.5.2.tar.gz) = 1411871
+SHA256 (ctl-1.5.3.tar.gz) = Cp9fPeiWSsXMoxWXrKdL+RWj2CFOMnb9y1LICtJbAJY=
+SIZE (ctl-1.5.3.tar.gz) = 3073036
diff --git a/graphics/ctl/patches/patch-CMakeLists_txt
b/graphics/ctl/patches/patch-CMakeLists_txt
deleted file mode 100644
index d9ffc4cb226..00000000000
--- a/graphics/ctl/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- CMakeLists.txt.orig Tue Jun 3 03:11:24 2014
-+++ CMakeLists.txt Fri Sep 11 13:31:58 2015
-@@ -10,11 +10,11 @@ set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERS
- set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )
- set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable
binaries" )
- set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public
header files" )
--set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" )
-+set( INSTALL_DOC_DIR share/doc CACHE PATH "Install directory for
documentation" )
- if( WIN32 AND NOT CYGWIN )
- set(DEF_INSTALL_CMAKE_DIR CMake)
- else()
-- set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL)
-+ set(DEF_INSTALL_CMAKE_DIR lib/cmake/CTL)
- endif()
- set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory
for project CMake files" )
-
diff --git a/graphics/ctl/patches/patch-cmake_modules_FindIlmBase_cmake
b/graphics/ctl/patches/patch-cmake_modules_FindIlmBase_cmake
deleted file mode 100644
index ffc64bfc640..00000000000
--- a/graphics/ctl/patches/patch-cmake_modules_FindIlmBase_cmake
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix build with OpenEXR>=3
-
-Index: cmake/modules/FindIlmBase.cmake
---- cmake/modules/FindIlmBase.cmake.orig
-+++ cmake/modules/FindIlmBase.cmake
-@@ -4,7 +4,7 @@
-
- find_package(PkgConfig QUIET)
- if(PKG_CONFIG_FOUND)
-- pkg_check_modules(PC_ILMBASE QUIET IlmBase)
-+ pkg_check_modules(PC_ILMBASE QUIET Imath)
- endif()
-
- if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-@@ -49,11 +49,7 @@ if(IlmBase_INCLUDE_DIR AND EXISTS "${IlmBase_INCLUDE_D
- endif()
- endif()
-
--if("${IlmBase_VERSION}" VERSION_LESS "2.0.0")
-- set(IlmBase_ALL_LIBRARIES Imath Half Iex IlmThread)
--else()
-- set(IlmBase_ALL_LIBRARIES Imath Half Iex IexMath IlmThread)
--endif()
-+set(IlmBase_ALL_LIBRARIES Imath Iex IlmThread)
- foreach(ILMBASE_LIB ${IlmBase_ALL_LIBRARIES})
- string(TOUPPER ${ILMBASE_LIB} _upper_ilmbase_lib)
- find_library(IlmBase_${_upper_ilmbase_lib}_LIBRARY
diff --git a/graphics/ctl/patches/patch-cmake_modules_FindOpenEXR_cmake
b/graphics/ctl/patches/patch-cmake_modules_FindOpenEXR_cmake
deleted file mode 100644
index 457d98c5a7f..00000000000
--- a/graphics/ctl/patches/patch-cmake_modules_FindOpenEXR_cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix build with OpenEXR>=3
-
-Index: cmake/modules/FindOpenEXR.cmake
---- cmake/modules/FindOpenEXR.cmake.orig
-+++ cmake/modules/FindOpenEXR.cmake
-@@ -52,14 +52,14 @@ if(OpenEXR_INCLUDE_DIR AND EXISTS "${OpenEXR_INCLUDE_D
- endif()
- endif()
-
--find_library(OpenEXR_LIBRARY NAMES IlmImf libIlmImf HINTS
${_OpenEXR_HINT_LIB})
-+find_library(OpenEXR_LIBRARY NAMES OpenEXR libOpenEXR HINTS
${_OpenEXR_HINT_LIB})
-
- find_package(IlmBase QUIET)
-
- unset(_OpenEXR_HINT_INCLUDE)
- unset(_OpenEXR_HINT_LIB)
-
--set(OpenEXR_LIBRARIES ${OpenEXR_LIBRARY} ${IlmBase_LIBRARIES} )
-+set(OpenEXR_LIBRARIES ${OpenEXR_LIBRARY} ${Imath_LIBRARIES} )
- set(OpenEXR_INCLUDE_DIRS ${OpenEXR_INCLUDE_DIR} )
-
- if(NOT PC_OPENEXR_FOUND)
diff --git a/graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in
b/graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in
deleted file mode 100644
index ea41eeadbf1..00000000000
--- a/graphics/ctl/patches/patch-config_OpenEXR_CTL_pc_in
+++ /dev/null
@@ -1,25 +0,0 @@
-pkg-config --libs OpenEXR
-
---- config/OpenEXR_CTL.pc.in.orig Tue Jun 3 03:11:24 2014
-+++ config/OpenEXR_CTL.pc.in Fri Sep 11 14:47:59 2015
-@@ -1,11 +1,12 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+prefix=@CMAKE_INSTALL_PREFIX@
-+exec_prefix=@INSTALL_BIN_DIR@
-+libdir=@INSTALL_LIB_DIR@
-+includedir=@INSTALL_INCLUDE_DIR@
-+OpenEXR_includedir=@INSTALL_INCLUDE_DIR@/OpenEXR
-+CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL
-
- Name: OpenEXR_CTL
- Description: Simplified OpenEXR interface to CTL
--Version: @OPENEXR_CTL_VERSION@
--Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@
--Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir}
-+Version: @CTL_VERSION@
-+Libs: -L${libdir} -pthread -lIlmImf-2_5 -lImath-2_5 -lHalf-2_5 -lIex-2_5
-lIexMath-2_5 -lIlmThread-2_5
-+Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir}
-I${CTL_includedir}
diff --git a/graphics/ctl/patches/patch-configure_cmake
b/graphics/ctl/patches/patch-configure_cmake
deleted file mode 100644
index 28e61b2e0a6..00000000000
--- a/graphics/ctl/patches/patch-configure_cmake
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix build with OpenEXR>=3
-
-Index: configure.cmake
---- configure.cmake.orig
-+++ configure.cmake
-@@ -1,25 +1,25 @@
- # Until we get some of these modules into the upstream packages, put them here
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/cmake/modules/")
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_INSTALL_PREFIX}/share/CMake")
-+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_INSTALL_PREFIX}/share/cmake")
-
- find_package( PkgConfig QUIET )
-
--find_package( IlmBase QUIET )
--if(IlmBase_FOUND)
-- message( STATUS "found IlmBase, version ${IlmBase_VERSION}" )
-+find_package( Imath QUIET )
-+if(Imath_FOUND)
-+ message( STATUS "found Imath, version ${Imath_VERSION}" )
- ###
-- ### Everyone (well, except for DPX) uses IlmBase, so
-+ ### Everyone (well, except for DPX) uses Imath (formerly IlmBase), so
- ### make that a global setting
- ###
-- include_directories( ${IlmBase_INCLUDE_DIRS} )
-- link_directories( ${IlmBase_LIBRARY_DIRS} )
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" )
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" )
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
${IlmBase_LDFLAGS}" )
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
${IlmBase_LDFLAGS}" )
-+ include_directories( ${Imath_INCLUDE_DIRS} )
-+ link_directories( ${Imath_LIBRARY_DIRS} "${LOCALBASE}/lib" )
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Imath_CFLAGS}" )
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Imath_CFLAGS}" )
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${Imath_LDFLAGS}" )
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}
${Imath_LDFLAGS}" )
-+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}
${Imath_LDFLAGS}" )
- else()
-- message( SEND_ERROR "IlmBase not found, please set the include and library
paths manually" )
-+ message( SEND_ERROR "Imath not found, please set the include and library
paths manually" )
- endif()
-
- find_package( TIFF QUIET )
diff --git a/graphics/ctl/patches/patch-ctlrender_exr__file_cc
b/graphics/ctl/patches/patch-ctlrender_exr__file_cc
deleted file mode 100644
index e2f52f39fc7..00000000000
--- a/graphics/ctl/patches/patch-ctlrender_exr__file_cc
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix build with OpenEXR>=3
-
---- ctlrender/exr_file.cc.orig 2014-06-03 01:11:24 UTC
-+++ ctlrender/exr_file.cc
-@@ -63,6 +63,8 @@
- #include <ImfChannelList.h>
- #include <Iex.h>
-
-+#include <fstream>
-+
- bool exr_read(const char *name, float scale, ctl::dpx::fb<float> *pixels,
- format_t *format) {
- std::ifstream ins;
diff --git a/graphics/ctl/patches/patch-ctlrender_tiff_file_cc
b/graphics/ctl/patches/patch-ctlrender_tiff_file_cc
index 5f4c396f0d2..a5a52d7287a 100644
--- a/graphics/ctl/patches/patch-ctlrender_tiff_file_cc
+++ b/graphics/ctl/patches/patch-ctlrender_tiff_file_cc
@@ -1,11 +1,12 @@
---- ctlrender/tiff_file.cc.orig Sun Aug 7 22:09:18 2016
-+++ ctlrender/tiff_file.cc Sun Aug 7 22:09:47 2016
-@@ -61,7 +61,7 @@
- #include <sys/param.h>
- #include <math.h>
- #include <Iex.h>
--#include <alloca.h>
-+#include <stdlib.h>
+Index: ctlrender/tiff_file.cc
+--- ctlrender/tiff_file.cc.orig
++++ ctlrender/tiff_file.cc
+@@ -66,7 +66,7 @@
+ #ifdef _WIN32
+ #include <malloc.h>
+ #else
+- #include <alloca.h>
++ #include <stdlib.h>
+ #endif
void tiff_read_multiplane(TIFF *t, float scale, ctl::dpx::fb<float> * pixels);
- void tiff_read_interleaved(TIFF *t, float scale, ctl::dpx::fb<float> *
pixels);
diff --git a/graphics/ctl/patches/patch-doc_CMakeLists_txt
b/graphics/ctl/patches/patch-doc_CMakeLists_txt
deleted file mode 100644
index 5c0d7cf19f1..00000000000
--- a/graphics/ctl/patches/patch-doc_CMakeLists_txt
+++ /dev/null
@@ -1,5 +0,0 @@
---- doc/CMakeLists.txt.orig Fri Sep 11 13:41:18 2015
-+++ doc/CMakeLists.txt Fri Sep 11 13:41:25 2015
-@@ -1 +1 @@
--install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL )
-+install( FILES CtlManual.pdf CtlManual.doc DESTINATION share/doc/CTL )
diff --git a/graphics/ctl/patches/patch-lib_IlmCtlMath_CtlPointTree.h
b/graphics/ctl/patches/patch-lib_IlmCtlMath_CtlPointTree.h
deleted file mode 100644
index badcc962538..00000000000
--- a/graphics/ctl/patches/patch-lib_IlmCtlMath_CtlPointTree.h
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix build with OpenEXR>=3
-
---- lib/IlmCtlMath/CtlPointTree.h.orig 2014-06-03 01:11:24 UTC
-+++ lib/IlmCtlMath/CtlPointTree.h
-@@ -71,6 +71,8 @@
- #include <vector>
- #include <algorithm>
-
-+#include <limits>
-+
- namespace Ctl {
-
- class PointTree
-@@ -181,7 +183,7 @@ class PointTree
- double bl = (_points[b] - _center).length2();
-
- volatile double delta = fabs (al - bl);
-- const double eps = 2.0 * Imath::limits<double>::epsilon();
-+ const double eps = 2.0 * std::numeric_limits<double>::epsilon();
-
- //
- // Impose strict weak ordering... if the lengths are the same,
diff --git a/graphics/ctl/patches/patch-lib_IlmCtlSimd_CMakeLists_txt
b/graphics/ctl/patches/patch-lib_IlmCtlSimd_CMakeLists_txt
deleted file mode 100644
index 22c8ac1400a..00000000000
--- a/graphics/ctl/patches/patch-lib_IlmCtlSimd_CMakeLists_txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix build with OpenEXR>=3
-
---- lib/IlmCtlSimd/CMakeLists.txt.orig 2021-04-11 04:27:17 UTC
-+++ lib/IlmCtlSimd/CMakeLists.txt
-@@ -1,7 +1,7 @@
- include_directories( "${CMAKE_CURRENT_SOURCE_DIR}"
"${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" )
-
- add_executable( halfExpLogTable halfExpLogTable.cpp )
--target_link_libraries( halfExpLogTable Half )
-+target_link_libraries( halfExpLogTable Imath )
-
- add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h"
- COMMAND halfExpLogTable
"${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h"
"${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h"
diff --git a/graphics/ctl/patches/patch-lib_IlmCtlSimd_CtlSimdInst_cpp
b/graphics/ctl/patches/patch-lib_IlmCtlSimd_CtlSimdInst_cpp
deleted file mode 100644
index fbe2a48d4d8..00000000000
--- a/graphics/ctl/patches/patch-lib_IlmCtlSimd_CtlSimdInst_cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix build with ilmbase >= 2.3.0
-
-Index: lib/IlmCtlSimd/CtlSimdInst.cpp
---- lib/IlmCtlSimd/CtlSimdInst.cpp.orig
-+++ lib/IlmCtlSimd/CtlSimdInst.cpp
-@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mask, SimdXContex
- REPLACE_EXC
- (e, "\n" <<
- xcontext.fileName() << ":" <<
-- inst->lineNumber() << ": " << e);
-+ inst->lineNumber() << ": " << e.what());
-
- throw e;
- }
diff --git a/graphics/ctl/patches/patch-lib_IlmCtl_CMakeLists_txt
b/graphics/ctl/patches/patch-lib_IlmCtl_CMakeLists_txt
deleted file mode 100644
index 1b9eea5c26c..00000000000
--- a/graphics/ctl/patches/patch-lib_IlmCtl_CMakeLists_txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix build with OpenEXR>=3
-
---- lib/IlmCtl/CMakeLists.txt.orig 2021-04-11 04:25:00 UTC
-+++ lib/IlmCtl/CMakeLists.txt
-@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED}
- )
-
- target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} )
--target_link_libraries( IlmCtl Iex IlmThread Half )
-+target_link_libraries( IlmCtl Iex IlmThread Imath)
-
- set_target_properties( IlmCtl PROPERTIES
- VERSION ${CTL_VERSION}
diff --git a/graphics/ctl/patches/patch-lib_IlmCtl_CtlExc_cpp
b/graphics/ctl/patches/patch-lib_IlmCtl_CtlExc_cpp
index 6f050550bf3..004a2da5169 100644
--- a/graphics/ctl/patches/patch-lib_IlmCtl_CtlExc_cpp
+++ b/graphics/ctl/patches/patch-lib_IlmCtl_CtlExc_cpp
@@ -1,11 +1,12 @@
---- lib/IlmCtl/CtlExc.cpp.orig Sun Aug 7 21:04:25 2016
-+++ lib/IlmCtl/CtlExc.cpp Sun Aug 7 21:04:48 2016
-@@ -55,7 +55,7 @@
- #include <CtlExc.h>
- #include <stdarg.h>
- #include <stdio.h>
--#include <alloca.h>
-+#include <stdlib.h>
+Index: lib/IlmCtl/CtlExc.cpp
+--- lib/IlmCtl/CtlExc.cpp.orig
++++ lib/IlmCtl/CtlExc.cpp
+@@ -58,7 +58,7 @@
+ #ifdef _WIN32
+ #include <malloc.h>
+ #else
+- #include <alloca.h>
++ #include <stdlib.h>
+ #endif
#include <string.h>
- namespace Ctl {
diff --git a/graphics/ctl/patches/patch-lib_IlmCtl_CtlTypeStorage_cpp
b/graphics/ctl/patches/patch-lib_IlmCtl_CtlTypeStorage_cpp
index a53c09590bd..fc74f53c168 100644
--- a/graphics/ctl/patches/patch-lib_IlmCtl_CtlTypeStorage_cpp
+++ b/graphics/ctl/patches/patch-lib_IlmCtl_CtlTypeStorage_cpp
@@ -1,10 +1,12 @@
---- lib/IlmCtl/CtlTypeStorage.cpp.orig Sun Aug 7 22:06:34 2016
-+++ lib/IlmCtl/CtlTypeStorage.cpp Sun Aug 7 22:06:54 2016
-@@ -64,7 +64,6 @@
- #include <half.h>
- #include <CtlExc.h>
- #include <string.h>
--#include <alloca.h>
+Index: lib/IlmCtl/CtlTypeStorage.cpp
+--- lib/IlmCtl/CtlTypeStorage.cpp.orig
++++ lib/IlmCtl/CtlTypeStorage.cpp
+@@ -67,7 +67,7 @@
+ #ifdef _WIN32
+ #include <malloc.h>
+ #else
+- #include <alloca.h>
++ #include <stdlib.h>
+ #endif
#include <stdio.h>
#include <stdlib.h>
- #include <stdint.h>
diff --git a/graphics/ctl/patches/patch-lib_IlmImfCtl_CMakeLists_txt
b/graphics/ctl/patches/patch-lib_IlmImfCtl_CMakeLists_txt
deleted file mode 100644
index 34836724980..00000000000
--- a/graphics/ctl/patches/patch-lib_IlmImfCtl_CMakeLists_txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix build with OpenEXR>=3
-
-Index: lib/IlmImfCtl/CMakeLists.txt
---- lib/IlmImfCtl/CMakeLists.txt.orig
-+++ lib/IlmImfCtl/CMakeLists.txt
-@@ -7,7 +7,12 @@ add_library( IlmImfCtl ${DO_SHARED}
- ImfCtlCopyFunctionArg.cpp
- )
-
--target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half )
-+set_target_properties( IlmImfCtl PROPERTIES
-+ VERSION ${CTL_VERSION}
-+ SOVERSION ${CTL_VERSION}
-+)
-+
-+target_link_libraries( IlmImfCtl IlmCtl OpenEXR Iex IlmThread Imath )
-
- install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR )
-
diff --git a/graphics/ctl/patches/patch-lib_dpx_dpx_raw_hh
b/graphics/ctl/patches/patch-lib_dpx_dpx_raw_hh
index 030e1d2cd5f..cc4542f18cc 100644
--- a/graphics/ctl/patches/patch-lib_dpx_dpx_raw_hh
+++ b/graphics/ctl/patches/patch-lib_dpx_dpx_raw_hh
@@ -1,8 +1,9 @@
---- lib/dpx/dpx_raw.hh.orig Fri Sep 11 13:13:47 2015
-+++ lib/dpx/dpx_raw.hh Fri Sep 11 13:17:18 2015
+Index: lib/dpx/dpx_raw.hh
+--- lib/dpx/dpx_raw.hh.orig
++++ lib/dpx/dpx_raw.hh
@@ -55,6 +55,16 @@
#if !defined(CTL_DPX_RAW_INTERNAL_INCLUDE)
- #define CRL_DPX_RAW_INTERNAL_INCLUDE
+ #define CTL_DPX_RAW_INTERNAL_INCLUDE
+#ifdef swap64
+#undef swap64
diff --git a/graphics/ctl/patches/patch-lib_dpx_dpx_util_cc
b/graphics/ctl/patches/patch-lib_dpx_dpx_util_cc
index 97b04a29c05..6d369979551 100644
--- a/graphics/ctl/patches/patch-lib_dpx_dpx_util_cc
+++ b/graphics/ctl/patches/patch-lib_dpx_dpx_util_cc
@@ -1,11 +1,12 @@
---- lib/dpx/dpx_util.cc.orig Sun Aug 7 21:02:08 2016
-+++ lib/dpx/dpx_util.cc Sun Aug 7 21:03:31 2016
-@@ -55,7 +55,7 @@
- #include "dpx_util.hh"
- #include <stdarg.h>
- #include <stdio.h>
--#include <alloca.h>
-+#include <stdlib.h>
+Index: lib/dpx/dpx_util.cc
+--- lib/dpx/dpx_util.cc.orig
++++ lib/dpx/dpx_util.cc
+@@ -58,7 +58,7 @@
+ #ifdef _WIN32
+ #include <malloc.h>
+ #else
+- #include <alloca.h>
++ #include <stdlib.h>
+ #endif
#include <string.h>
- namespace ctl {
diff --git a/graphics/ctl/pkg/PLIST b/graphics/ctl/pkg/PLIST
index a62b03624b0..264d3579888 100644
--- a/graphics/ctl/pkg/PLIST
+++ b/graphics/ctl/pkg/PLIST
@@ -28,21 +28,16 @@ include/CTL/CtlType.h
include/CTL/CtlTypeStorage.h
include/CTL/CtlVersion.h
include/OpenEXR/ImfCtlApplyTransforms.h
-lib/CTL/
-lib/CTL/change_saturation.ctl
-lib/CTL/transform_DPX_EXR.ctl
-lib/CTL/transform_EXR_DPX.ctl
-lib/CTL/utilities.ctl
-lib/cmake/CTL/
-lib/cmake/CTL/CTLConfig.cmake
-lib/cmake/CTL/CTLConfigVersion.cmake
-lib/cmake/CTL/CTLLibraryDepends.cmake
@lib lib/libIlmCtl.so.${LIBIlmCtl_VERSION}
@lib lib/libIlmCtlMath.so.${LIBIlmCtlMath_VERSION}
@lib lib/libIlmCtlSimd.so.${LIBIlmCtlSimd_VERSION}
@lib lib/libIlmImfCtl.so.${LIBIlmImfCtl_VERSION}
-lib/pkgconfig/CTL.pc
-lib/pkgconfig/OpenEXR_CTL.pc
+share/CTL/
+share/CTL/change_saturation.ctl
+share/CTL/transform_DPX_EXR.ctl
+share/CTL/transform_EXR_DPX.ctl
+share/CTL/utilities.ctl
share/doc/CTL/
-share/doc/CTL/CtlManual.doc
-share/doc/CTL/CtlManual.pdf
+share/doc/CTL/CTL/
+share/doc/CTL/CTL/CtlManual.doc
+share/doc/CTL/CTL/CtlManual.pdf
