1 |
commit: ab61b102be94a885bcc7f6db3586c02451960d5d |
2 |
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Sep 23 13:06:28 2017 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 28 12:45:08 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab61b102 |
7 |
|
8 |
media-libs/ctl: Version bump to 1.5.2 |
9 |
|
10 |
* Updated to new upstream version |
11 |
* Added patch to fix some CMake issues |
12 |
* Tidied up the metadata.xml file |
13 |
|
14 |
Closes: https://bugs.gentoo.org/610610 |
15 |
|
16 |
media-libs/ctl/Manifest | 1 + |
17 |
media-libs/ctl/ctl-1.5.2.ebuild | 27 ++ |
18 |
...se-GNUInstallDirs-and-fix-PkgConfig-files.patch | 399 +++++++++++++++++++++ |
19 |
media-libs/ctl/metadata.xml | 2 +- |
20 |
4 files changed, 428 insertions(+), 1 deletion(-) |
21 |
|
22 |
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest |
23 |
index fe214663e07..bfd000caefa 100644 |
24 |
--- a/media-libs/ctl/Manifest |
25 |
+++ b/media-libs/ctl/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST ctl-1.4.1.tar.gz 996923 SHA256 b202d9552eeb81f3ded66a6786719f6e1138fa4e31c866799b1efad6ef7a9f9a SHA512 671efbdef287c69b416462d479be58c6cfba331b5b6faa1a694ece162aa2ee966482423babb49c61de3d5046499a81110e4cd30824d9d36a3d6b69068b075063 WHIRLPOOL 2d5a928171cc842558b2c835419bf61da3293a1e6332bd53045ee65367ac67f69c82fea7285239419ed8e0b6256615c41a4f9a0dab52f120ca8504af3158814c |
28 |
+DIST ctl-1.5.2.tar.gz 1411871 SHA256 d7fac1439332c4d84abc3c285b365630acf20ea041033b154aa302befd25e0bd SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6 WHIRLPOOL aebf36c639ab5a222f47a40a0240a89b1d0650844cf310e9525f6a3bc3d6909403533fdbd6d19c2682d2999202915e5f3cde82ca03ffd4e09912c18760737cee |
29 |
|
30 |
diff --git a/media-libs/ctl/ctl-1.5.2.ebuild b/media-libs/ctl/ctl-1.5.2.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..ada618aa956 |
33 |
--- /dev/null |
34 |
+++ b/media-libs/ctl/ctl-1.5.2.ebuild |
35 |
@@ -0,0 +1,27 @@ |
36 |
+# Copyright 1999-2017 Gentoo Foundation |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+ |
41 |
+inherit cmake-utils |
42 |
+ |
43 |
+DESCRIPTION="AMPAS' Color Transformation Language" |
44 |
+HOMEPAGE="https://github.com/ampas/CTL" |
45 |
+SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz" |
46 |
+ |
47 |
+LICENSE="AMPAS" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
50 |
+ |
51 |
+RDEPEND="media-libs/ilmbase:= |
52 |
+ media-libs/openexr:= |
53 |
+ media-libs/tiff:= |
54 |
+ !media-libs/openexr_ctl" |
55 |
+DEPEND="${RDEPEND} |
56 |
+ virtual/pkgconfig" |
57 |
+ |
58 |
+S="${WORKDIR}/CTL-ctl-${PV}" |
59 |
+ |
60 |
+PATCHES=( "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch" ) |
61 |
+ |
62 |
+mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) |
63 |
|
64 |
diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch |
65 |
new file mode 100644 |
66 |
index 00000000000..98ea2fd6da5 |
67 |
--- /dev/null |
68 |
+++ b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch |
69 |
@@ -0,0 +1,399 @@ |
70 |
+From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001 |
71 |
+From: Jonathan Scruggs <j.scruggs@×××××.com> |
72 |
+Date: Mon, 25 Sep 2017 17:41:26 +0100 |
73 |
+Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files |
74 |
+ |
75 |
+* GNUInstallDirs are variables set by each distro and OS, so we |
76 |
+ don't need to define them manually. They can also be set manually |
77 |
+ during the configure phase. The code to define custom directories can |
78 |
+ be removed and replaced with the equivalent GNUInstallDirs variable. |
79 |
+* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully |
80 |
+ utilized everywhere. This makes Pkg-Config a hard dependency so that |
81 |
+ the libraries and directories can be found easily. This will use the |
82 |
+ correct libraries no matter how they are named, so this is compatible |
83 |
+ with both pre-2.0 and post 2.0 naming schemes. |
84 |
+* The Pkg-Config files had several errors that are now fixed. |
85 |
+ |
86 |
+Upstream PR: https://github.com/ampas/CTL/pull/67 |
87 |
+--- |
88 |
+ CMakeLists.txt | 36 ++++++++--------------------- |
89 |
+ OpenEXR_CTL/CMakeLists.txt | 2 +- |
90 |
+ OpenEXR_CTL/CtlModules/CMakeLists.txt | 2 +- |
91 |
+ OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt | 4 ++-- |
92 |
+ OpenEXR_CTL/exrdpx/CMakeLists.txt | 4 ++-- |
93 |
+ config/CTL.pc.in | 8 +++---- |
94 |
+ config/OpenEXR_CTL.pc.in | 15 ++++++------- |
95 |
+ configure.cmake | 41 ++++++++++++++++------------------ |
96 |
+ ctlrender/CMakeLists.txt | 20 ++++++++--------- |
97 |
+ doc/CMakeLists.txt | 2 +- |
98 |
+ lib/IlmCtl/CMakeLists.txt | 4 ++-- |
99 |
+ lib/IlmCtlMath/CMakeLists.txt | 4 ++-- |
100 |
+ lib/IlmCtlSimd/CMakeLists.txt | 6 ++--- |
101 |
+ lib/IlmImfCtl/CMakeLists.txt | 6 ++--- |
102 |
+ lib/dpx/CMakeLists.txt | 1 + |
103 |
+ 15 files changed, 66 insertions(+), 89 deletions(-) |
104 |
+ |
105 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
106 |
+index 01f622c..35e9a48 100644 |
107 |
+--- a/CMakeLists.txt |
108 |
++++ b/CMakeLists.txt |
109 |
+@@ -1,22 +1,14 @@ |
110 |
+ cmake_minimum_required(VERSION 2.8) |
111 |
+ project( CTL ) |
112 |
+ |
113 |
++INCLUDE ( GNUInstallDirs ) |
114 |
++ |
115 |
+ set( CTL_MAJOR_VERSION 1 ) |
116 |
+ set( CTL_MINOR_VERSION 5 ) |
117 |
+-set( CTL_PATCH_VERSION 0 ) |
118 |
++set( CTL_PATCH_VERSION 2 ) |
119 |
+ set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} ) |
120 |
+ |
121 |
+-## Make install directories overrideable |
122 |
+-set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" ) |
123 |
+-set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" ) |
124 |
+-set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" ) |
125 |
+-set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" ) |
126 |
+-if( WIN32 AND NOT CYGWIN ) |
127 |
+- set(DEF_INSTALL_CMAKE_DIR CMake) |
128 |
+-else() |
129 |
+- set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL) |
130 |
+-endif() |
131 |
+-set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) |
132 |
++set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/CMake/CTL CACHE PATH "Install directory for project CMake files" ) |
133 |
+ |
134 |
+ # use, i.e. don't skip the full RPATH for the build tree |
135 |
+ SET(CMAKE_SKIP_BUILD_RPATH FALSE) |
136 |
+@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) |
137 |
+ # which point to directories outside the build tree to the install RPATH |
138 |
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) |
139 |
+ # the RPATH to be used when installing, but only if it's not a system directory |
140 |
+-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) |
141 |
++LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir) |
142 |
+ IF("${isSystemDir}" STREQUAL "-1") |
143 |
+- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") |
144 |
++ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") |
145 |
+ ENDIF("${isSystemDir}" STREQUAL "-1") |
146 |
+ |
147 |
+- |
148 |
+-## convert install paths to absolute |
149 |
+-foreach( p LIB BIN INCLUDE CMAKE DOC) |
150 |
+- set( var INSTALL_${p}_DIR ) |
151 |
+- if( NOT IS_ABSOLUTE "${${var}}" ) |
152 |
+- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" ) |
153 |
+- endif() |
154 |
+-endforeach() |
155 |
+- |
156 |
+ option(ENABLE_SHARED "Enable Shared Libraries" ON) |
157 |
+ |
158 |
+ if ( ENABLE_SHARED ) |
159 |
+@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr |
160 |
+ export(PACKAGE CTL) |
161 |
+ |
162 |
+ # Create a CTLBuildTreeSettings.cmake file for the use from the build tree |
163 |
+-file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") |
164 |
++file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}") |
165 |
+ configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY) |
166 |
+ configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY) |
167 |
+ configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY) |
168 |
+ |
169 |
+ if ( PKG_CONFIG_FOUND ) |
170 |
+ configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY) |
171 |
+-install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) |
172 |
++install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) |
173 |
+ endif() |
174 |
+ |
175 |
+ install( FILES |
176 |
+ "${PROJECT_BINARY_DIR}/CTLConfig.cmake" |
177 |
+ "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" |
178 |
++ "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" |
179 |
+ DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) |
180 |
+-install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION |
181 |
+- "${INSTALL_CMAKE_DIR}" COMPONENT dev) |
182 |
+ |
183 |
+diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt |
184 |
+index c1ca53e..3f19dd4 100644 |
185 |
+--- a/OpenEXR_CTL/CMakeLists.txt |
186 |
++++ b/OpenEXR_CTL/CMakeLists.txt |
187 |
+@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr ) |
188 |
+ |
189 |
+ if ( PKG_CONFIG_FOUND ) |
190 |
+ configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY) |
191 |
+-install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) |
192 |
++install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) |
193 |
+ endif() |
194 |
+ |
195 |
+ # TODO CMake config |
196 |
+diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt |
197 |
+index c63c22e..9c9e5b8 100644 |
198 |
+--- a/OpenEXR_CTL/CtlModules/CMakeLists.txt |
199 |
++++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt |
200 |
+@@ -2,6 +2,6 @@ install( |
201 |
+ FILES |
202 |
+ utilities.ctl |
203 |
+ DESTINATION |
204 |
+- ${INSTALL_LIB_DIR}/CTL |
205 |
++ ${CMAKE_INSTALL_LIBDIR}/CTL |
206 |
+ ) |
207 |
+ |
208 |
+diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |
209 |
+index e396ec5..1f0eea0 100644 |
210 |
+--- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |
211 |
++++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |
212 |
+@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) |
213 |
+ target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) |
214 |
+ target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) |
215 |
+ |
216 |
+-install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) |
217 |
++install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
218 |
+ |
219 |
+-install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) |
220 |
++install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) |
221 |
+diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt |
222 |
+index 50bd116..d9eadd8 100644 |
223 |
+--- a/OpenEXR_CTL/exrdpx/CMakeLists.txt |
224 |
++++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt |
225 |
+@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) |
226 |
+ target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) |
227 |
+ target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) |
228 |
+ |
229 |
+-install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) |
230 |
++install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
231 |
+ |
232 |
+-install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) |
233 |
++install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) |
234 |
+ |
235 |
+ |
236 |
+diff --git a/config/CTL.pc.in b/config/CTL.pc.in |
237 |
+index 6d6e732..9b212a4 100644 |
238 |
+--- a/config/CTL.pc.in |
239 |
++++ b/config/CTL.pc.in |
240 |
+@@ -1,8 +1,6 @@ |
241 |
+-prefix=@CMAKE_INSTALL_PREFIX@ |
242 |
+-exec_prefix=@INSTALL_BIN_DIR@ |
243 |
+-libdir=@INSTALL_LIB_DIR@ |
244 |
+-includedir=@INSTALL_INCLUDE_DIR@ |
245 |
+-CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL |
246 |
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ |
247 |
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ |
248 |
++CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL |
249 |
+ |
250 |
+ Name: CTL |
251 |
+ Description: CTL interpreter library |
252 |
+diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in |
253 |
+index 4cef5c6..39a1a3f 100644 |
254 |
+--- a/config/OpenEXR_CTL.pc.in |
255 |
++++ b/config/OpenEXR_CTL.pc.in |
256 |
+@@ -1,11 +1,10 @@ |
257 |
+-prefix=@prefix@ |
258 |
+-exec_prefix=@exec_prefix@ |
259 |
+-libdir=@libdir@ |
260 |
+-includedir=@includedir@ |
261 |
+-OpenEXR_includedir=@includedir@/OpenEXR |
262 |
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ |
263 |
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ |
264 |
++OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR |
265 |
+ |
266 |
+ Name: OpenEXR_CTL |
267 |
+ Description: Simplified OpenEXR interface to CTL |
268 |
+-Version: @OPENEXR_CTL_VERSION@ |
269 |
+-Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@ |
270 |
+-Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} |
271 |
++Version: @CTL_VERSION@ |
272 |
++Libs: -L${libdir} -lIlmImfCtl |
273 |
++Cflags: -I${OpenEXR_includedir} |
274 |
++Requires: CTL,OpenEXR |
275 |
+diff --git a/configure.cmake b/configure.cmake |
276 |
+index 1817071..eb7e14e 100644 |
277 |
+--- a/configure.cmake |
278 |
++++ b/configure.cmake |
279 |
+@@ -1,10 +1,7 @@ |
280 |
+-# Until we get some of these modules into the upstream packages, put them here |
281 |
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") |
282 |
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake") |
283 |
++# Make Pkg-Config required. |
284 |
++find_package( PkgConfig ) |
285 |
+ |
286 |
+-find_package( PkgConfig QUIET ) |
287 |
+- |
288 |
+-find_package( IlmBase QUIET ) |
289 |
++PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase ) |
290 |
+ if(IlmBase_FOUND) |
291 |
+ message( STATUS "found IlmBase, version ${IlmBase_VERSION}" ) |
292 |
+ ### |
293 |
+@@ -13,11 +10,11 @@ if(IlmBase_FOUND) |
294 |
+ ### |
295 |
+ include_directories( ${IlmBase_INCLUDE_DIRS} ) |
296 |
+ link_directories( ${IlmBase_LIBRARY_DIRS} ) |
297 |
+- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" ) |
298 |
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" ) |
299 |
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) |
300 |
+- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) |
301 |
+- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) |
302 |
++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) |
303 |
++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) |
304 |
++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) |
305 |
++ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) |
306 |
++ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) |
307 |
+ else() |
308 |
+ message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" ) |
309 |
+ endif() |
310 |
+@@ -39,20 +36,20 @@ else() |
311 |
+ endif() |
312 |
+ endif() |
313 |
+ |
314 |
+-find_package( OpenEXR QUIET ) |
315 |
++PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR ) |
316 |
+ if (OpenEXR_FOUND) |
317 |
+ message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" ) |
318 |
+ else() |
319 |
+ message( WARNING "Unable to find OpenEXR libraries, disabling" ) |
320 |
+ endif() |
321 |
+ |
322 |
+-find_package( AcesContainer ) |
323 |
+-if (AcesContainer_FOUND) |
324 |
+- message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) |
325 |
+-else() |
326 |
+- if ( PKG_CONFIG_FOUND ) |
327 |
+- pkg_check_modules( AcesContainer AcesContainer ) |
328 |
+- else() |
329 |
+- message( WARNING "Unable to find AcesContainer libraries, disabling" ) |
330 |
+- endif() |
331 |
+-endif() |
332 |
++find_package( AcesContainer ) |
333 |
++ if (AcesContainer_FOUND) |
334 |
++ message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) |
335 |
++ else() |
336 |
++ if ( PKG_CONFIG_FOUND ) |
337 |
++ pkg_check_modules( AcesContainer AcesContainer ) |
338 |
++ else() |
339 |
++ message( WARNING "Unable to find AcesContainer libraries, disabling" ) |
340 |
++ endif() |
341 |
++ endif() |
342 |
+diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt |
343 |
+index 9fced14..d97093d 100644 |
344 |
+--- a/ctlrender/CMakeLists.txt |
345 |
++++ b/ctlrender/CMakeLists.txt |
346 |
+@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} ) |
347 |
+ link_directories( ${OpenEXR_LIBRARY_DIRS} ) |
348 |
+ endif() |
349 |
+ |
350 |
+-if ( AcesContainer_FOUND ) |
351 |
+-add_definitions( -DHAVE_ACESFILE=1 ) |
352 |
+-include_directories( ${AcesContainer_INCLUDE_DIRS} ) |
353 |
+-link_directories( ${AcesContainer_LIBRARY_DIRS} ) |
354 |
+-endif() |
355 |
+- |
356 |
++if ( AcesContainer_FOUND ) |
357 |
++add_definitions( -DHAVE_ACESFILE=1 ) |
358 |
++include_directories( ${AcesContainer_INCLUDE_DIRS} ) |
359 |
++link_directories( ${AcesContainer_LIBRARY_DIRS} ) |
360 |
++endif() |
361 |
++ |
362 |
+ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" ) |
363 |
+ |
364 |
+ add_executable( ctlrender |
365 |
+@@ -41,9 +41,9 @@ if (OpenEXR_FOUND) |
366 |
+ target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} ) |
367 |
+ target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} ) |
368 |
+ endif() |
369 |
+-if (AcesContainer_FOUND) |
370 |
+-target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) |
371 |
+-target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) |
372 |
++if (AcesContainer_FOUND) |
373 |
++target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) |
374 |
++target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) |
375 |
+ endif() |
376 |
+ |
377 |
+-install( TARGETS ctlrender DESTINATION bin ) |
378 |
++install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
379 |
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt |
380 |
+index 0b123d0..9776205 100644 |
381 |
+--- a/doc/CMakeLists.txt |
382 |
++++ b/doc/CMakeLists.txt |
383 |
+@@ -1 +1 @@ |
384 |
+-install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL ) |
385 |
++install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} ) |
386 |
+diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt |
387 |
+index 3672a43..ef301bd 100644 |
388 |
+--- a/lib/IlmCtl/CMakeLists.txt |
389 |
++++ b/lib/IlmCtl/CMakeLists.txt |
390 |
+@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED} |
391 |
+ ) |
392 |
+ |
393 |
+ target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} ) |
394 |
+-target_link_libraries( IlmCtl Iex IlmThread Half ) |
395 |
++target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} ) |
396 |
+ |
397 |
+ set_target_properties( IlmCtl PROPERTIES |
398 |
+ VERSION ${CTL_VERSION} |
399 |
+@@ -50,4 +50,4 @@ install( FILES |
400 |
+ CtlVersion.h |
401 |
+ DESTINATION include/CTL ) |
402 |
+ |
403 |
+-install( TARGETS IlmCtl DESTINATION lib ) |
404 |
++install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
405 |
+diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt |
406 |
+index 96738cf..6997c74 100644 |
407 |
+--- a/lib/IlmCtlMath/CMakeLists.txt |
408 |
++++ b/lib/IlmCtlMath/CMakeLists.txt |
409 |
+@@ -18,8 +18,8 @@ install( FILES |
410 |
+ CtlLookupTable.h |
411 |
+ CtlRbfInterpolator.h |
412 |
+ CtlSparseMatrix.h |
413 |
+- DESTINATION include/CTL ) |
414 |
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) |
415 |
+ |
416 |
+-install( TARGETS IlmCtlMath DESTINATION lib ) |
417 |
++install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
418 |
+ |
419 |
+ # TODO Add Imath and Iex libadd dependency and version info |
420 |
+diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt |
421 |
+index 2ba792a..5eaf87d 100644 |
422 |
+--- a/lib/IlmCtlSimd/CMakeLists.txt |
423 |
++++ b/lib/IlmCtlSimd/CMakeLists.txt |
424 |
+@@ -1,7 +1,7 @@ |
425 |
+ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" ) |
426 |
+ |
427 |
+ add_executable( halfExpLogTable halfExpLogTable.cpp ) |
428 |
+-target_link_libraries( halfExpLogTable Half ) |
429 |
++target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} ) |
430 |
+ |
431 |
+ add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" |
432 |
+ COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h" |
433 |
+@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES |
434 |
+ SOVERSION ${CTL_VERSION} |
435 |
+ ) |
436 |
+ |
437 |
+-install( FILES CtlSimdInterpreter.h DESTINATION include/CTL ) |
438 |
++install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) |
439 |
+ |
440 |
+-install( TARGETS IlmCtlSimd DESTINATION lib ) |
441 |
++install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
442 |
+diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt |
443 |
+index 47563df..784e27f 100644 |
444 |
+--- a/lib/IlmImfCtl/CMakeLists.txt |
445 |
++++ b/lib/IlmImfCtl/CMakeLists.txt |
446 |
+@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED} |
447 |
+ ImfCtlCopyFunctionArg.cpp |
448 |
+ ) |
449 |
+ |
450 |
+-target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half ) |
451 |
++target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) |
452 |
+ |
453 |
+-install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR ) |
454 |
++install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR ) |
455 |
+ |
456 |
+ export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" ) |
457 |
+ |
458 |
+-install( TARGETS IlmImfCtl DESTINATION lib ) |
459 |
++install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
460 |
+diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt |
461 |
+index c8be26e..918890e 100644 |
462 |
+--- a/lib/dpx/CMakeLists.txt |
463 |
++++ b/lib/dpx/CMakeLists.txt |
464 |
+@@ -11,3 +11,4 @@ add_library( ctldpx |
465 |
+ dpx_rw.cc |
466 |
+ ) |
467 |
+ |
468 |
++target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) |
469 |
|
470 |
diff --git a/media-libs/ctl/metadata.xml b/media-libs/ctl/metadata.xml |
471 |
index 2e1fb11b8bf..1149b416c00 100644 |
472 |
--- a/media-libs/ctl/metadata.xml |
473 |
+++ b/media-libs/ctl/metadata.xml |
474 |
@@ -5,6 +5,6 @@ |
475 |
<email>media-video@g.o</email> |
476 |
</maintainer> |
477 |
<upstream> |
478 |
- <remote-id type="sourceforge">ampasctl</remote-id> |
479 |
+ <remote-id type="github">ampas/CTL</remote-id> |
480 |
</upstream> |
481 |
</pkgmetadata> |