1 |
commit: ff314b4a64b66969fac42c4c1c529086f1176595 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 28 09:04:45 2023 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 28 11:26:16 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff314b4a |
7 |
|
8 |
media-libs/ctl: drop 1.5.2-r4 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/892293 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/ctl/Manifest | 1 - |
14 |
media-libs/ctl/ctl-1.5.2-r4.ebuild | 39 -- |
15 |
...-GNUInstallDirs-and-fix-PkgConfig-files-1.patch | 399 --------------------- |
16 |
.../files/ctl-1.5.2-fix-to-build-with-gcc-11.patch | 25 -- |
17 |
.../ctl/files/ctl-1.5.2-fix-unit-tests.patch | 65 ---- |
18 |
.../ctl/files/ctl-1.5.2-install-dpx-library.patch | 21 -- |
19 |
media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch | 13 - |
20 |
7 files changed, 563 deletions(-) |
21 |
|
22 |
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest |
23 |
index 702623070f72..f10eda311dba 100644 |
24 |
--- a/media-libs/ctl/Manifest |
25 |
+++ b/media-libs/ctl/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6 |
28 |
DIST ctl-1.5.2_p20221224.tar.gz 1418659 BLAKE2B 6798439b270b785974cfd45381f927f2005884b6a00878fa845cc1c36cd912eb6f3acb913f896389a67bff52103d3d52032e3f1f9f53e1a3d98b545428c1580b SHA512 9cc132100d3ea622d954e783fbab43c07cfa72e1930f4b9c55cb01709e88f09f956ac02e973a09bfc2842e769060e6f50f082d5491be03c1499a58e79b0f1ca3 |
29 |
|
30 |
diff --git a/media-libs/ctl/ctl-1.5.2-r4.ebuild b/media-libs/ctl/ctl-1.5.2-r4.ebuild |
31 |
deleted file mode 100644 |
32 |
index 0276777c0657..000000000000 |
33 |
--- a/media-libs/ctl/ctl-1.5.2-r4.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,39 +0,0 @@ |
36 |
-# Copyright 1999-2023 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-inherit cmake |
42 |
- |
43 |
-DESCRIPTION="AMPAS' Color Transformation Language" |
44 |
-HOMEPAGE="https://github.com/ampas/CTL" |
45 |
-SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz" |
46 |
-S="${WORKDIR}/CTL-ctl-${PV}" |
47 |
- |
48 |
-LICENSE="AMPAS" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="amd64 ~ia64 ~ppc64 x86" |
51 |
-IUSE="test" |
52 |
- |
53 |
-RESTRICT="!test? ( test )" |
54 |
- |
55 |
-RDEPEND="media-libs/ilmbase:= |
56 |
- media-libs/openexr:= |
57 |
- media-libs/tiff:= |
58 |
- !media-libs/openexr_ctl" |
59 |
-DEPEND="${RDEPEND} |
60 |
- virtual/pkgconfig" |
61 |
- |
62 |
-PATCHES=( |
63 |
- "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch" |
64 |
- "${FILESDIR}/${P}-openexr-2.3.patch" |
65 |
- "${FILESDIR}/${P}-fix-to-build-with-gcc-11.patch" |
66 |
- "${FILESDIR}/${P}-install-dpx-library.patch" |
67 |
- "${FILESDIR}/${P}-fix-unit-tests.patch" |
68 |
-) |
69 |
- |
70 |
-src_test() { |
71 |
- pushd "${BUILD_DIR}" >/dev/null || die |
72 |
- eninja check |
73 |
- popd >/dev/null || die |
74 |
-} |
75 |
|
76 |
diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch |
77 |
deleted file mode 100644 |
78 |
index e4fadf1aa05c..000000000000 |
79 |
--- a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch |
80 |
+++ /dev/null |
81 |
@@ -1,399 +0,0 @@ |
82 |
-From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001 |
83 |
-From: Jonathan Scruggs <j.scruggs@×××××.com> |
84 |
-Date: Mon, 25 Sep 2017 17:41:26 +0100 |
85 |
-Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files |
86 |
- |
87 |
-* GNUInstallDirs are variables set by each distro and OS, so we |
88 |
- don't need to define them manually. They can also be set manually |
89 |
- during the configure phase. The code to define custom directories can |
90 |
- be removed and replaced with the equivalent GNUInstallDirs variable. |
91 |
-* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully |
92 |
- utilized everywhere. This makes Pkg-Config a hard dependency so that |
93 |
- the libraries and directories can be found easily. This will use the |
94 |
- correct libraries no matter how they are named, so this is compatible |
95 |
- with both pre-2.0 and post 2.0 naming schemes. |
96 |
-* The Pkg-Config files had several errors that are now fixed. |
97 |
- |
98 |
-Upstream PR: https://github.com/ampas/CTL/pull/67 |
99 |
---- |
100 |
- CMakeLists.txt | 36 ++++++++--------------------- |
101 |
- OpenEXR_CTL/CMakeLists.txt | 2 +- |
102 |
- OpenEXR_CTL/CtlModules/CMakeLists.txt | 2 +- |
103 |
- OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt | 4 ++-- |
104 |
- OpenEXR_CTL/exrdpx/CMakeLists.txt | 4 ++-- |
105 |
- config/CTL.pc.in | 8 +++---- |
106 |
- config/OpenEXR_CTL.pc.in | 15 ++++++------- |
107 |
- configure.cmake | 41 ++++++++++++++++------------------ |
108 |
- ctlrender/CMakeLists.txt | 20 ++++++++--------- |
109 |
- doc/CMakeLists.txt | 2 +- |
110 |
- lib/IlmCtl/CMakeLists.txt | 4 ++-- |
111 |
- lib/IlmCtlMath/CMakeLists.txt | 4 ++-- |
112 |
- lib/IlmCtlSimd/CMakeLists.txt | 6 ++--- |
113 |
- lib/IlmImfCtl/CMakeLists.txt | 6 ++--- |
114 |
- lib/dpx/CMakeLists.txt | 1 + |
115 |
- 15 files changed, 66 insertions(+), 89 deletions(-) |
116 |
- |
117 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
118 |
-index 01f622c..35e9a48 100644 |
119 |
---- a/CMakeLists.txt |
120 |
-+++ b/CMakeLists.txt |
121 |
-@@ -1,22 +1,14 @@ |
122 |
- cmake_minimum_required(VERSION 2.8) |
123 |
- project( CTL ) |
124 |
- |
125 |
-+INCLUDE ( GNUInstallDirs ) |
126 |
-+ |
127 |
- set( CTL_MAJOR_VERSION 1 ) |
128 |
- set( CTL_MINOR_VERSION 5 ) |
129 |
--set( CTL_PATCH_VERSION 0 ) |
130 |
-+set( CTL_PATCH_VERSION 2 ) |
131 |
- set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} ) |
132 |
- |
133 |
--## Make install directories overrideable |
134 |
--set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" ) |
135 |
--set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" ) |
136 |
--set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" ) |
137 |
--set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" ) |
138 |
--if( WIN32 AND NOT CYGWIN ) |
139 |
-- set(DEF_INSTALL_CMAKE_DIR CMake) |
140 |
--else() |
141 |
-- set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL) |
142 |
--endif() |
143 |
--set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" ) |
144 |
-+set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/CTL CACHE PATH "Install directory for project CMake files" ) |
145 |
- |
146 |
- # use, i.e. don't skip the full RPATH for the build tree |
147 |
- SET(CMAKE_SKIP_BUILD_RPATH FALSE) |
148 |
-@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) |
149 |
- # which point to directories outside the build tree to the install RPATH |
150 |
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) |
151 |
- # the RPATH to be used when installing, but only if it's not a system directory |
152 |
--LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir) |
153 |
-+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir) |
154 |
- IF("${isSystemDir}" STREQUAL "-1") |
155 |
-- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") |
156 |
-+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") |
157 |
- ENDIF("${isSystemDir}" STREQUAL "-1") |
158 |
- |
159 |
-- |
160 |
--## convert install paths to absolute |
161 |
--foreach( p LIB BIN INCLUDE CMAKE DOC) |
162 |
-- set( var INSTALL_${p}_DIR ) |
163 |
-- if( NOT IS_ABSOLUTE "${${var}}" ) |
164 |
-- set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" ) |
165 |
-- endif() |
166 |
--endforeach() |
167 |
-- |
168 |
- option(ENABLE_SHARED "Enable Shared Libraries" ON) |
169 |
- |
170 |
- if ( ENABLE_SHARED ) |
171 |
-@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr |
172 |
- export(PACKAGE CTL) |
173 |
- |
174 |
- # Create a CTLBuildTreeSettings.cmake file for the use from the build tree |
175 |
--file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}") |
176 |
-+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}") |
177 |
- configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY) |
178 |
- configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY) |
179 |
- configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY) |
180 |
- |
181 |
- if ( PKG_CONFIG_FOUND ) |
182 |
- configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY) |
183 |
--install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) |
184 |
-+install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) |
185 |
- endif() |
186 |
- |
187 |
- install( FILES |
188 |
- "${PROJECT_BINARY_DIR}/CTLConfig.cmake" |
189 |
- "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" |
190 |
-+ "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" |
191 |
- DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev) |
192 |
--install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION |
193 |
-- "${INSTALL_CMAKE_DIR}" COMPONENT dev) |
194 |
- |
195 |
-diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt |
196 |
-index c1ca53e..3f19dd4 100644 |
197 |
---- a/OpenEXR_CTL/CMakeLists.txt |
198 |
-+++ b/OpenEXR_CTL/CMakeLists.txt |
199 |
-@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr ) |
200 |
- |
201 |
- if ( PKG_CONFIG_FOUND ) |
202 |
- configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY) |
203 |
--install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev ) |
204 |
-+install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev ) |
205 |
- endif() |
206 |
- |
207 |
- # TODO CMake config |
208 |
-diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt |
209 |
-index c63c22e..9c9e5b8 100644 |
210 |
---- a/OpenEXR_CTL/CtlModules/CMakeLists.txt |
211 |
-+++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt |
212 |
-@@ -2,6 +2,6 @@ install( |
213 |
- FILES |
214 |
- utilities.ctl |
215 |
- DESTINATION |
216 |
-- ${INSTALL_LIB_DIR}/CTL |
217 |
-+ ${CMAKE_INSTALL_LIBDIR}/CTL |
218 |
- ) |
219 |
- |
220 |
-diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |
221 |
-index e396ec5..1f0eea0 100644 |
222 |
---- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |
223 |
-+++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |
224 |
-@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) |
225 |
- target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) |
226 |
- target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) |
227 |
- |
228 |
--install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) |
229 |
-+install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
230 |
- |
231 |
--install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) |
232 |
-+install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) |
233 |
-diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt |
234 |
-index 50bd116..d9eadd8 100644 |
235 |
---- a/OpenEXR_CTL/exrdpx/CMakeLists.txt |
236 |
-+++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt |
237 |
-@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl ) |
238 |
- target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} ) |
239 |
- target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} ) |
240 |
- |
241 |
--install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) |
242 |
-+install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
243 |
- |
244 |
--install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) |
245 |
-+install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL ) |
246 |
- |
247 |
- |
248 |
-diff --git a/config/CTL.pc.in b/config/CTL.pc.in |
249 |
-index 6d6e732..9b212a4 100644 |
250 |
---- a/config/CTL.pc.in |
251 |
-+++ b/config/CTL.pc.in |
252 |
-@@ -1,8 +1,6 @@ |
253 |
--prefix=@CMAKE_INSTALL_PREFIX@ |
254 |
--exec_prefix=@INSTALL_BIN_DIR@ |
255 |
--libdir=@INSTALL_LIB_DIR@ |
256 |
--includedir=@INSTALL_INCLUDE_DIR@ |
257 |
--CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL |
258 |
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ |
259 |
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ |
260 |
-+CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL |
261 |
- |
262 |
- Name: CTL |
263 |
- Description: CTL interpreter library |
264 |
-diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in |
265 |
-index 4cef5c6..39a1a3f 100644 |
266 |
---- a/config/OpenEXR_CTL.pc.in |
267 |
-+++ b/config/OpenEXR_CTL.pc.in |
268 |
-@@ -1,11 +1,10 @@ |
269 |
--prefix=@prefix@ |
270 |
--exec_prefix=@exec_prefix@ |
271 |
--libdir=@libdir@ |
272 |
--includedir=@includedir@ |
273 |
--OpenEXR_includedir=@includedir@/OpenEXR |
274 |
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ |
275 |
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ |
276 |
-+OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR |
277 |
- |
278 |
- Name: OpenEXR_CTL |
279 |
- Description: Simplified OpenEXR interface to CTL |
280 |
--Version: @OPENEXR_CTL_VERSION@ |
281 |
--Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@ |
282 |
--Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir} |
283 |
-+Version: @CTL_VERSION@ |
284 |
-+Libs: -L${libdir} -lIlmImfCtl |
285 |
-+Cflags: -I${OpenEXR_includedir} |
286 |
-+Requires: CTL,OpenEXR |
287 |
-diff --git a/configure.cmake b/configure.cmake |
288 |
-index 1817071..eb7e14e 100644 |
289 |
---- a/configure.cmake |
290 |
-+++ b/configure.cmake |
291 |
-@@ -1,10 +1,7 @@ |
292 |
--# Until we get some of these modules into the upstream packages, put them here |
293 |
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") |
294 |
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake") |
295 |
-+# Make Pkg-Config required. |
296 |
-+find_package( PkgConfig ) |
297 |
- |
298 |
--find_package( PkgConfig QUIET ) |
299 |
-- |
300 |
--find_package( IlmBase QUIET ) |
301 |
-+PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase ) |
302 |
- if(IlmBase_FOUND) |
303 |
- message( STATUS "found IlmBase, version ${IlmBase_VERSION}" ) |
304 |
- ### |
305 |
-@@ -13,11 +10,11 @@ if(IlmBase_FOUND) |
306 |
- ### |
307 |
- include_directories( ${IlmBase_INCLUDE_DIRS} ) |
308 |
- link_directories( ${IlmBase_LIBRARY_DIRS} ) |
309 |
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" ) |
310 |
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" ) |
311 |
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) |
312 |
-- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) |
313 |
-- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" ) |
314 |
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) |
315 |
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" ) |
316 |
-+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) |
317 |
-+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) |
318 |
-+ set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" ) |
319 |
- else() |
320 |
- message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" ) |
321 |
- endif() |
322 |
-@@ -39,20 +36,20 @@ else() |
323 |
- endif() |
324 |
- endif() |
325 |
- |
326 |
--find_package( OpenEXR QUIET ) |
327 |
-+PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR ) |
328 |
- if (OpenEXR_FOUND) |
329 |
- message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" ) |
330 |
- else() |
331 |
- message( WARNING "Unable to find OpenEXR libraries, disabling" ) |
332 |
- endif() |
333 |
- |
334 |
--find_package( AcesContainer ) |
335 |
--if (AcesContainer_FOUND) |
336 |
-- message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) |
337 |
--else() |
338 |
-- if ( PKG_CONFIG_FOUND ) |
339 |
-- pkg_check_modules( AcesContainer AcesContainer ) |
340 |
-- else() |
341 |
-- message( WARNING "Unable to find AcesContainer libraries, disabling" ) |
342 |
-- endif() |
343 |
--endif() |
344 |
-+find_package( AcesContainer ) |
345 |
-+ if (AcesContainer_FOUND) |
346 |
-+ message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" ) |
347 |
-+ else() |
348 |
-+ if ( PKG_CONFIG_FOUND ) |
349 |
-+ pkg_check_modules( AcesContainer AcesContainer ) |
350 |
-+ else() |
351 |
-+ message( WARNING "Unable to find AcesContainer libraries, disabling" ) |
352 |
-+ endif() |
353 |
-+ endif() |
354 |
-diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt |
355 |
-index 9fced14..d97093d 100644 |
356 |
---- a/ctlrender/CMakeLists.txt |
357 |
-+++ b/ctlrender/CMakeLists.txt |
358 |
-@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} ) |
359 |
- link_directories( ${OpenEXR_LIBRARY_DIRS} ) |
360 |
- endif() |
361 |
- |
362 |
--if ( AcesContainer_FOUND ) |
363 |
--add_definitions( -DHAVE_ACESFILE=1 ) |
364 |
--include_directories( ${AcesContainer_INCLUDE_DIRS} ) |
365 |
--link_directories( ${AcesContainer_LIBRARY_DIRS} ) |
366 |
--endif() |
367 |
-- |
368 |
-+if ( AcesContainer_FOUND ) |
369 |
-+add_definitions( -DHAVE_ACESFILE=1 ) |
370 |
-+include_directories( ${AcesContainer_INCLUDE_DIRS} ) |
371 |
-+link_directories( ${AcesContainer_LIBRARY_DIRS} ) |
372 |
-+endif() |
373 |
-+ |
374 |
- 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" ) |
375 |
- |
376 |
- add_executable( ctlrender |
377 |
-@@ -41,9 +41,9 @@ if (OpenEXR_FOUND) |
378 |
- target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} ) |
379 |
- target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} ) |
380 |
- endif() |
381 |
--if (AcesContainer_FOUND) |
382 |
--target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) |
383 |
--target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) |
384 |
-+if (AcesContainer_FOUND) |
385 |
-+target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} ) |
386 |
-+target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} ) |
387 |
- endif() |
388 |
- |
389 |
--install( TARGETS ctlrender DESTINATION bin ) |
390 |
-+install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
391 |
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt |
392 |
-index 0b123d0..9776205 100644 |
393 |
---- a/doc/CMakeLists.txt |
394 |
-+++ b/doc/CMakeLists.txt |
395 |
-@@ -1 +1 @@ |
396 |
--install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL ) |
397 |
-+install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} ) |
398 |
-diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt |
399 |
-index 3672a43..ef301bd 100644 |
400 |
---- a/lib/IlmCtl/CMakeLists.txt |
401 |
-+++ b/lib/IlmCtl/CMakeLists.txt |
402 |
-@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED} |
403 |
- ) |
404 |
- |
405 |
- target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} ) |
406 |
--target_link_libraries( IlmCtl Iex IlmThread Half ) |
407 |
-+target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} ) |
408 |
- |
409 |
- set_target_properties( IlmCtl PROPERTIES |
410 |
- VERSION ${CTL_VERSION} |
411 |
-@@ -50,4 +50,4 @@ install( FILES |
412 |
- CtlVersion.h |
413 |
- DESTINATION include/CTL ) |
414 |
- |
415 |
--install( TARGETS IlmCtl DESTINATION lib ) |
416 |
-+install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
417 |
-diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt |
418 |
-index 96738cf..6997c74 100644 |
419 |
---- a/lib/IlmCtlMath/CMakeLists.txt |
420 |
-+++ b/lib/IlmCtlMath/CMakeLists.txt |
421 |
-@@ -18,8 +18,8 @@ install( FILES |
422 |
- CtlLookupTable.h |
423 |
- CtlRbfInterpolator.h |
424 |
- CtlSparseMatrix.h |
425 |
-- DESTINATION include/CTL ) |
426 |
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) |
427 |
- |
428 |
--install( TARGETS IlmCtlMath DESTINATION lib ) |
429 |
-+install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
430 |
- |
431 |
- # TODO Add Imath and Iex libadd dependency and version info |
432 |
-diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt |
433 |
-index 2ba792a..5eaf87d 100644 |
434 |
---- a/lib/IlmCtlSimd/CMakeLists.txt |
435 |
-+++ b/lib/IlmCtlSimd/CMakeLists.txt |
436 |
-@@ -1,7 +1,7 @@ |
437 |
- include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" ) |
438 |
- |
439 |
- add_executable( halfExpLogTable halfExpLogTable.cpp ) |
440 |
--target_link_libraries( halfExpLogTable Half ) |
441 |
-+target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} ) |
442 |
- |
443 |
- add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" |
444 |
- COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h" |
445 |
-@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES |
446 |
- SOVERSION ${CTL_VERSION} |
447 |
- ) |
448 |
- |
449 |
--install( FILES CtlSimdInterpreter.h DESTINATION include/CTL ) |
450 |
-+install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL ) |
451 |
- |
452 |
--install( TARGETS IlmCtlSimd DESTINATION lib ) |
453 |
-+install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
454 |
-diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt |
455 |
-index 47563df..784e27f 100644 |
456 |
---- a/lib/IlmImfCtl/CMakeLists.txt |
457 |
-+++ b/lib/IlmImfCtl/CMakeLists.txt |
458 |
-@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED} |
459 |
- ImfCtlCopyFunctionArg.cpp |
460 |
- ) |
461 |
- |
462 |
--target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half ) |
463 |
-+target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} ) |
464 |
- |
465 |
--install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR ) |
466 |
-+install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR ) |
467 |
- |
468 |
- export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" ) |
469 |
- |
470 |
--install( TARGETS IlmImfCtl DESTINATION lib ) |
471 |
-+install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
472 |
-diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt |
473 |
-index c8be26e..918890e 100644 |
474 |
---- a/lib/dpx/CMakeLists.txt |
475 |
-+++ b/lib/dpx/CMakeLists.txt |
476 |
-@@ -11,3 +11,4 @@ add_library( ctldpx |
477 |
- dpx_rw.cc |
478 |
- ) |
479 |
- |
480 |
-+target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) |
481 |
|
482 |
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch b/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch |
483 |
deleted file mode 100644 |
484 |
index 47b4cb538676..000000000000 |
485 |
--- a/media-libs/ctl/files/ctl-1.5.2-fix-to-build-with-gcc-11.patch |
486 |
+++ /dev/null |
487 |
@@ -1,25 +0,0 @@ |
488 |
-From: Bernd Waibel <waebbl-gentoo@××××××.net> |
489 |
-Date: Fri, 30 Jul 2021 17:33:47 +0200 |
490 |
-Subject: [PATCH] fix to build with gcc-11 |
491 |
- |
492 |
-Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
493 |
---- |
494 |
- lib/dpx/dpx.hh | 2 +- |
495 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
496 |
- |
497 |
-diff --git a/lib/dpx/dpx.hh b/lib/dpx/dpx.hh |
498 |
-index 02ae833..5639aaa 100644 |
499 |
---- a/lib/dpx/dpx.hh |
500 |
-+++ b/lib/dpx/dpx.hh |
501 |
-@@ -297,7 +297,7 @@ struct dpx { |
502 |
- compliance_e current_compliance; |
503 |
- endian_mode_e current_endian_mode; |
504 |
- |
505 |
-- std::istream::streampos header_start; |
506 |
-+ std::streampos header_start; |
507 |
- |
508 |
- public: |
509 |
- virtual ~dpx(); |
510 |
--- |
511 |
-2.32.0 |
512 |
- |
513 |
|
514 |
diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch b/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch |
515 |
deleted file mode 100644 |
516 |
index 56fa35de7a2a..000000000000 |
517 |
--- a/media-libs/ctl/files/ctl-1.5.2-fix-unit-tests.patch |
518 |
+++ /dev/null |
519 |
@@ -1,65 +0,0 @@ |
520 |
-From: Bernd Waibel <waebbl-gentoo@××××××.net> |
521 |
-Date: Fri, 30 Jul 2021 18:40:27 +0200 |
522 |
-Subject: [PATCH] fix unit tests |
523 |
- |
524 |
-Add cstring #include where necessary and drop segfaulting test |
525 |
- |
526 |
-Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
527 |
---- |
528 |
- unittest/CMakeLists.txt | 1 - |
529 |
- unittest/IlmCtl/testExamples.cpp | 1 + |
530 |
- unittest/IlmCtl/testVarying.cpp | 1 + |
531 |
- unittest/IlmCtl/testVaryingReturn.cpp | 1 + |
532 |
- 4 files changed, 3 insertions(+), 1 deletion(-) |
533 |
- |
534 |
-diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt |
535 |
-index 553b553..1cfbc9b 100644 |
536 |
---- a/unittest/CMakeLists.txt |
537 |
-+++ b/unittest/CMakeLists.txt |
538 |
-@@ -3,7 +3,6 @@ enable_testing() |
539 |
- |
540 |
- add_custom_target( check COMMAND ${CMAKE_CTEST_COMMAND} ) |
541 |
- |
542 |
--add_subdirectory( IlmCtl ) |
543 |
- add_subdirectory( IlmCtlMath ) |
544 |
- add_subdirectory( IlmImfCtl ) |
545 |
- add_subdirectory( ctlrender ) |
546 |
-diff --git a/unittest/IlmCtl/testExamples.cpp b/unittest/IlmCtl/testExamples.cpp |
547 |
-index ccd2183..180b7d3 100644 |
548 |
---- a/unittest/IlmCtl/testExamples.cpp |
549 |
-+++ b/unittest/IlmCtl/testExamples.cpp |
550 |
-@@ -56,6 +56,7 @@ |
551 |
- #include <CtlFunctionCall.h> |
552 |
- #include <CtlType.h> |
553 |
- #include <assert.h> |
554 |
-+#include <cstring> |
555 |
- |
556 |
- |
557 |
- using namespace Ctl; |
558 |
-diff --git a/unittest/IlmCtl/testVarying.cpp b/unittest/IlmCtl/testVarying.cpp |
559 |
-index 90ab05d..4079ca6 100755 |
560 |
---- a/unittest/IlmCtl/testVarying.cpp |
561 |
-+++ b/unittest/IlmCtl/testVarying.cpp |
562 |
-@@ -62,6 +62,7 @@ |
563 |
- #include <assert.h> |
564 |
- #include <sstream> |
565 |
- #include <limits> |
566 |
-+#include <cstring> |
567 |
- #include <half.h> |
568 |
- #include <testVarying.h> |
569 |
- |
570 |
-diff --git a/unittest/IlmCtl/testVaryingReturn.cpp b/unittest/IlmCtl/testVaryingReturn.cpp |
571 |
-index eb91d31..d7ab083 100644 |
572 |
---- a/unittest/IlmCtl/testVaryingReturn.cpp |
573 |
-+++ b/unittest/IlmCtl/testVaryingReturn.cpp |
574 |
-@@ -62,6 +62,7 @@ |
575 |
- #include <assert.h> |
576 |
- #include <sstream> |
577 |
- #include <limits> |
578 |
-+#include <cstring> |
579 |
- #include <half.h> |
580 |
- #include <testVarying.h> |
581 |
- |
582 |
--- |
583 |
-2.32.0 |
584 |
- |
585 |
|
586 |
diff --git a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch b/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch |
587 |
deleted file mode 100644 |
588 |
index 96e8b268f49b..000000000000 |
589 |
--- a/media-libs/ctl/files/ctl-1.5.2-install-dpx-library.patch |
590 |
+++ /dev/null |
591 |
@@ -1,21 +0,0 @@ |
592 |
-From: Bernd Waibel <waebbl-gentoo@××××××.net> |
593 |
-Date: Fri, 30 Jul 2021 17:54:15 +0200 |
594 |
-Subject: [PATCH] install dpx library |
595 |
- |
596 |
-Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
597 |
---- |
598 |
- lib/dpx/CMakeLists.txt | 1 + |
599 |
- 1 file changed, 1 insertion(+) |
600 |
- |
601 |
-diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt |
602 |
-index 918890e..2ed69d1 100644 |
603 |
---- a/lib/dpx/CMakeLists.txt |
604 |
-+++ b/lib/dpx/CMakeLists.txt |
605 |
-@@ -12,3 +12,4 @@ add_library( ctldpx |
606 |
- ) |
607 |
- |
608 |
- target_link_libraries( ctldpx ${IlmBase_LIBRARIES} ) |
609 |
-+install( TARGETS ctldpx DESTINATION ${CMAKE_INSTALL_LIBDIR} ) |
610 |
--- |
611 |
-2.32.0 |
612 |
- |
613 |
|
614 |
diff --git a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch b/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch |
615 |
deleted file mode 100644 |
616 |
index ac4ceb3e5487..000000000000 |
617 |
--- a/media-libs/ctl/files/ctl-1.5.2-openexr-2.3.patch |
618 |
+++ /dev/null |
619 |
@@ -1,13 +0,0 @@ |
620 |
-Index: CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp |
621 |
-=================================================================== |
622 |
---- CTL-ctl-1.5.2.orig/lib/IlmCtlSimd/CtlSimdInst.cpp |
623 |
-+++ CTL-ctl-1.5.2/lib/IlmCtlSimd/CtlSimdInst.cpp |
624 |
-@@ -189,7 +189,7 @@ SimdInst::executePath (SimdBoolMask &mas |
625 |
- REPLACE_EXC |
626 |
- (e, "\n" << |
627 |
- xcontext.fileName() << ":" << |
628 |
-- inst->lineNumber() << ": " << e); |
629 |
-+ inst->lineNumber() << ": " << e.what()); |
630 |
- |
631 |
- throw e; |
632 |
- } |