* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2021-10-17 2:22 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-10-17 2:22 UTC (permalink / raw
To: gentoo-commits
commit: 9af6007e2580aaabd795a2ec271492baca24bf4f
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Oct 11 19:25:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 17 02:22:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af6007e
media-libs/openexr: drop 3.0.5
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/openexr/Manifest | 1 -
...5-0001-changes-needed-for-proper-slotting.patch | 119 -----------
...0002-add-version-to-binaries-for-slotting.patch | 229 ---------------------
media-libs/openexr/openexr-3.0.5.ebuild | 78 -------
4 files changed, 427 deletions(-)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index ec127757ba7..242cfc52c43 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,5 +1,4 @@
DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
DIST openexr-3.1.1.tar.gz 25588029 BLAKE2B c2ce9622ad7b8a328ce556b6120a868cddb86e908917e001f543e70501b6d31ce549fc10d65806dd9d63e63872b273ad3a1d4f6813b5d23ea238c238f5815304 SHA512 430becbb214cedec5a57e9ff2363badd8a2d94e8a00edffbc75fbcf30d26d887a6eb3f4ff96e371cb26f9d44e63bf0fe2dc511493a0951171ddc64bba7aed735
DIST openexr-3.1.2.tar.gz 20315253 BLAKE2B d11f26d3e2bb098c4c009271b40da1eca97b120e5683137a0b38f64e2862c226aebff7c17e79344da4a1be5a1967fb8ab0493ff919a7fb5bec16b34e494e49e2 SHA512 34fb28f149e49bb23b2dc230dd5277229f2c780de66aff0acc819601e6802a1dbf83110b5df455dffd63be6eaa286d4aedb4b0af559b8b034d98c3208ee9d969
diff --git a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index 30991f423b0..00000000000
--- a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Fri, 2 Jul 2021 17:46:33 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@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 2014d27..7dfb2f2 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -200,7 +200,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()
-@@ -220,7 +220,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}
-@@ -229,11 +229,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 aa5bb46..2767420 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(\"-- Creating symlink in ${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(\"-- Creating symlink in ${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 7d9bb7c..c7e1dd6 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 8022e2e..9f919c8 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(\"-- Creating symlink in ${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(\"-- Creating symlink in ${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.0.5-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
deleted file mode 100644
index d6c6b532c87..00000000000
--- a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 22 May 2021 17:04:12 +0200
-Subject: [PATCH] add version to binaries for slotting
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/bin/exr2aces/CMakeLists.txt | 10 +++++-----
- src/bin/exrenvmap/CMakeLists.txt | 10 +++++-----
- src/bin/exrheader/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 +++++-----
- 8 files changed, 40 insertions(+), 40 deletions(-)
-
-diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt
-index 72c4e1c..ede5973 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 bbd26c0..cbe8401 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}
- makeLatLongMap.cpp
- readInputImage.cpp
- resizeImage.cpp
-@@ -11,13 +11,13 @@ add_executable( exrenvmap
- EnvmapImage.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..b8b0e9a 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/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt
-index bb8b548..03c0687 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 6c8dfa5..7116b54 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}
- makeTiled.cpp
- main.cpp
- Image.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..dad8c8d 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 bbac3a6..eba48c1 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}
- makeMultiView.cpp
- main.cpp
- Image.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..35ac580 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.31.1
-
diff --git a/media-libs/openexr/openexr-3.0.5.ebuild b/media-libs/openexr/openexr-3.0.5.ebuild
deleted file mode 100644
index 47c25d2cdfc..00000000000
--- a/media-libs/openexr/openexr-3.0.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic toolchain-funcs
-
-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/29" # based on SONAME
-# imath needs keywording: arm{,64}, hppa, ia64, ppc{,64}, sparc, x64-macos, x86-solaris
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~ia64 -ppc -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-${PV}:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
- "${FILESDIR}"/${P}-0002-add-version-to-binaries-for-slotting.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)
- -DOPENEXR_BUILD_UTILS=$(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() {
- if use doc; then
- DOCS+=( docs/*.pdf )
- fi
- use examples && docompress -x /usr/share/doc/${PF}/examples
- cmake_src_install
-
- cat > "${T}"/99${PN}3 <<-EOF || die
- LDPATH=/usr/$(get_libdir)/${MY_P}
- EOF
- doenvd "${T}"/99${PN}3
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2024-03-08 18:34 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-03-08 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 57202035b4521bf73359b43498fd4a735760c88b
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Mon Apr 10 17:23:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 18:34:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57202035
media-libs/openexr: fix x86 musl build for version 3.1.7
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Closes: https://github.com/gentoo/gentoo/pull/30542
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openexr/files/openexr-3.1.7-musl-i386.patch | 19 +++++++++++++++++++
media-libs/openexr/openexr-3.1.7.ebuild | 6 +++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch
new file mode 100644
index 000000000000..e2bedf6e7a12
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/Iex/IexMathFpu.cpp
++++ b/src/lib/Iex/IexMathFpu.cpp
+@@ -251,14 +251,14 @@
+ inline void
+ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ {
+-# if (defined(__GLIBC__) && defined(__i386__)) || defined(__ANDROID_API__)
++# if (defined(__linux__) && defined(__i386__)) || defined(__ANDROID_API__)
+ setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
+ #else
+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
+ # endif
+
+ _fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs);
+-# if defined(__GLIBC__) && defined(__i386__)
++# if defined(__linux__) && defined(__i386__)
+ setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
+ #else
+ setMxcsr (kfp->mxcsr, clearExceptions);
diff --git a/media-libs/openexr/openexr-3.1.7.ebuild b/media-libs/openexr/openexr-3.1.7.ebuild
index e3960f74c307..cedfef02a75b 100644
--- a/media-libs/openexr/openexr-3.1.7.ebuild
+++ b/media-libs/openexr/openexr-3.1.7.ebuild
@@ -25,7 +25,11 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
+ "${FILESDIR}"/${PN}-3.1.7-musl-i386.patch
+)
+
DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
src_prepare() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2024-03-08 18:34 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-03-08 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 31fffa9cf2491c4353f867ca66adadf8bf1e3e2a
Author: Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Mon Apr 10 17:15:53 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 18:34:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31fffa9c
media-libs/openexr: fix x86 musl build for version 3.1.5
Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openexr/files/openexr-3.1.5-musl-i386.patch | 19 +++++++++++++++++++
media-libs/openexr/openexr-3.1.5-r1.ebuild | 1 +
2 files changed, 20 insertions(+)
diff --git a/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch
new file mode 100644
index 000000000000..2b7a31ac694d
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch
@@ -0,0 +1,19 @@
+--- a/src/lib/Iex/IexMathFpu.cpp
++++ b/src/lib/Iex/IexMathFpu.cpp
+@@ -251,14 +251,14 @@
+ inline void
+ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ {
+-# if defined(__GLIBC__) && defined(__i386__)
++# if defined(__linux__) && defined(__i386__)
+ setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
+ #else
+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
+ # endif
+
+ _fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs);
+-# if defined(__GLIBC__) && defined(__i386__)
++# if defined(__linux__) && defined(__i386__)
+ setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
+ #else
+ setMxcsr (kfp->mxcsr, clearExceptions);
diff --git a/media-libs/openexr/openexr-3.1.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild
index a5039301aed5..8ec80d3071e3 100644
--- a/media-libs/openexr/openexr-3.1.5-r1.ebuild
+++ b/media-libs/openexr/openexr-3.1.5-r1.ebuild
@@ -32,6 +32,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
"${FILESDIR}"/${P}-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
"${FILESDIR}"/${P}-add-missed-include-cstdint-statement.patch
+ "${FILESDIR}"/${P}-musl-i386.patch
)
DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2022-09-28 8:19 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2022-09-28 8:19 UTC (permalink / raw
To: gentoo-commits
commit: eaa51858d9d2701d98839236338cad3acd3389c1
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Sep 27 17:23:45 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 08:19:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa51858
media-libs/openexr: fix build issue on x86
The package can fail to build on x86_32 if -march=native is set. This
sets the -mf16c intrinsic which isn't available on every x86_32 arch.
The patch replaces -march=native with -march=i686 if x86 is used.
Also disable a failing test for x86.
Closes: https://bugs.gentoo.org/840580
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27498
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
...openexr-3.1.5-drop-failing-testDwaLookups.patch | 29 ++++++++++++++++++++++
media-libs/openexr/openexr-3.1.5.ebuild | 10 +++++++-
2 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch b/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch
new file mode 100644
index 000000000000..7579ddd23156
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch
@@ -0,0 +1,29 @@
+From 6f3c61b994e9a503fcc9649cba439d81f40901d0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 27 Sep 2022 07:29:11 +0200
+Subject: [PATCH] drop failing testDwaLookups
+
+On x86_32 testDwaLookups fails
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/test/OpenEXRTest/main.cpp
++++ b/src/test/OpenEXRTest/main.cpp
+@@ -65,7 +65,6 @@
+ #include "testDwaCompressorSimd.h"
+ #include "testRle.h"
+ #include "testB44ExpLogTable.h"
+-#include "testDwaLookups.h"
+ #include "testIDManifest.h"
+
+ #include "tmpDir.h"
+@@ -229,7 +228,6 @@ main (int argc, char *argv[])
+ TEST (testDwaCompressorSimd, "basic");
+ TEST (testRle, "core");
+ TEST (testB44ExpLogTable, "core");
+- TEST (testDwaLookups, "core");
+ TEST (testIDManifest, "core");
+
+ // NB: If you add a test here, make sure to enumerate it in the
+--
+2.37.3
+
diff --git a/media-libs/openexr/openexr-3.1.5.ebuild b/media-libs/openexr/openexr-3.1.5.ebuild
index b13e0484bc86..14c4a1e4c3ba 100644
--- a/media-libs/openexr/openexr-3.1.5.ebuild
+++ b/media-libs/openexr/openexr-3.1.5.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-inherit cmake
+inherit cmake flag-o-matic
MY_PN=OpenEXR
@@ -43,10 +43,18 @@ src_prepare() {
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"
+ if use x86; then
+ eapply "${FILESDIR}"/${P}-drop-failing-testDwaLookups.patch
+ fi
+
cmake_src_prepare
}
src_configure() {
+ if use x86; then
+ replace-cpu-flags native i686
+ fi
+
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)
-DDOCS=$(usex doc)
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2022-07-03 23:54 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-07-03 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 0ec76bea6cf18532f4c7ec56e8e51db1e70c8ee3
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Jun 23 15:29:29 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 3 23:53:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec76bea
media-libs/openexr: fix typo for patches
Remove patch and bits for sparc machines regarding test patches.
Sparc is keyworded as -sparc, so this patch for failing tests will usually not
be needed.
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
...nexr-2.5.7-0001-disable-testRgba-on-sparc.patch | 31 ----------------------
media-libs/openexr/openexr-2.5.8.ebuild | 6 +----
2 files changed, 1 insertion(+), 36 deletions(-)
diff --git a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch b/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
deleted file mode 100644
index 368c9173d133..000000000000
--- a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 21 Jun 2021 12:03:02 +0200
-Subject: [PATCH] disable testRgba on sparc
-
-Fails on sparc, bug #656680 and issue
-https://github.com/openexr/openexr/issues/222
-
-Bug: https://bugs.gentoo.org/656680
-Bug: https://github.com/AcademySoftwareFoundation/openexr/issues/222
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- IlmImfTest/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
-index 3245fc4..3ba3e60 100644
---- a/IlmImfTest/main.cpp
-+++ b/IlmImfTest/main.cpp
-@@ -206,7 +206,7 @@ main (int argc, char *argv[])
- TEST (testXdr, "core");
- TEST (testHuf, "core");
- TEST (testWav, "core");
-- TEST (testRgba, "basic");
-+// TEST (testRgba, "basic");
- TEST (testLargeDataWindowOffsets, "basic");
- TEST (testSharedFrameBuffer, "basic");
- TEST (testRgbaThreading, "basic");
---
-2.32.0
-
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
index 9040c83eabdb..e5e93f2625bb 100644
--- a/media-libs/openexr/openexr-2.5.8.ebuild
+++ b/media-libs/openexr/openexr-2.5.8.ebuild
@@ -40,11 +40,7 @@ src_prepare() {
# Technically this doesn't disable anything, it just gives this test time to complete.
# Could probably be applied unconditionally but will leave this to the maintainers.
if use riscv; then
- eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch"
- fi
-
- if use sparc; then
- eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
+ eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch"
fi
fi
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2022-04-10 21:02 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2022-04-10 21:02 UTC (permalink / raw
To: gentoo-commits
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-gentoo@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-gentoo@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-gentoo@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-gentoo@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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2021-06-22 18:35 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-06-22 18:35 UTC (permalink / raw
To: gentoo-commits
commit: 075636aa0f50bf863c6185af87942ee1eca5e044
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Jun 21 22:38:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 22 18:35:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=075636aa
media-libs/openexr: bump to 2.5.7
Closes: https://bugs.gentoo.org/656680
Bug: https://bugs.gentoo.org/776808
Bug: https://bugs.gentoo.org/787452
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/openexr/Manifest | 1 +
...nexr-2.5.7-0001-disable-testRgba-on-sparc.patch | 31 ++++++++++
media-libs/openexr/openexr-2.5.7.ebuild | 68 ++++++++++++++++++++++
3 files changed, 100 insertions(+)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 70d32b88571..3c013834943 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,3 +1,4 @@
DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
+DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b
diff --git a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch b/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
new file mode 100644
index 00000000000..368c9173d13
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
@@ -0,0 +1,31 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 21 Jun 2021 12:03:02 +0200
+Subject: [PATCH] disable testRgba on sparc
+
+Fails on sparc, bug #656680 and issue
+https://github.com/openexr/openexr/issues/222
+
+Bug: https://bugs.gentoo.org/656680
+Bug: https://github.com/AcademySoftwareFoundation/openexr/issues/222
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ IlmImfTest/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
+index 3245fc4..3ba3e60 100644
+--- a/IlmImfTest/main.cpp
++++ b/IlmImfTest/main.cpp
+@@ -206,7 +206,7 @@ main (int argc, char *argv[])
+ TEST (testXdr, "core");
+ TEST (testHuf, "core");
+ TEST (testWav, "core");
+- TEST (testRgba, "basic");
++// TEST (testRgba, "basic");
+ TEST (testLargeDataWindowOffsets, "basic");
+ TEST (testSharedFrameBuffer, "basic");
+ TEST (testRgbaThreading, "basic");
+--
+2.32.0
+
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild
new file mode 100644
index 00000000000..7850aca1b9e
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/OpenEXR"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( PATENTS README.md )
+
+src_prepare() {
+ # Fix path for testsuite
+ sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+ # disable failing tests on various arches
+ if use test; then
+ if use abi_x86_32; then
+ eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
+ fi
+
+ if use sparc; then
+ eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
+ fi
+ fi
+
+ multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DINSTALL_OPENEXR_DOCS=$(usex doc)
+ -DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+ -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+ -DOPENEXR_BUILD_UTILS=$(usex utils)
+ -DOPENEXR_INSTALL_PKG_CONFIG=ON
+ -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_install_all() {
+ if use doc; then
+ DOCS+=( doc/*.pdf )
+ fi
+ einstalldocs
+
+ use examples && docompress -x /usr/share/doc/${PF}/examples
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2020-07-21 18:58 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2020-07-21 18:58 UTC (permalink / raw
To: gentoo-commits
commit: dffcb2e509541795dae8dc842d07fe44525fa277
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Tue Mar 3 22:46:55 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 18:58:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dffcb2e5
media-libs/openexr: bump to 2.5.2
Move from an autotools based ebuild to a cmake based one.
Solves CVE issues from bug #717474
Bug: https://bugs.gentoo.org/711456
Bug: https://bugs.gentoo.org/717474
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/openexr/Manifest | 1 +
....2-0001-IlmImfTest-main.cpp-disable-tests.patch | 40 ++++++++++++++
media-libs/openexr/metadata.xml | 7 ++-
media-libs/openexr/openexr-2.5.2.ebuild | 63 ++++++++++++++++++++++
4 files changed, 110 insertions(+), 1 deletion(-)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index dc720965b72..43470622055 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1 +1,2 @@
DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
+DIST openexr-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
diff --git a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
new file mode 100644
index 00000000000..a77705cb5a7
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
@@ -0,0 +1,40 @@
+From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Fri, 3 Jul 2020 15:34:47 +0200
+Subject: [PATCH] IlmImfTest/main.cpp: disable tests
+
+Disable testOptimizedInterleavePatterns and testDwaLookup, which
+are not working on x86.
+For testOptimizedInterleavePatterns, see
+https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ IlmImfTest/main.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
+index 3245fc4..4ab45b1 100644
+--- a/IlmImfTest/main.cpp
++++ b/IlmImfTest/main.cpp
+@@ -228,7 +228,7 @@ main (int argc, char *argv[])
+ TEST (testExistingStreams, "core");
+ TEST (testStandardAttributes, "core");
+ TEST (testOptimized, "basic");
+- TEST (testOptimizedInterleavePatterns, "basic");
++// TEST (testOptimizedInterleavePatterns, "basic");
+ TEST (testYca, "basic");
+ TEST (testTiledYa, "basic");
+ TEST (testNativeFormat, "basic");
+@@ -255,7 +255,7 @@ main (int argc, char *argv[])
+ TEST (testDwaCompressorSimd, "basic");
+ TEST (testRle, "core");
+ TEST (testB44ExpLogTable, "core");
+- TEST (testDwaLookups, "core");
++// TEST (testDwaLookups, "core");
+
+
+ //#ifdef ENABLE_IMFHUGETEST
+--
+2.27.0
+
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index fc9e500d69e..6214595905d 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -4,7 +4,12 @@
<maintainer type="project">
<email>media-video@gentoo.org</email>
</maintainer>
+ <use>
+ <flag name="utils">
+ Build several utility binaries for verifying and manipulating EXR files.
+ </flag>
+ </use>
<upstream>
- <remote-id type="github">openexr/openexr</remote-id>
+ <remote-id type="github">AcademySoftwareFoundation/openexr</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-libs/openexr/openexr-2.5.2.ebuild b/media-libs/openexr/openexr-2.5.2.ebuild
new file mode 100644
index 00000000000..7ea5a2cb683
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ media-libs/ilmbase:=
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${P}/OpenEXR"
+
+DOCS=( PATENTS README.md )
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfigInternal.h )
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Fix path for testsuite
+ sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+ if use abi_x86_32 && use test; then
+ eapply "${FILESDIR}/${P}-0001-IlmImfTest-main.cpp-disable-tests.patch"
+ fi
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DINSTALL_OPENEXR_DOCS=$(usex doc)
+ -DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+ -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+ -DOPENEXR_BUILD_UTILS=$(usex utils)
+ -DOPENEXR_INSTALL_PKG_CONFIG=ON # default
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_install_all() {
+ if use doc; then
+ DOCS+=( doc/*.pdf )
+ fi
+ einstalldocs
+
+ use examples && docompress -x /usr/share/doc/${PF}/examples
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2019-04-20 9:34 Pacho Ramos
0 siblings, 0 replies; 11+ messages in thread
From: Pacho Ramos @ 2019-04-20 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 76a4a88d277cf9a01e833f0ba8f09d5fa4826f14
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 09:34:02 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 09:34:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a4a88d
media-libs/openexr: Multiple test fixes from Debian
Closes: https://bugs.gentoo.org/656680
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../openexr/files/openexr-2.3.0-bigendian.patch | 71 ++++++++++++++++++++++
.../openexr/files/openexr-2.3.0-bigendian2.patch | 17 ++++++
.../files/openexr-2.3.0-skip-bogus-tests.patch | 31 ++++++++++
.../files/openexr-2.3.0-tests-32bits-2.patch | 17 ++++++
.../openexr/files/openexr-2.3.0-tests-32bits.patch | 36 +++++++++++
media-libs/openexr/openexr-2.3.0.ebuild | 9 ++-
6 files changed, 179 insertions(+), 2 deletions(-)
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
new file mode 100644
index 00000000000..0851fe95735
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
@@ -0,0 +1,71 @@
+Description: Fix test-suite on some big-endian archs
+Author: Dennis Gilmore <dennis@ausil.us>
+Bug-Debian: https://bugs.debian.org/793040
+Origin: vendor, https://github.com/openexr/openexr/issues/81
+Reviewed-by: Mathieu Malaterre <malat@debian.org>
+
+Index: openexr/IlmImfTest/testFutureProofing.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/testFutureProofing.cpp
++++ openexr/IlmImfTest/testFutureProofing.cpp
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <byteswap.h>
+
+ #include "tmpDir.h"
+ #include "testFutureProofing.h"
+@@ -64,6 +65,7 @@
+ #include <ImfNamespace.h>
+ #include <ImathNamespace.h>
+ #include <IlmThreadNamespace.h>
++#include <ImfSystemSpecific.h>
+
+ namespace IMF = OPENEXR_IMF_NAMESPACE;
+ using namespace IMF;
+@@ -1234,6 +1236,12 @@ modifyType (bool modify_version)
+
+ //length of attribute
+ fread(&length,4,1,f);
++ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
++ {
++ int tmp = bswap_32(length);
++ length = tmp;
++ }
++
+ if(!modify_version && attrib_name=="type")
+ {
+ // modify the type of part 1 to be 'X<whatevever>'
+Index: openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/testMultiPartFileMixingBasic.cpp
++++ openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <assert.h>
++#include <byteswap.h>
+
+ #include "tmpDir.h"
+ #include "testMultiPartFileMixingBasic.h"
+@@ -59,6 +60,7 @@
+ #include <ImfDeepScanLineInputPart.h>
+ #include <ImfPartType.h>
+ #include <ImfMisc.h>
++#include <ImfSystemSpecific.h>
+
+ namespace IMF = OPENEXR_IMF_NAMESPACE;
+ using namespace IMF;
+@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn
+
+ //length of attribute
+ fread(&length,4,1,f);
++ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
++ {
++ int tmp = bswap_32(length);
++ length = tmp;
++ }
+
+ //value of attribute
+ for(int i=0;i<length;i++)
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
new file mode 100644
index 00000000000..cf1ad7b0902
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
@@ -0,0 +1,17 @@
+Description: Upstream is not interested in big endian arch
+ Seems to only affect the test suite.
+Author: Mathieu Malaterre <malat@debian.org>
+
+Index: openexr/IlmImfTest/main.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/main.cpp
++++ openexr/IlmImfTest/main.cpp
+@@ -153,7 +153,7 @@ main (int argc, char *argv[])
+ TEST (testHuf, "core");
+ TEST (testWav, "core");
+ TEST (testRgba, "basic");
+- TEST (testSharedFrameBuffer, "basic");
++ //TEST (testSharedFrameBuffer, "basic");
+ TEST (testRgbaThreading, "basic");
+ TEST (testChannels, "basic");
+ TEST (testAttributes, "core");
diff --git a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
new file mode 100644
index 00000000000..360b9609b2d
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
@@ -0,0 +1,31 @@
+Description: Remove bogus test from suite
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/790495
+Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790495#15
+
+--- openexr-2.2.0.orig/IlmImfTest/testSampleImages.cpp
++++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp
+@@ -162,15 +162,15 @@ testSampleImages (const std::string&)
+ compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr",
+ ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr");
+
+- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
+- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
+- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
+- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
++// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
++// ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
++// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
++// ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
+
+- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
+- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
+- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
+- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
++// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
++// ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
++// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
++// ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
+
+
+ cout << "ok\n" << endl;
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
new file mode 100644
index 00000000000..bb3917d7996
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
@@ -0,0 +1,17 @@
+Description: Usual double rounding issue with x87
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/909865
+Forwarded: https://github.com/openexr/openexr/issues/346
+Last-Update: 2018-12-19
+
+--- openexr-2.3.0.orig/IlmImfTest/Makefile.am
++++ openexr-2.3.0/IlmImfTest/Makefile.am
+@@ -54,6 +54,8 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
+
+ AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
+
++AM_CPPFLAGS += -ffloat-store
++
+ if BUILD_IMFHUGETEST
+ IlmImfTest_SOURCES += testDeepScanLineHuge.cpp testDeepScanLineHuge.h
+ AM_CPPFLAGS += -DENABLE_IMFHUGETEST
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
new file mode 100644
index 00000000000..430bb20bcfa
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
@@ -0,0 +1,36 @@
+Description: Fix test-suite on some 32bits archs
+Author: Mathieu Malaterre <malat@debian.org>
+Bug-Debian: https://bugs.debian.org/791478
+
+Index: openexr/IlmImfTest/Makefile.am
+===================================================================
+--- openexr.orig/IlmImfTest/Makefile.am
++++ openexr/IlmImfTest/Makefile.am
+@@ -44,7 +44,6 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
+ testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp \
+ testPartHelper.h testPartHelper.cpp \
+ testOptimized.cpp testOptimized.h \
+- testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h \
+ testBadTypeAttributes.cpp testBadTypeAttributes.h \
+ testFutureProofing.cpp testFutureProofing.h \
+ compareDwa.cpp compareDwa.h \
+Index: openexr/IlmImfTest/main.cpp
+===================================================================
+--- openexr.orig/IlmImfTest/main.cpp
++++ openexr/IlmImfTest/main.cpp
+@@ -82,7 +82,6 @@
+ #include "testCopyMultiPartFile.h"
+ #include "testPartHelper.h"
+ #include "testOptimized.h"
+-#include "testOptimizedInterleavePatterns.h"
+ #include "testBadTypeAttributes.h"
+ #include "testFutureProofing.h"
+ #include "testPartHelper.h"
+@@ -174,7 +173,6 @@ main (int argc, char *argv[])
+ TEST (testExistingStreams, "core");
+ TEST (testStandardAttributes, "core");
+ TEST (testOptimized, "basic");
+- TEST (testOptimizedInterleavePatterns, "basic");
+ TEST (testYca, "basic");
+ TEST (testTiledYa, "basic");
+ TEST (testNativeFormat, "basic");
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index 70d1ef559dd..1db0ffc5bda 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -31,6 +31,12 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
"${FILESDIR}/${P}-fix-build-system.patch"
+ # From Debian
+ "${FILESDIR}/${PN}-2.3.0-tests-32bits.patch"
+ "${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch"
+ "${FILESDIR}/${PN}-2.3.0-bigendian.patch"
+ "${FILESDIR}/${PN}-2.3.0-bigendian2.patch"
+ "${FILESDIR}/${PN}-2.3.0-tests-32bits-2.patch"
)
src_prepare() {
@@ -66,6 +72,5 @@ multilib_src_install_all() {
rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
fi
- # package provides .pc files
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2018-10-11 18:42 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2018-10-11 18:42 UTC (permalink / raw
To: gentoo-commits
commit: 086e36c12dff193371ce5fe3e54fb9058f1e9d52
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sun Sep 30 19:45:39 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 18:42:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086e36c1
media-libs/openexr: bump to version 2.3.0
Closes: https://bugs.gentoo.org/639998
Suggested-by: Jonathan Scruggs <dracwyrm <AT> gentoo.org>
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/openexr/Manifest | 1 +
.../files/openexr-2.3.0-fix-build-system.patch | 68 +++++++++++++++++++++
media-libs/openexr/openexr-2.3.0.ebuild | 71 ++++++++++++++++++++++
3 files changed, 140 insertions(+)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 12cf82682b5..dee477215a0 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -2,3 +2,4 @@ DIST openexr-1.7.0.tar.gz 13542910 BLAKE2B f187aa1b7c703bc912bfc87eb6f9d44f1ed08
DIST openexr-2.0.1.tar.gz 12609335 BLAKE2B 25adcf5a679a0419a7ff0ddd29d4d1c5f1c28cd3fd6c81b0a5c0cc63d907e741eaea378f4ebaa9a66afce0349edf7231ebd2bb3e493aee484860c89f05f45960 SHA512 b35e3e795496f9d4a56352c907bcffef14ae062b189c4e1df35f3ab08c5e9abf829fa9149db3198d60088fa9633816650011e5f7871e07324801b95549d6695b
DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
+DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
new file mode 100644
index 00000000000..811a7af3875
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
@@ -0,0 +1,68 @@
+diff --git a/configure.ac b/configure.ac
+index 067f9d0..fdbe2f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
+ AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
+-AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+
+
+ LIBTOOL_CURRENT=24
+@@ -28,7 +27,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+
+ dnl
+@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG(
+ [ILMBASE])
+
+ dnl Define the version string
+-AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
+-AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
+@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading,
+ [multithread="${enableval}"], [multithread=yes])
+
+ AS_IF([test "x${multithread}" != xno], [
+- ACX_PTHREAD(
+- [
+- AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
+- ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
+- ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
+- CC="$PTHREAD_CC"
+-
+- AM_POSIX_SEM()
+- ],
+- [AC_MSG_ERROR([POSIX thread support required])])
++ AX_PTHREAD
+
+ AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
+
+@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip)
+ dnl AC_LANG_RESTORE
+ AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
+
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+
+ dnl Check to see if the toolset supports AVX instructions in inline asm
+ AC_ARG_ENABLE([avx],
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
new file mode 100644
index 00000000000..99f63d05e1f
--- /dev/null
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/24" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx examples static-libs"
+
+RDEPEND="
+ >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2016.09.16
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch"
+ "${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
+ "${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
+ "${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+src_prepare() {
+ default
+ # Fix path for testsuite
+ sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-imffuzztest
+ --disable-imfhugetest
+ --enable-threading
+ $(use_enable cpu_flags_x86_avx avx)
+ $(use_enable examples imfexamples)
+ $(use_enable static-libs static)
+ )
+
+ # TODO: check if this still applies on updates!
+ # internal tool dwaLookup fails to run when linked with gold linker
+ tc-ld-disable-gold
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
+ fi
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
@ 2016-10-10 22:26 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2016-10-10 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 9d9485b2bcb02cfd80680e6949a9f7e303687311
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sun Oct 9 18:02:45 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 22:25:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d9485b2
media-libs/openexr: revision bump to fix various build errors
Gentoo-bug: 520648, 585846
* EAPI=6
* Port to 'multilib-minimal'
* Fix build system to not require blocker
* Remove .la files
Signed off by: Jonathan Scruggs (j.scruggs <AT> gmail.com, irc: Dracwyrm)
Closes: https://github.com/gentoo/gentoo/pull/2520
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/openexr-2.2.0-fix-build-system.patch | 620 +++++++++++++++++++++
.../openexr-2.2.0-fix-config.h-collision.patch | 43 ++
.../openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch | 63 +++
...openexr-2.2.0-use-ull-for-64-bit-literals.patch | 60 ++
media-libs/openexr/openexr-2.2.0-r1.ebuild | 61 ++
5 files changed, 847 insertions(+)
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
new file mode 100644
index 00000000..446e4e5
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
@@ -0,0 +1,620 @@
+* Fix completely broken build system
+* Change pdf+examples installation directory
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,6 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+ AC_INIT(OpenEXR, 2.2.0)
++AC_CONFIG_MACRO_DIR([m4])
+
+ AC_SUBST(OPENEXR_VERSION_MAJOR, 2)
+ AC_SUBST(OPENEXR_VERSION_MINOR, 2)
+@@ -11,9 +12,8 @@
+
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
+-AC_CONFIG_HEADER(config/OpenEXRConfig.h)
+-AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
++AM_INIT_AUTOMAKE
+
+
+ LIBTOOL_CURRENT=22
+@@ -27,46 +27,21 @@
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+
+ dnl
+ dnl PKGCONFIG preparations
+ dnl
+-
+-if test -z "${PKG_CONFIG_PATH}"; then
+- PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+-fi
+-
+-LIB64_IF_EXISTS=""
+-if [[ -e /usr/lib64 ]]; then
+- LIB64_IF_EXISTS="-L/usr/lib64"
+-fi
+-
+-
+-
+-export PKG_CONFIG_PATH
+-
+-dnl
+-dnl get ccflags and libs from openexr packages, then check
+-dnl whether test programs compile
+-AM_PATH_PKGCONFIG(
+- [ILMBASE_CXXFLAGS],
+- [ILMBASE_LDFLAGS],
+- [ILMBASE_LIBS],
+- [IlmBase],
+- [OpenEXR],
+- [$LIB64_IF_EXISTS -L/usr/local/lib],
+- [-lImath -lHalf -lIex -lIlmThread -lpthread],
+- [ilmbase-prefix])
++PKG_CHECK_MODULES([ILMBASE], [IlmBase])
+
+
+ dnl Define the version string
+-AC_DEFINE_UNQUOTED(OPENEXR_VERSION_STRING, "${VERSION}")
+-AC_DEFINE_UNQUOTED(OPENEXR_PACKAGE_STRING, "${PACKAGE_STRING}")
+-AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MAJOR, ${OPENEXR_VERSION_MAJOR})
+-AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MINOR, ${OPENEXR_VERSION_MINOR})
+-AC_DEFINE_UNQUOTED(OPENEXR_VERSION_PATCH, ${OPENEXR_VERSION_PATCH})
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], [${VERSION}], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], [${PACKAGE_STRING}], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
+
+
+ dnl --enable-threading
+@@ -75,19 +50,16 @@
+ [enable multi-threading [[default=yes]]]),
+ [multithread="${enableval}"], [multithread=yes])
+
+-if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
+- ACX_PTHREAD(
+- [
+- AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
+- ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
+- ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
+- CC="$PTHREAD_CC"
+-
+- AM_POSIX_SEM()
+- ],
+- [AC_MSG_ERROR([POSIX thread support required])])
+- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
+-fi
++AS_IF([test "x${multithread}" != xno], [
++ AX_PTHREAD
++
++ AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
++
++ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
++ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
++ LIBS="${LIBS} ${PTHREAD_CFLAGS}"
++])
++
+
+ dnl --enable-large-stack
+ case "$host" in
+@@ -110,21 +82,25 @@
+ esac
+
+ if test "x${large_stack}" != xno ; then
+- AC_DEFINE(OPENEXR_IMF_HAVE_LARGE_STACK)
++ AC_DEFINE([OPENEXR_IMF_HAVE_LARGE_STACK], [1], [Define if large stack sizes are supported])
+ fi
+
+-AM_COMPILELINKRUN(
+- [IlmBase],
+- [ilmbasetest],
+- [$ILMBASE_CXXFLAGS],
+- [$ILMBASE_LDFLAGS],
+- [$ILMBASE_LIBS],[[
+-#include <stdlib.h>
+-#include <ImathFun.h>
+-]],
+- [[double d = IMATH_NAMESPACE::succd(.23); d+= .2;]],
+- AC_MSG_RESULT([Compiled and ran IlmBase test program.]),
+- AC_MSG_ERROR([Could not compile IlmBase test program.]))
++
++
++save_CXXFLAGS="${CXXFLAGS}"
++save_LIBS="${LIBS}"
++CXXFLAGS="${save_CXXFLAGS} ${ILMBASE_CFLAGS}"
++LIBS="${save_LIBS} ${ILMBASE_LIBS}"
++AC_LINK_IFELSE([
++ AC_LANG_PROGRAM([[
++ #include <stdlib.h>
++ #include <ImathFun.h>
++ ]], [[
++ double d = IMATH_NAMESPACE::succd(.23); d+= .2;
++ ]])
++])
++CXXFLAGS="${save_CXXFLAGS}"
++LIBS="${save_LIBS}"
+
+
+ dnl Checks for header files.
+@@ -137,74 +113,27 @@
+ AC_TYPE_SIZE_T
+
+ dnl Checks for zlib
+-AC_CHECK_LIB(z, compress,
+- [:],
+- [AC_MSG_ERROR([
+-*** OpenEXR requires a recent version of zlib, which you don't appear to
+-*** have.
+-***
+-*** This could be because the run-time linker is not finding zlib, or it
+-*** is finding the wrong version. In this case, you'll need to set your
+-*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point
+-*** to the proper version. Also, make sure you have run ldconfig if
+-*** that is required on your system.
+- ])]
+-)
++PKG_CHECK_MODULES([ZLIB], [zlib])
++
++
++dnl We use a modern toolchain, don't care
++dnl about ancient broken stuff
++AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
+
+-dnl Checks for std::right etc. in iomanip
+-AC_MSG_CHECKING(for complete iomanip support in C++ standard library)
+-complete_iomanip="no"
+-AC_LANG_SAVE
+-AC_LANG_CPLUSPLUS
+-AC_TRY_COMPILE([#include <iomanip>],[
+-
+- std::right;
+-],
+-AC_DEFINE(OPENEXR_IMF_HAVE_COMPLETE_IOMANIP) complete_iomanip=yes)
+-AC_MSG_RESULT($complete_iomanip)
+-AC_LANG_RESTORE
+-
+-
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+
+ dnl Check to see if the toolset supports AVX instructions in inline asm
+-AC_MSG_CHECKING(for AVX instructions in GCC style inline asm)
+-gcc_inline_asm_avx="no"
+-AC_COMPILE_IFELSE(
+- [
+- AC_LANG_PROGRAM([],
+- [
+- #if defined(__GNUC__) && defined(__SSE2__)
+- int n = 0;
+- int eax = 0;
+- int edx = 0;
+- __asm__(
+- "xgetbv \n"
+- "vzeroupper "
+- : "=a"(eax), "=d"(edx) : "c"(n) : );
+- #else
+- #error No GCC style inline asm supported for AVX instructions
+- #endif
+- ])
+- ],
+- [
+- gcc_inline_asm_avx="yes"
+- ],
+- [
+- gcc_inline_asm_avx="no"
+- ]
+-)
+-AC_MSG_RESULT([$gcc_inline_asm_avx])
+-if test "x${gcc_inline_asm_avx}" == xyes ; then
+- AC_DEFINE(OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX)
+-fi
++AC_ARG_ENABLE([avx],
++ AS_HELP_STRING([--enable-avx], [Enable avx optimization]))
++
++AS_IF([test "x$enable_avx" = "xyes"], [
++ dnl Enable AVX
++ gcc_inline_asm_avx="yes"
++ AC_DEFINE([OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX], [1], [Define if AVX is available])
++], [
++ dnl Disable AVX
++ gcc_inline_asm_avx="no"
++])
++
+
+ dnl Check if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count
+ AC_MSG_CHECKING([for sysconf(_SC_NPROCESSORS_ONLN)])
+@@ -221,16 +150,16 @@
+ )
+ AC_MSG_RESULT([$sysconf_nproc])
+ if test "x${sysconf_nproc}" == xyes ; then
+- AC_DEFINE(OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN)
++ AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
+ fi
+
+ dnl Platform-specific stuff
+ case "$host" in
+ *linux*)
+- AC_DEFINE(OPENEXR_IMF_HAVE_LINUX_PROCFS)
++ AC_DEFINE([OPENEXR_IMF_HAVE_LINUX_PROCFS], [1], [Define if procfs is available])
+ ;;
+ *darwin*)
+- AC_DEFINE(OPENEXR_IMF_HAVE_DARWIN)
++ AC_DEFINE([OPENEXR_IMF_HAVE_DARWIN], [1], [Define if on Darwin])
+
+ dnl OS X universal binary support, requires --disable-dependency-tracking
+ AC_ARG_ENABLE(osx-universal-binaries,
+@@ -245,19 +174,13 @@
+ --disable-dependency-tracking --enable-osx-universal-binary
+ ])
+ fi
+- CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
++ dnl CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+ dnl LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
+ fi
+
+ ;;
+ esac
+
+-AM_CFLAGS="$EXTRA_OPT_CFLAGS"
+-AM_CXXFLAGS="$EXTRA_OPT_CFLAGS"
+-
+-AC_SUBST(AM_CFLAGS)
+-AC_SUBST(AM_CXXFLAGS)
+-
+ dnl build imfexamples example program?
+ build_imfexamples="no"
+ AC_ARG_ENABLE(imfexamples,
+@@ -286,7 +209,7 @@
+ AM_CONDITIONAL(BUILD_IMFHUGETEST, test "x$build_imfhugetest" = xyes)
+
+ if test "x${build_imfhugetest}" != xno ; then
+- AC_DEFINE(OPENEXR_IMF_HUGETEST)
++ AC_DEFINE([OPENEXR_IMF_HUGETEST], [1], [Define if IlmImf huge input resilience])
+ fi
+
+
+@@ -307,19 +230,19 @@
+
+ lib_namespace="Imf"
+ if test "x${library_namespace_versioning}" == xyes ; then
+- AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf_${OPENEXR_VERSION_API})
+- AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
++ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR])
++ AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
+
+ lib_namespace="Imf_${OPENEXR_VERSION_API}"
+ LIB_SUFFIX="${OPENEXR_VERSION_API}"
+ lib_suffix_valid="yes"
+ elif test "x${library_namespace_versioning}" == xno ; then
+- AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf)
++ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
+
+ lib_namespace="Imf"
+ else
+- AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, ${library_namespace_versioning} )
+- AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
++ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [${library_namespace_versioning}], [OpenEXR])
++ AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
+
+ lib_namespace="${library_namespace_versioning}"
+ LIB_SUFFIX="${library_namespace_versioning}"
+@@ -349,14 +272,14 @@
+
+ if test "x${custom_usr_namespace}" == xyes ; then
+ AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'])
+- AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf)
++ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
+ usr_namespace="Imf"
+ elif test "x${custom_usr_namespace}" == xno ; then
+- AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf)
++ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
+ usr_namespace="Imf"
+ else
+- AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, ${custom_usr_namespace})
+- AC_DEFINE(OPENEXR_IMF_NAMESPACE_CUSTOM)
++ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [${custom_usr_namespace}], [OpenEXR])
++ AC_DEFINE([OPENEXR_IMF_NAMESPACE_CUSTOM], [1], [OpenEXR])
+
+ usr_namespace=${custom_usr_namespace}
+ fi
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -6,5 +6,4 @@
+ InterpretingDeepPixels.pdf \
+ TheoryDeepPixels.pdf
+
+-docdir=$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@
+ doc_DATA = $(EXTRA_DIST)
+--- a/exrenvmap/Makefile.am
++++ b/exrenvmap/Makefile.am
+@@ -4,11 +4,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+-LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
++LDADD = $(ILMBASE_LIBS) \
+ $(top_builddir)/IlmImf/libIlmImf.la \
+- -lz
++ $(ZLIB_LIBS)
+
+ exrenvmap_SOURCES = main.cpp EnvmapImage.cpp EnvmapImage.h \
+ readInputImage.cpp readInputImage.h \
+--- a/exrheader/Makefile.am
++++ b/exrheader/Makefile.am
+@@ -4,11 +4,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+-LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
++LDADD = $(ILMBASE_LIBS) \
+ $(top_builddir)/IlmImf/libIlmImf.la \
+- -lz
++ $(ZLIB_LIBS)
+
+ exrheader_SOURCES = main.cpp
+
+--- a/exrmakepreview/Makefile.am
++++ b/exrmakepreview/Makefile.am
+@@ -4,11 +4,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+-LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
++LDADD = $(ILMBASE_LIBS) \
+ $(top_builddir)/IlmImf/libIlmImf.la \
+- -lz
++ $(ZLIB_LIBS)
+
+ exrmakepreview_SOURCES = main.cpp makePreview.cpp makePreview.h
+
+--- a/exrmaketiled/Makefile.am
++++ b/exrmaketiled/Makefile.am
+@@ -4,11 +4,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+-LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
++LDADD = $(ILMBASE_LIBS) \
+ $(top_builddir)/IlmImf/libIlmImf.la \
+- -lz
++ $(ZLIB_LIBS)
+
+ exrmaketiled_SOURCES = main.cpp \
+ Image.h Image.cpp \
+--- a/exrmultipart/Makefile.am
++++ b/exrmultipart/Makefile.am
+@@ -4,11 +4,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+-@ILMBASE_CXXFLAGS@
++$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+-LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
+-$(top_builddir)/IlmImf/libIlmImf.la \
+--lz
++LDADD = $(ILMBASE_LIBS) \
++ $(top_builddir)/IlmImf/libIlmImf.la \
++ $(ZLIB_LIBS)
+
+ exrmultipart_SOURCES = exrmultipart.cpp
+
+--- a/exrmultiview/Makefile.am
++++ b/exrmultiview/Makefile.am
+@@ -4,11 +4,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+-LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
++LDADD = $(ILMBASE_LIBS) \
+ $(top_builddir)/IlmImf/libIlmImf.la \
+- -lz
++ $(ZLIB_LIBS)
+
+ exrmultiview_SOURCES = main.cpp \
+ Image.h Image.cpp \
+--- a/exrstdattr/Makefile.am
++++ b/exrstdattr/Makefile.am
+@@ -4,11 +4,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+-LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
++LDADD = $(ILMBASE_LIBS) \
+ $(top_builddir)/IlmImf/libIlmImf.la \
+- -lz
++ $(ZLIB_LIBS)
+
+ exrstdattr_SOURCES = main.cpp CMakeLists.txt
+
+--- a/IlmImf/Makefile.am
++++ b/IlmImf/Makefile.am
+@@ -93,7 +93,7 @@
+ ImfSystemSpecific.cpp ImfZip.h ImfZip.cpp
+
+
+-libIlmImf_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
++libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
+ -no-undefined
+
+
+@@ -102,7 +102,7 @@
+ endif
+
+
+-libIlmImf_la_LIBADD = -lz @ILMBASE_LIBS@
++libIlmImf_la_LIBADD = $(ZLIB_LIBS) $(ILMBASE_LIBS)
+
+ libIlmImfincludedir = $(includedir)/OpenEXR
+
+@@ -188,20 +188,21 @@
+ EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
+
+
+-INCLUDES = @ILMBASE_CXXFLAGS@ \
+- -I$(top_builddir) \
+- -I$(top_srcdir)/config
++INCLUDES = \
++ -I$(top_builddir) \
++ -I$(top_srcdir)/config \
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+ CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h
+
+ b44ExpLogTable_SOURCES = b44ExpLogTable.cpp
+-b44ExpLogTable_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
++b44ExpLogTable_LDADD = $(ILMBASE_LIBS)
+
+ b44ExpLogTable.h: b44ExpLogTable
+ ./b44ExpLogTable > b44ExpLogTable.h
+
+ dwaLookups_SOURCES = dwaLookups.cpp
+-dwaLookups_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
++dwaLookups_LDADD = $(ILMBASE_LIBS)
+
+ dwaLookups.h: dwaLookups
+ ./dwaLookups > dwaLookups.h
+--- a/IlmImfExamples/Makefile.am
++++ b/IlmImfExamples/Makefile.am
+@@ -6,11 +6,11 @@
+
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+ LDADD = -L$(top_builddir)/IlmImf \
+- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
+- -lIlmImf -lz
++ $(ILMBASE_LIBS) \
++ -lIlmImf $(ZLIB_CFLAGS)
+
+ imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \
+ rgbaInterfaceTiledExamples.cpp \
+@@ -23,7 +23,7 @@
+ lowLevelIoExamples.h previewImageExamples.h \
+ namespaceAlias.h
+
+-examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples
++examplesdir = $(docdir)/examples
+ examples_DATA = $(imfexamples_SOURCES)
+
+ imfexamplesdir = $(examplesdir)
+--- a/IlmImfFuzzTest/Makefile.am
++++ b/IlmImfFuzzTest/Makefile.am
+@@ -14,11 +14,11 @@
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf \
+ -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+ LDADD = -L$(top_builddir)/IlmImf \
+- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
+- -lIlmImf -lz
++ $(ILMBASE_LIBS) \
++ -lIlmImf $(ZLIB_LIBS)
+
+ if BUILD_IMFFUZZTEST
+ TESTS = IlmImfFuzzTest
+--- a/IlmImfTest/Makefile.am
++++ b/IlmImfTest/Makefile.am
+@@ -62,11 +62,11 @@
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir)/IlmImf \
+ -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+ LDADD = -L$(top_builddir)/IlmImf \
+- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
+- -lIlmImf -lz
++ $(ILMBASE_LIBS) \
++ -lIlmImf $(ZLIB_LIBS)
+
+ TESTS = IlmImfTest
+
+--- a/IlmImfUtil/Makefile.am
++++ b/IlmImfUtil/Makefile.am
+@@ -20,7 +20,7 @@
+ ImfImageChannelRenaming.h
+
+
+-libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
++libIlmImfUtil_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
+ -no-undefined
+
+
+@@ -29,14 +29,15 @@
+ endif
+
+
+-libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
++libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
+
+ libIlmImfUtilincludedir = $(includedir)/OpenEXR
+
+ EXTRA_DIST = CMakeLists.txt
+
+-INCLUDES = @ILMBASE_CXXFLAGS@ \
+- -I$(top_builddir) \
+- -I$(top_srcdir)/IlmImf \
+- -I$(top_srcdir)/config
++INCLUDES = \
++ -I$(top_builddir) \
++ -I$(top_srcdir)/IlmImf \
++ -I$(top_srcdir)/config \
++ $(ILMBASE_CFLAGS)
+
+--- a/IlmImfUtilTest/Makefile.am
++++ b/IlmImfUtilTest/Makefile.am
+@@ -11,12 +11,12 @@
+ -I$(top_srcdir)/IlmImf \
+ -I$(top_srcdir)/IlmImfUtil \
+ -I$(top_srcdir)/config \
+- @ILMBASE_CXXFLAGS@
++ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
+
+ LDADD = -L$(top_builddir)/IlmImf \
+ -L$(top_builddir)/IlmImfUtil \
+- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
+- -lIlmImfUtil -lIlmImf -lz
++ $(ILMBASE_LIBS) \
++ -lIlmImfUtil -lIlmImf $(ZLIB_LIBS)
+
+ TESTS = IlmImfUtilTest
+
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch b/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
new file mode 100644
index 00000000..5342119
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
@@ -0,0 +1,43 @@
+Rename enum from VERSION to MYVERSION due to
+collision with VERSION from autoheader.
+
+--- a/IlmImf/ImfDwaCompressor.cpp
++++ b/IlmImf/ImfDwaCompressor.cpp
+@@ -1944,7 +1944,7 @@
+
+ #define OBIDX(x) (Int64 *)&_outBuffer[x * sizeof (Int64)]
+
+- Int64 *version = OBIDX (VERSION);
++ Int64 *version = OBIDX (MYVERSION);
+ Int64 *unknownUncompressedSize = OBIDX (UNKNOWN_UNCOMPRESSED_SIZE);
+ Int64 *unknownCompressedSize = OBIDX (UNKNOWN_COMPRESSED_SIZE);
+ Int64 *acCompressedSize = OBIDX (AC_COMPRESSED_SIZE);
+@@ -2356,7 +2356,7 @@
+
+ const Int64 *inPtr64 = (const Int64*) inPtr;
+
+- Int64 version = *(inPtr64 + VERSION);
++ Int64 version = *(inPtr64 + MYVERSION);
+ Int64 unknownUncompressedSize = *(inPtr64 + UNKNOWN_UNCOMPRESSED_SIZE);
+ Int64 unknownCompressedSize = *(inPtr64 + UNKNOWN_COMPRESSED_SIZE);
+ Int64 acCompressedSize = *(inPtr64 + AC_COMPRESSED_SIZE);
+@@ -3142,7 +3142,7 @@
+
+
+ //
+-// Setup channel classification rules when reading files with VERSION < 2
++// Setup channel classification rules when reading files with MYVERSION < 2
+ //
+
+ void
+--- a/IlmImf/ImfDwaCompressor.h
++++ b/IlmImf/ImfDwaCompressor.h
+@@ -124,7 +124,7 @@
+
+ enum DataSizesSingle
+ {
+- VERSION = 0, // Version number:
++ MYVERSION = 0, // Version number:
+ // 0: classic
+ // 1: adds "end of block" to the AC RLE
+
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch b/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
new file mode 100644
index 00000000..4aa7b06
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
@@ -0,0 +1,63 @@
+diff -Naur a/IlmImf/ImfSystemSpecific.cpp b/IlmImf/ImfSystemSpecific.cpp
+--- a/IlmImf/ImfSystemSpecific.cpp 2016-06-14 01:19:15.070511555 +0930
++++ b/IlmImf/ImfSystemSpecific.cpp 2016-06-14 01:36:08.776496862 +0930
+@@ -35,6 +35,7 @@
+ #include "ImfSystemSpecific.h"
+ #include "ImfNamespace.h"
+ #include "OpenEXRConfig.h"
++#include <cpuid.h>
+
+ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
+
+@@ -42,19 +43,15 @@
+ #if defined(IMF_HAVE_SSE2) && defined(__GNUC__)
+
+ // Helper functions for gcc + SSE enabled
+- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
++ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, unsigned int &ecx, unsigned int &edx)
+ {
+- __asm__ __volatile__ (
+- "cpuid"
+- : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
+- : /* Input */ "a"(n)
+- : /* Clobber */);
++ __get_cpuid(n, &eax, &ebx, &ecx, &edx );
+ }
+
+ #else // IMF_HAVE_SSE2 && __GNUC__
+
+ // Helper functions for generic compiler - all disabled
+- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
++ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, unsigned int &ecx, unsigned int &edx)
+ {
+ eax = ebx = ecx = edx = 0;
+ }
+@@ -64,7 +61,7 @@
+
+ #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
+
+- void xgetbv(int n, int &eax, int &edx)
++ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
+ {
+ __asm__ __volatile__ (
+ "xgetbv"
+@@ -75,7 +72,7 @@
+
+ #else // OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
+
+- void xgetbv(int n, int &eax, int &edx)
++ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
+ {
+ eax = edx = 0;
+ }
+@@ -94,8 +91,8 @@
+ f16c(false)
+ {
+ bool osxsave = false;
+- int max = 0;
+- int eax, ebx, ecx, edx;
++ unsigned int max = 0;
++ unsigned int eax, ebx, ecx, edx;
+
+ cpuid(0, max, ebx, ecx, edx);
+ if (max > 0)
diff --git a/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch b/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
new file mode 100644
index 00000000..6b107af
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
@@ -0,0 +1,60 @@
+From 57ecf581d053f5cacf2e8fc3c024490e0bbe536f Mon Sep 17 00:00:00 2001
+From: Brendan Bolles <brendan@fnordware.com>
+Date: Wed, 13 Aug 2014 19:54:10 -0700
+Subject: [PATCH] Use ULL for 64-bit literals
+
+On a 32-bit architecture, these literals are too big for just a long,
+they need to be ULL, since Int64 is unsigned.
+---
+ IlmImf/ImfFastHuf.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/IlmImf/ImfFastHuf.cpp b/IlmImf/ImfFastHuf.cpp
+index 86c84dc..01edad4 100644
+--- a/IlmImf/ImfFastHuf.cpp
++++ b/IlmImf/ImfFastHuf.cpp
+@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
+ for (int i = 0; i <= MAX_CODE_LEN; ++i)
+ {
+ codeCount[i] = 0;
+- base[i] = 0xffffffffffffffffL;
++ base[i] = 0xffffffffffffffffULL;
+ offset[i] = 0;
+ }
+
+@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
+
+ for (int i = 0; i <= MAX_CODE_LEN; ++i)
+ {
+- if (base[i] != 0xffffffffffffffffL)
++ if (base[i] != 0xffffffffffffffffULL)
+ {
+ _ljBase[i] = base[i] << (64 - i);
+ }
+@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
+ // Unused code length - insert dummy values
+ //
+
+- _ljBase[i] = 0xffffffffffffffffL;
++ _ljBase[i] = 0xffffffffffffffffULL;
+ }
+ }
+
+@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
+
+ int minIdx = TABLE_LOOKUP_BITS;
+
+- while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
++ while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
+ minIdx--;
+
+ if (minIdx < 0)
+@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
+ // Set the min value such that the table is never tested.
+ //
+
+- _tableMin = 0xffffffffffffffffL;
++ _tableMin = 0xffffffffffffffffULL;
+ }
+ else
+ {
diff --git a/media-libs/openexr/openexr-2.2.0-r1.ebuild b/media-libs/openexr/openexr-2.2.0-r1.ebuild
new file mode 100644
index 00000000..8fd2d99
--- /dev/null
+++ b/media-libs/openexr/openexr-2.2.0-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/22" # based on SONAME
+KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cpu_flags_x86_avx examples static-libs"
+
+RDEPEND="
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/autoconf-archive-2016.09.16"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-cpuid-on-abi_x86_32.patch"
+ "${FILESDIR}/${P}-use-ull-for-64-bit-literals.patch"
+ "${FILESDIR}/${P}-fix-build-system.patch"
+ "${FILESDIR}/${P}-fix-config.h-collision.patch"
+)
+
+src_prepare() {
+ default
+ # Fix path for testsuite
+ sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
+
+ # delete stray config files causing havoc
+ rm -f config*/OpenEXRConfig.h* || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --enable-threading \
+ $(use_enable cpu_flags_x86_avx avx) \
+ $(use_enable static-libs static) \
+ $(use_enable examples imfexamples)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ docompress -x /usr/share/doc/${PF}/examples
+ if ! use examples; then
+ rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
+ fi
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-03-08 18:34 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-17 2:22 [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-03-08 18:34 Sam James
2024-03-08 18:34 Sam James
2022-09-28 8:19 Joonas Niilola
2022-07-03 23:54 Sam James
2022-04-10 21:02 Andreas Sturmlechner
2021-06-22 18:35 Sam James
2020-07-21 18:58 Andreas Sturmlechner
2019-04-20 9:34 Pacho Ramos
2018-10-11 18:42 Michał Górny
2016-10-10 22:26 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox