commit: 5a1d9ccaaa866fd0a831653dc92588fc59be0085 Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> AuthorDate: Mon Mar 14 06:01:38 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Apr 10 21:01:49 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a1d9cca
media-libs/openexr: drop 3.1.2, 3.1.3, 3.1.4 Cleanup old and vulnerable slot 3 versions. Bug: https://bugs.gentoo.org/817431 Bug: https://bugs.gentoo.org/820674 Bug: https://bugs.gentoo.org/830384 Closes: https://bugs.gentoo.org/833158 Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/openexr/Manifest | 2 - ...1-0001-changes-needed-for-proper-slotting.patch | 119 ---------- ...0002-add-version-to-binaries-for-slotting.patch | 252 --------------------- media-libs/openexr/openexr-3.1.2.ebuild | 78 ------- media-libs/openexr/openexr-3.1.3.ebuild | 78 ------- media-libs/openexr/openexr-3.1.4.ebuild | 78 ------- 6 files changed, 607 deletions(-) diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index ea9445536baa..39b88ea65170 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,4 +1,2 @@ DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40 -DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b120e5683137a0b38f64e2862c226aebff7c17e79344da4a1be5a1967fb8ab0493ff919a7fb5bec16b34e494e49e2 SHA512 34fb28f149e49bb23b2dc230dd5277229f2c780de66aff0acc819601e6802a1dbf83110b5df455dffd63be6eaa286d4aedb4b0af559b8b034d98c3208ee9d969 -DIST openexr-3.1.3.tar.gz 20322346 BLAKE2B e65cb00d1d9ae7544f6d1adf9c6f05193986b8de7b657fa22d20466f2b6dfccf244b5aa3dbe7f2abb0c934aec68d2007dd9edb3eeee91b2bbd8aab331eea7e90 SHA512 12a8f3660104e68ccea0856caf334d1fafbf0ee79115aae23cdce5b835299294ab8a23bafed282acfacd159ce9bc7f6ffc620b1e0df0d40f9ca0eb15a288964d DIST openexr-3.1.4.tar.gz 20323658 BLAKE2B d3726023f920fa719b1832d3be2df36a95cac8c67fdd4b23a7166398a282fa01d5c07065afd92f7b28f178c47843f82eb7a0f2b77742725b359c8f275d2ef1d0 SHA512 612ab3467f9ccf2779e1592361cb07459571122e10c0a0b3020430cfa34fa3b91ca1d63cc12a5f85d5b53b277b3f7a88862e6477f0f3566a4196b8245f6bfe12 diff --git a/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch deleted file mode 100644 index 29aef05acf5a..000000000000 --- a/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch +++ /dev/null @@ -1,119 +0,0 @@ -From: Bernd Waibel <waebbl-gen...@posteo.net> -Date: Tue, 3 Aug 2021 19:50:40 +0200 -Subject: [PATCH 1/2] changes needed for proper slotting - -Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net> ---- - cmake/CMakeLists.txt | 8 ++++---- - cmake/LibraryDefine.cmake | 8 ++++---- - cmake/OpenEXR.pc.in | 4 ++-- - cmake/OpenEXRLibraryDefine.cmake | 8 ++++---- - 4 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index 79497d9..a22afd1 100644 ---- a/cmake/CMakeLists.txt -+++ b/cmake/CMakeLists.txt -@@ -205,7 +205,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG) - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig - ) - endfunction() -- openexr_pkg_config_help(OpenEXR.pc.in) -+ openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in) - else() - message(STATUS "-- pkg-config generation disabled") - endif() -@@ -225,7 +225,7 @@ include(CMakePackageConfigHelpers) - if(OPENEXR_INSTALL) - configure_package_config_file(${PROJECT_NAME}Config.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${PROJECT_VERSION} -@@ -234,11 +234,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} - ) - - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR} - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake -index 5696f3f..b4787b1 100644 ---- a/cmake/LibraryDefine.cmake -+++ b/cmake/LibraryDefine.cmake -@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - install(TARGETS ${libname} - EXPORT ${PROJECT_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - PUBLIC_HEADER - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR} -@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")") -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -+ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")") - set(verlibname) - set(baselibname) - endif() -diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in -index a74979b..e124b8f 100644 ---- a/cmake/OpenEXR.pc.in -+++ b/cmake/OpenEXR.pc.in -@@ -5,9 +5,9 @@ - - prefix=@prefix@ - exec_prefix=@exec_prefix@ --libdir=@libdir@ -+libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@ - includedir=@includedir@ --OpenEXR_includedir=@includedir@/OpenEXR -+OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@ - libsuffix=@LIB_SUFFIX_DASH@ - - Name: OpenEXR -diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake -index c6ddd2e..0dc3663 100644 ---- a/cmake/OpenEXRLibraryDefine.cmake -+++ b/cmake/OpenEXRLibraryDefine.cmake -@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - install(TARGETS ${libname} - EXPORT ${PROJECT_NAME} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - PUBLIC_HEADER - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR} -@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname) - string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${baselibname} -> ${verlibname}\")") -+ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -+ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")") - set(verlibname) - set(baselibname) - endif() --- -2.32.0 - diff --git a/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch deleted file mode 100644 index d2f6dcd4bc33..000000000000 --- a/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch +++ /dev/null @@ -1,252 +0,0 @@ -From: Bernd Waibel <waebbl-gen...@posteo.net> -Date: Tue, 3 Aug 2021 20:00:34 +0200 -Subject: [PATCH 2/2] add version to binaries for slotting - -Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net> ---- - src/bin/exr2aces/CMakeLists.txt | 10 +++++----- - src/bin/exrenvmap/CMakeLists.txt | 10 +++++----- - src/bin/exrheader/CMakeLists.txt | 10 +++++----- - src/bin/exrinfo/CMakeLists.txt | 10 +++++----- - src/bin/exrmakepreview/CMakeLists.txt | 10 +++++----- - src/bin/exrmaketiled/CMakeLists.txt | 10 +++++----- - src/bin/exrmultipart/CMakeLists.txt | 10 +++++----- - src/bin/exrmultiview/CMakeLists.txt | 10 +++++----- - src/bin/exrstdattr/CMakeLists.txt | 10 +++++----- - 9 files changed, 45 insertions(+), 45 deletions(-) - -diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt -index 72c4e1c..01b806f 100644 ---- a/src/bin/exr2aces/CMakeLists.txt -+++ b/src/bin/exr2aces/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exr2aces main.cpp) --target_link_libraries(exr2aces OpenEXR::OpenEXR) --set_target_properties(exr2aces PROPERTIES -+add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp) -+target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt -index c798a65..3d35a19 100644 ---- a/src/bin/exrenvmap/CMakeLists.txt -+++ b/src/bin/exrenvmap/CMakeLists.txt -@@ -1,7 +1,7 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable( exrenvmap -+add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR} - blurImage.cpp - EnvmapImage.cpp - main.cpp -@@ -11,13 +11,13 @@ add_executable( exrenvmap - resizeImage.cpp - ) - --target_link_libraries(exrenvmap OpenEXR::OpenEXR) --set_target_properties(exrenvmap PROPERTIES -+target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt -index c427445..8cdbb8e 100644 ---- a/src/bin/exrheader/CMakeLists.txt -+++ b/src/bin/exrheader/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrheader main.cpp) --target_link_libraries(exrheader OpenEXR::OpenEXR) --set_target_properties(exrheader PROPERTIES -+add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp) -+target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrheader PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrinfo/CMakeLists.txt b/src/bin/exrinfo/CMakeLists.txt -index 19ace5f..07aee1a 100644 ---- a/src/bin/exrinfo/CMakeLists.txt -+++ b/src/bin/exrinfo/CMakeLists.txt -@@ -1,12 +1,12 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright Contributors to the OpenEXR Project. - --add_executable(exrinfo main.c) --target_link_libraries(exrinfo OpenEXR::OpenEXRCore) --set_target_properties(exrinfo PROPERTIES -+add_executable(exrinfo-${OpenEXR_VERSION_MAJOR} main.c) -+target_link_libraries(exrinfo-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXRCore) -+set_target_properties(exrinfo-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) --install(TARGETS exrinfo DESTINATION ${CMAKE_INSTALL_BINDIR}) -+install(TARGETS exrinfo-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - if(WIN32 AND (BUILD_SHARED_LIBS OR OPENEXR_BUILD_BOTH_STATIC_SHARED)) -- target_compile_definitions(exrinfo PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrinfo-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt -index bb8b548..8b5e441 100644 ---- a/src/bin/exrmakepreview/CMakeLists.txt -+++ b/src/bin/exrmakepreview/CMakeLists.txt -@@ -1,17 +1,17 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrmakepreview -+add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR} - main.cpp - makePreview.cpp - ) --target_link_libraries(exrmakepreview OpenEXR::OpenEXR) --set_target_properties(exrmakepreview PROPERTIES -+target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt -index 1bc6cf4..6e70cf6 100644 ---- a/src/bin/exrmaketiled/CMakeLists.txt -+++ b/src/bin/exrmaketiled/CMakeLists.txt -@@ -1,18 +1,18 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors (c) to the OpenEXR Project. - --add_executable(exrmaketiled -+add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR} - Image.cpp - main.cpp - makeTiled.cpp - ) --target_link_libraries(exrmaketiled OpenEXR::OpenEXR) --set_target_properties(exrmaketiled PROPERTIES -+target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt -index 7f8fc1b..3770506 100644 ---- a/src/bin/exrmultipart/CMakeLists.txt -+++ b/src/bin/exrmultipart/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrmultipart exrmultipart.cpp) --target_link_libraries(exrmultipart OpenEXR::OpenEXR) --set_target_properties(exrmultipart PROPERTIES -+add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp) -+target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt -index 05ad081..9e535ad 100644 ---- a/src/bin/exrmultiview/CMakeLists.txt -+++ b/src/bin/exrmultiview/CMakeLists.txt -@@ -1,18 +1,18 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrmultiview -+add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR} - Image.cpp - main.cpp - makeMultiView.cpp - ) --target_link_libraries(exrmultiview OpenEXR::OpenEXR) --set_target_properties(exrmultiview PROPERTIES -+target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() -diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt -index 79205fc..3ad0ffe 100644 ---- a/src/bin/exrstdattr/CMakeLists.txt -+++ b/src/bin/exrstdattr/CMakeLists.txt -@@ -1,14 +1,14 @@ - # SPDX-License-Identifier: BSD-3-Clause - # Copyright (c) Contributors to the OpenEXR Project. - --add_executable(exrstdattr main.cpp) --target_link_libraries(exrstdattr OpenEXR::OpenEXR) --set_target_properties(exrstdattr PROPERTIES -+add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp) -+target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR) -+set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" - ) - if(OPENEXR_INSTALL_TOOLS) -- install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR}) -+ install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - if(WIN32 AND BUILD_SHARED_LIBS) -- target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL) -+ target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL) - endif() --- -2.32.0 - diff --git a/media-libs/openexr/openexr-3.1.2.ebuild b/media-libs/openexr/openexr-3.1.2.ebuild deleted file mode 100644 index 5fb127134ee7..000000000000 --- a/media-libs/openexr/openexr-3.1.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN=OpenEXR -MY_PV=$(ver_cut 1) -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/"; -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.0:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/breathe ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" - - cmake_src_prepare - - mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DBUILD_TESTING=$(usex test) - -DDOCS=$(usex doc) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_OUTPUT_SUBDIR="${MY_P}" - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - cmake_src_install - - newenvd - 99${PN}3 <<-EOF - LDPATH=/usr/$(get_libdir)/${MY_P} - EOF -} diff --git a/media-libs/openexr/openexr-3.1.3.ebuild b/media-libs/openexr/openexr-3.1.3.ebuild deleted file mode 100644 index afd43341887c..000000000000 --- a/media-libs/openexr/openexr-3.1.3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN=OpenEXR -MY_PV=$(ver_cut 1) -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/"; -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.0:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/breathe ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" - - cmake_src_prepare - - mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DBUILD_TESTING=$(usex test) - -DDOCS=$(usex doc) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_OUTPUT_SUBDIR="${MY_P}" - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - cmake_src_install - - newenvd - 99${PN}3 <<-EOF - LDPATH=/usr/$(get_libdir)/${MY_P} - EOF -} diff --git a/media-libs/openexr/openexr-3.1.4.ebuild b/media-libs/openexr/openexr-3.1.4.ebuild deleted file mode 100644 index de5d41a68c51..000000000000 --- a/media-libs/openexr/openexr-3.1.4.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake - -MY_PN=OpenEXR -MY_PV=$(ver_cut 1) -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/"; -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="3/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/imath-3.1.0:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/breathe ) - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.1.1-0001-changes-needed-for-proper-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0002-add-version-to-binaries-for-slotting.patch - "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch -) - -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests" - - cmake_src_prepare - - mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_SHARED_LIBS=$(usex !static-libs) - -DBUILD_TESTING=$(usex test) - -DDOCS=$(usex doc) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_OUTPUT_SUBDIR="${MY_P}" - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - cmake_src_install - - newenvd - 99${PN}3 <<-EOF - LDPATH=/usr/$(get_libdir)/${MY_P} - EOF -}
