commit: 8908e6d2b56ccc9970895883a7f8b1c821ae9965 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Aug 14 21:27:42 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Aug 15 14:09:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8908e6d2
media-libs/openjpeg: drop 2.4.0, 2.4.0-r1, 2.4.0-r2, 2.4.0-r3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/openjpeg/Manifest | 2 - .../files/openjpeg-2.4.0-gnuinstalldirs.patch | 435 --------------------- .../files/openjpeg-2.4.0-r1-gnuinstalldirs.patch | 435 --------------------- .../files/openjpeg-2.4.0-r2-fix-segfault.patch | 17 - .../openjpeg-2.4.0-r3-avoid-mult-overflow.patch | 52 --- .../openjpeg-2.4.0-r3-fix-integer-overflow.patch | 57 --- media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild | 139 ------- media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild | 140 ------- media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild | 142 ------- media-libs/openjpeg/openjpeg-2.4.0.ebuild | 139 ------- 10 files changed, 1558 deletions(-) diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index 67696cbe7745..30b5bc36a99f 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -1,4 +1,2 @@ -DIST openjpeg-2.4.0.tar.gz 2233229 BLAKE2B ab8907638ac041ce7dcbcbcd9624ea5e4b7542c9ec38a850e363c071c27c4bc8b16e207700b12e67d8d32bdd9b0838735bede27084090ce95105d32c539b09cf SHA512 55daab47d33823af94e32e5d345b52c251a5410f0c8e0a13b693f17899eedc8b2bb107489ddcba9ab78ef17dfd7cd80d3c5ec80c1e429189cb041124b67e07a8 DIST openjpeg-2.5.0.tar.gz 1867111 BLAKE2B 472d9998a7407574d3bc059d1c0b662a8a553cfe5cb7806a022cb35e14564417a8e06e9970f06d8e65ef149019bab747caefa8e29bc793d07ad86e076909d306 SHA512 08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a -DIST openjpeg-data_20201130.tar.gz 497969983 BLAKE2B 35ff1ee234e3bbf47a822151c97cdf2764f864094973fa60adc7962f8065b38318b0cc41338b5ba3fffd9bb00eac3eaf4153ecc398abd49a8047168414c1c85b SHA512 4c367c8262fe894f90a1e63fb59d87e974ae0d750d3cee89adfe4d765040f0a2049b491a17a34a5b3ba79e183a508c9d592376fe3c112df56c311bf3212f0c31 DIST openjpeg-data_20210926.tar.gz 498600110 BLAKE2B 34a1c39379d9f8f4caad6c8263a4bc59e62a6a3b8db744eaeaa7047e58813636341b3fb7ee6a121b7dfcd4bc085f9884c3aef86605633ff0d84a1b77cf003624 SHA512 4444225ddb9c548d7753561188cd2d595ae13d7a45471240fac69c3de786a97fb899cd5bbc67cf1b54bfccff0dcd215ec6e83d1bd66982a44c802d163e365dae diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch deleted file mode 100644 index 82ad4075a942..000000000000 --- a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch +++ /dev/null @@ -1,435 +0,0 @@ -From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Thu, 11 Apr 2019 13:10:57 +0200 -Subject: [PATCH] Use GNUInstallDirs for standard installation directories - -Raises minimum cmake version by a little. -(Later rebased by [email protected] for 2.4.0) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,7 @@ - # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like - # e.g.: - # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") --cmake_minimum_required(VERSION 2.8.2) -+cmake_minimum_required(VERSION 2.8.5) - - if(COMMAND CMAKE_POLICY) - cmake_policy(SET CMP0003 NEW) -@@ -105,58 +105,27 @@ endif() - # -------------------------------------------------------------------------- - # Install directories - # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) -+include(GNUInstallDirs) -+ - option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) - - string(TOLOWER ${PROJECT_NAME} projectname) - set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") - --if(NOT OPENJPEG_INSTALL_BIN_DIR) -- set(OPENJPEG_INSTALL_BIN_DIR "bin") --endif() -- --if(NOT OPENJPEG_INSTALL_LIB_DIR) -- set(OPENJPEG_INSTALL_LIB_DIR "lib") --endif() -- --if(NOT OPENJPEG_INSTALL_SHARE_DIR) -- set(OPENJPEG_INSTALL_SHARE_DIR "share") --endif() -- --if(NOT OPENJPEG_INSTALL_DATA_DIR) -- set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") --endif() -- --if(NOT OPENJPEG_INSTALL_INCLUDE_DIR) -- set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") --endif() -- --if(BUILD_DOC) --if(NOT OPENJPEG_INSTALL_MAN_DIR) -- set(OPENJPEG_INSTALL_MAN_DIR "share/man/") --endif() -- --if(NOT OPENJPEG_INSTALL_DOC_DIR) -- set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") --endif() --endif() -- - if(NOT OPENJPEG_INSTALL_JNI_DIR) - if(WIN32) -- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) -+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR}) - else() -- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) -+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR}) - endif() - endif() - - if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) -- # We could install *.cmake files in share/ however those files contains -- # hardcoded path to libraries on a multi-arch system (fedora/debian) those -- # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) -- set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") -+ set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") - endif() - - if (APPLE) -- list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}") -+ list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") - option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) - endif() - -@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake - ) - - #----------------------------------------------------------------------------- --# install CHANGES and LICENSE --if(BUILD_DOC) --if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) -- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) --endif() -- --install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) --endif() - - include (cmake/OpenJPEGCPack.cmake) - -@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - # - if(BUILD_JPWL) - # install in lib and not share (see multi-arch note above) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - # - if(BUILD_JPIP) -@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - # - if(BUILD_JP3D) -@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - endif() - ---- a/cmake/OpenJPEGConfig.cmake.in -+++ b/cmake/OpenJPEGConfig.cmake.in -@@ -27,7 +27,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) - -- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") -+ set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@") - get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE) - - else() ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND) - - # install HTML documentation (install png files too): - install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html -- DESTINATION ${OPENJPEG_INSTALL_DOC_DIR} -+ DESTINATION ${CMAKE_INSTALL_DOCDIR} - PATTERN ".svn" EXCLUDE - ) - else() ---- a/src/bin/jp2/CMakeLists.txt -+++ b/src/bin/jp2/CMakeLists.txt -@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump) - # Install exe - install(TARGETS ${exe} - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - if(OPJ_USE_DSYMUTIL) - add_custom_command(TARGET ${exe} POST_BUILD -@@ -83,6 +83,6 @@ install( - FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1 - ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1 - ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1 -- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1) -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - # - endif() ---- a/src/bin/jp3d/CMakeLists.txt -+++ b/src/bin/jp3d/CMakeLists.txt -@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress) - # Install exe - install(TARGETS ${exe} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() ---- a/src/bin/jpip/CMakeLists.txt -+++ b/src/bin/jpip/CMakeLists.txt -@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c) - # Install exe - install(TARGETS opj_jpip_addxml - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - - if(BUILD_JPIP_SERVER) -@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER) - # Install exe - install(TARGETS opj_server - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endif() - -@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c) - target_link_libraries(${exe} openjpip) - install(TARGETS ${exe} - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() - -@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) - else() - # opj_viewer (simple, no xerces) -@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) - endif() - else() ---- a/src/bin/jpwl/CMakeLists.txt -+++ b/src/bin/jpwl/CMakeLists.txt -@@ -57,6 +57,6 @@ foreach(exe decompress compress) - endif() - - install(TARGETS ${jpwl_exe} -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() ---- a/src/bin/mj2/CMakeLists.txt -+++ b/src/bin/mj2/CMakeLists.txt -@@ -43,5 +43,5 @@ foreach(exe - endif() - - install(TARGETS ${exe} -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR}) -+ DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() ---- a/src/lib/openjp2/CMakeLists.txt -+++ b/src/lib/openjp2/CMakeLists.txt -@@ -2,7 +2,7 @@ include_regular_expression("^.*$") - - # - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h -- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers) - - include_directories( - ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h -@@ -114,21 +114,21 @@ endif() - # Install library - install(TARGETS ${INSTALL_LIBS} - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - - # Install includes files - install(FILES openjpeg.h opj_stdint.h -- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers - ) - - if(BUILD_DOC) - # install man page of the library - install( - FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3 -- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) - endif() - - if(BUILD_LUTS_GENERATOR) ---- a/src/lib/openjp2/libopenjp2.pc.cmake.in -+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjp2 - Description: JPEG2000 library (Part 1 and 2) ---- a/src/lib/openjp3d/CMakeLists.txt -+++ b/src/lib/openjp3d/CMakeLists.txt -@@ -34,12 +34,12 @@ endif() - # Install library - install(TARGETS ${OPENJP3D_LIBRARY_NAME} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT Libraries - ) - - # Install includes files - install(FILES openjp3d.h -- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} - COMPONENT Headers - ) ---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in -+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjp3d - Description: JPEG2000 Extensions for three-dimensional data (Part 10) ---- a/src/lib/openjpip/CMakeLists.txt -+++ b/src/lib/openjpip/CMakeLists.txt -@@ -74,9 +74,9 @@ endif() - # Install library - install(TARGETS openjpip - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - - if(BUILD_JPIP_SERVER) -@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER) - PROPERTIES COMPILE_FLAGS "-DSERVER") - install(TARGETS openjpip_server - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - endif() ---- a/src/lib/openjpip/libopenjpip.pc.cmake.in -+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjpip - Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) ---- a/src/lib/openjpwl/CMakeLists.txt -+++ b/src/lib/openjpwl/CMakeLists.txt -@@ -58,7 +58,7 @@ endif() - # Install library - install(TARGETS openjpwl - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) ---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in -+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ -+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjpwl - Description: JPEG2000 Wireless library (Part 11) ---- a/src/lib/openmj2/CMakeLists.txt -+++ b/src/lib/openmj2/CMakeLists.txt -@@ -53,12 +53,12 @@ endif() - # Install library - install(TARGETS ${OPENMJ2_LIBRARY_NAME} - EXPORT OpenMJ2Targets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT Libraries - ) - - # Install includes files - #install(FILES mj2.h --# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} -+# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} - # COMPONENT Headers - #) ---- a/wrapping/java/openjp2/CMakeLists.txt -+++ b/wrapping/java/openjp2/CMakeLists.txt -@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch deleted file mode 100644 index bc6771c0c4be..000000000000 --- a/media-libs/openjpeg/files/openjpeg-2.4.0-r1-gnuinstalldirs.patch +++ /dev/null @@ -1,435 +0,0 @@ -From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Thu, 11 Apr 2019 13:10:57 +0200 -Subject: [PATCH] Use GNUInstallDirs for standard installation directories - -Raises minimum cmake version by a little. -(Later rebased by [email protected] for 2.4.0) ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,7 @@ - # For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like - # e.g.: - # set(OPENJPEG_NAMESPACE "GDCMOPENJPEG") --cmake_minimum_required(VERSION 2.8.2) -+cmake_minimum_required(VERSION 2.8.5) - - if(COMMAND CMAKE_POLICY) - cmake_policy(SET CMP0003 NEW) -@@ -105,58 +105,27 @@ endif() - # -------------------------------------------------------------------------- - # Install directories - # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) -+include(GNUInstallDirs) -+ - option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) - - string(TOLOWER ${PROJECT_NAME} projectname) - set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") - --if(NOT OPENJPEG_INSTALL_BIN_DIR) -- set(OPENJPEG_INSTALL_BIN_DIR "bin") --endif() -- --if(NOT OPENJPEG_INSTALL_LIB_DIR) -- set(OPENJPEG_INSTALL_LIB_DIR "lib") --endif() -- --if(NOT OPENJPEG_INSTALL_SHARE_DIR) -- set(OPENJPEG_INSTALL_SHARE_DIR "share") --endif() -- --if(NOT OPENJPEG_INSTALL_DATA_DIR) -- set(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") --endif() -- --if(NOT OPENJPEG_INSTALL_INCLUDE_DIR) -- set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") --endif() -- --if(BUILD_DOC) --if(NOT OPENJPEG_INSTALL_MAN_DIR) -- set(OPENJPEG_INSTALL_MAN_DIR "share/man/") --endif() -- --if(NOT OPENJPEG_INSTALL_DOC_DIR) -- set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") --endif() --endif() -- - if(NOT OPENJPEG_INSTALL_JNI_DIR) - if(WIN32) -- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_BIN_DIR}) -+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_BINDIR}) - else() -- set(OPENJPEG_INSTALL_JNI_DIR ${OPENJPEG_INSTALL_LIB_DIR}) -+ set(OPENJPEG_INSTALL_JNI_DIR ${CMAKE_INSTALL_LIBDIR}) - endif() - endif() - - if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) -- # We could install *.cmake files in share/ however those files contains -- # hardcoded path to libraries on a multi-arch system (fedora/debian) those -- # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) -- set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") -+ set(OPENJPEG_INSTALL_PACKAGE_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_INSTALL_SUBDIR}") - endif() - - if (APPLE) -- list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}") -+ list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") - option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) - endif() - -@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake - ) - - #----------------------------------------------------------------------------- --# install CHANGES and LICENSE --if(BUILD_DOC) --if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) -- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) --endif() -- --install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) --endif() - - include (cmake/OpenJPEGCPack.cmake) - -@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - # - if(BUILD_JPWL) - # install in lib and not share (see multi-arch note above) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - # - if(BUILD_JPIP) -@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - # - if(BUILD_JP3D) -@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) - endif() - endif() - ---- a/cmake/OpenJPEGConfig.cmake.in -+++ b/cmake/OpenJPEGConfig.cmake.in -@@ -27,7 +27,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) - # This is an install tree - include(${SELF_DIR}/OpenJPEGTargets.cmake) - -- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") -+ set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@") - get_filename_component(OPENJPEG_INCLUDE_DIRS "${INC_DIR}" ABSOLUTE) - - else() ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND) - - # install HTML documentation (install png files too): - install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html -- DESTINATION ${OPENJPEG_INSTALL_DOC_DIR} -+ DESTINATION ${CMAKE_INSTALL_DOCDIR} - PATTERN ".svn" EXCLUDE - ) - else() ---- a/src/bin/jp2/CMakeLists.txt -+++ b/src/bin/jp2/CMakeLists.txt -@@ -67,7 +67,7 @@ foreach(exe opj_decompress opj_compress opj_dump) - # Install exe - install(TARGETS ${exe} - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - if(OPJ_USE_DSYMUTIL) - add_custom_command(TARGET ${exe} POST_BUILD -@@ -83,6 +83,6 @@ install( - FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1 - ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_decompress.1 - ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1 -- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1) -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) - # - endif() ---- a/src/bin/jp3d/CMakeLists.txt -+++ b/src/bin/jp3d/CMakeLists.txt -@@ -36,6 +36,6 @@ foreach(exe opj_jp3d_compress opj_jp3d_decompress) - # Install exe - install(TARGETS ${exe} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() ---- a/src/bin/jpip/CMakeLists.txt -+++ b/src/bin/jpip/CMakeLists.txt -@@ -13,7 +13,7 @@ add_executable(opj_jpip_addxml opj_jpip_addxml.c) - # Install exe - install(TARGETS opj_jpip_addxml - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - - if(BUILD_JPIP_SERVER) -@@ -38,7 +38,7 @@ if(BUILD_JPIP_SERVER) - # Install exe - install(TARGETS opj_server - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endif() - -@@ -52,7 +52,7 @@ add_executable(${exe} ${exe}.c) - target_link_libraries(${exe} openjpip) - install(TARGETS ${exe} - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() - -@@ -123,7 +123,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) - else() - # opj_viewer (simple, no xerces) -@@ -153,7 +153,7 @@ if(Java_Development_FOUND AND Java_JAVAC_EXECUTABLE) - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/opj_jpip_viewer.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) - endif() - else() ---- a/src/bin/jpwl/CMakeLists.txt -+++ b/src/bin/jpwl/CMakeLists.txt -@@ -57,6 +57,6 @@ foreach(exe decompress compress) - endif() - - install(TARGETS ${jpwl_exe} -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -+ DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications - ) - endforeach() ---- a/src/bin/mj2/CMakeLists.txt -+++ b/src/bin/mj2/CMakeLists.txt -@@ -43,5 +43,5 @@ foreach(exe - endif() - - install(TARGETS ${exe} -- DESTINATION ${OPENJPEG_INSTALL_BIN_DIR}) -+ DESTINATION ${CMAKE_INSTALL_BINDIR}) - endforeach() ---- a/src/lib/openjp2/CMakeLists.txt -+++ b/src/lib/openjp2/CMakeLists.txt -@@ -2,7 +2,7 @@ include_regular_expression("^.*$") - - # - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h -- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers) - - include_directories( - ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h -@@ -114,21 +114,21 @@ endif() - # Install library - install(TARGETS ${INSTALL_LIBS} - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - - # Install includes files - install(FILES openjpeg.h opj_stdint.h -- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers - ) - - if(BUILD_DOC) - # install man page of the library - install( - FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3 -- DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3) -+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man3) - endif() - - if(BUILD_LUTS_GENERATOR) ---- a/src/lib/openjp2/libopenjp2.pc.cmake.in -+++ b/src/lib/openjp2/libopenjp2.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=@CMAKE_INSTALL_MANDIR@ -+docdir=@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjp2 - Description: JPEG2000 library (Part 1 and 2) ---- a/src/lib/openjp3d/CMakeLists.txt -+++ b/src/lib/openjp3d/CMakeLists.txt -@@ -34,12 +34,12 @@ endif() - # Install library - install(TARGETS ${OPENJP3D_LIBRARY_NAME} - EXPORT OpenJP3DTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT Libraries - ) - - # Install includes files - install(FILES openjp3d.h -- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} - COMPONENT Headers - ) ---- a/src/lib/openjp3d/libopenjp3d.pc.cmake.in -+++ b/src/lib/openjp3d/libopenjp3d.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=@CMAKE_INSTALL_MANDIR@ -+docdir=@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjp3d - Description: JPEG2000 Extensions for three-dimensional data (Part 10) ---- a/src/lib/openjpip/CMakeLists.txt -+++ b/src/lib/openjpip/CMakeLists.txt -@@ -74,9 +74,9 @@ endif() - # Install library - install(TARGETS openjpip - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - - if(BUILD_JPIP_SERVER) -@@ -86,6 +86,6 @@ if(BUILD_JPIP_SERVER) - PROPERTIES COMPILE_FLAGS "-DSERVER") - install(TARGETS openjpip_server - EXPORT OpenJPEGTargets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) - endif() ---- a/src/lib/openjpip/libopenjpip.pc.cmake.in -+++ b/src/lib/openjpip/libopenjpip.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=@CMAKE_INSTALL_MANDIR@ -+docdir=@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjpip - Description: JPEG2000 Interactivity tools, APIs and protocols (Part 9) ---- a/src/lib/openjpwl/CMakeLists.txt -+++ b/src/lib/openjpwl/CMakeLists.txt -@@ -58,7 +58,7 @@ endif() - # Install library - install(TARGETS openjpwl - EXPORT OpenJPEGTargets -- RUNTIME DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications -- LIBRARY DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -- ARCHIVE DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Libraries - ) ---- a/src/lib/openjpwl/libopenjpwl.pc.cmake.in -+++ b/src/lib/openjpwl/libopenjpwl.pc.cmake.in -@@ -1,9 +1,9 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@ --mandir=${prefix}/@OPENJPEG_INSTALL_MAN_DIR@ --docdir=${prefix}/@OPENJPEG_INSTALL_DOC_DIR@ --libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@ --includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@ -+bindir=${prefix}/@CMAKE_INSTALL_BINDIR@ -+mandir=@CMAKE_INSTALL_MANDIR@ -+docdir=@CMAKE_INSTALL_DOCDIR@ -+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ - - Name: openjpwl - Description: JPEG2000 Wireless library (Part 11) ---- a/src/lib/openmj2/CMakeLists.txt -+++ b/src/lib/openmj2/CMakeLists.txt -@@ -53,12 +53,12 @@ endif() - # Install library - install(TARGETS ${OPENMJ2_LIBRARY_NAME} - EXPORT OpenMJ2Targets -- DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} -+ DESTINATION ${CMAKE_INSTALL_LIBDIR} - COMPONENT Libraries - ) - - # Install includes files - #install(FILES mj2.h --# DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} -+# DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} - # COMPONENT Headers - #) ---- a/wrapping/java/openjp2/CMakeLists.txt -+++ b/wrapping/java/openjp2/CMakeLists.txt -@@ -69,5 +69,5 @@ add_custom_target(OpenJPEGJavaJar ALL - ) - - install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar -- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule -+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule - ) diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch deleted file mode 100644 index 86e1c1fe39cc..000000000000 --- a/media-libs/openjpeg/files/openjpeg-2.4.0-r2-fix-segfault.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream: https://github.com/uclouvain/openjpeg/commit/0afbdcf3e6d0d2bd2e16a0c4d513ee3cf86e460d -From: xiaoxiaoafeifei <[email protected]> -Date: Wed, 14 Jul 2021 09:35:13 +0800 -Subject: [PATCH] Fix segfault in src/bin/jp2/opj_decompress.c due to - uninitialized pointer (fixes #1368) (#1369) - ---- a/src/bin/jp2/opj_decompress.c -+++ b/src/bin/jp2/opj_decompress.c -@@ -1356,7 +1356,7 @@ int main(int argc, char **argv) - int it_image; - num_images = get_num_images(img_fol.imgdirpath); - -- dirptr = (dircnt_t*)malloc(sizeof(dircnt_t)); -+ dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t)); - if (!dirptr) { - destroy_parameters(¶meters); - return EXIT_FAILURE; diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch deleted file mode 100644 index 3733a1b94545..000000000000 --- a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-avoid-mult-overflow.patch +++ /dev/null @@ -1,52 +0,0 @@ -Upstream: https://github.com/uclouvain/openjpeg/commit/1daaa0b909aebdf71be36238d16dfbec83c494ed -Bug: https://bugs.gentoo.org/783513 -CVE-2021-29338 ---- a/src/bin/jp2/opj_compress.c -+++ b/src/bin/jp2/opj_compress.c -@@ -1967,7 +1967,7 @@ int main(int argc, char **argv) - goto fin; - } - for (i = 0; i < num_images; i++) { -- dirptr->filename[i] = dirptr->filename_buf + i * OPJ_PATH_LEN; -+ dirptr->filename[i] = dirptr->filename_buf + (size_t)i * OPJ_PATH_LEN; - } - } - if (load_images(dirptr, img_fol.imgdirpath) == 1) { ---- a/src/bin/jp2/opj_decompress.c -+++ b/src/bin/jp2/opj_decompress.c -@@ -1367,7 +1367,6 @@ int main(int argc, char **argv) - if (img_fol.set_imgdir == 1) { - int it_image; - num_images = get_num_images(img_fol.imgdirpath); -- - dirptr = (dircnt_t*)calloc(1, sizeof(dircnt_t)); - if (!dirptr) { - destroy_parameters(¶meters); -@@ -1387,7 +1386,8 @@ int main(int argc, char **argv) - goto fin; - } - for (it_image = 0; it_image < num_images; it_image++) { -- dirptr->filename[it_image] = dirptr->filename_buf + it_image * OPJ_PATH_LEN; -+ dirptr->filename[it_image] = dirptr->filename_buf + (size_t)it_image * -+ OPJ_PATH_LEN; - } - - if (load_images(dirptr, img_fol.imgdirpath) == 1) { ---- a/src/bin/jp2/opj_dump.c -+++ b/src/bin/jp2/opj_dump.c -@@ -529,13 +529,13 @@ int main(int argc, char *argv[]) - } - - for (it_image = 0; it_image < num_images; it_image++) { -- dirptr->filename[it_image] = dirptr->filename_buf + it_image * OPJ_PATH_LEN; -+ dirptr->filename[it_image] = dirptr->filename_buf + (size_t)it_image * -+ OPJ_PATH_LEN; - } - - if (load_images(dirptr, img_fol.imgdirpath) == 1) { - goto fails; - } -- - if (num_images == 0) { - fprintf(stdout, "Folder is empty\n"); - goto fails; diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch deleted file mode 100644 index 6ceb5be8f6d1..000000000000 --- a/media-libs/openjpeg/files/openjpeg-2.4.0-r3-fix-integer-overflow.patch +++ /dev/null @@ -1,57 +0,0 @@ -opj_compress/opj_uncompress: fix integer overflow in num_images -CVE-2021-29338 -Bug 783513 -Upstream: https://github.com/uclouvain/openjpeg/commit/79c7d7af598b778c3cdcb455df23d50efc95eb3c ---- a/src/bin/jp2/opj_compress.c -+++ b/src/bin/jp2/opj_compress.c -@@ -1959,9 +1959,9 @@ int main(int argc, char **argv) - num_images = get_num_images(img_fol.imgdirpath); - dirptr = (dircnt_t*)malloc(sizeof(dircnt_t)); - if (dirptr) { -- dirptr->filename_buf = (char*)malloc(num_images * OPJ_PATH_LEN * sizeof( -+ dirptr->filename_buf = (char*)calloc(num_images, OPJ_PATH_LEN * sizeof( - char)); /* Stores at max 10 image file names*/ -- dirptr->filename = (char**) malloc(num_images * sizeof(char*)); -+ dirptr->filename = (char**) calloc(num_images, sizeof(char*)); - if (!dirptr->filename_buf) { - ret = 0; - goto fin; ---- a/src/bin/jp2/opj_decompress.c -+++ b/src/bin/jp2/opj_decompress.c -@@ -1374,14 +1374,13 @@ int main(int argc, char **argv) - return EXIT_FAILURE; - } - /* Stores at max 10 image file names */ -- dirptr->filename_buf = (char*)malloc(sizeof(char) * -- (size_t)num_images * OPJ_PATH_LEN); -+ dirptr->filename_buf = calloc((size_t) num_images, sizeof(char) * OPJ_PATH_LEN); - if (!dirptr->filename_buf) { - failed = 1; - goto fin; - } - -- dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*)); -+ dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*)); - - if (!dirptr->filename) { - failed = 1; ---- a/src/bin/jp2/opj_dump.c -+++ b/src/bin/jp2/opj_dump.c -@@ -515,13 +515,14 @@ int main(int argc, char *argv[]) - if (!dirptr) { - return EXIT_FAILURE; - } -- dirptr->filename_buf = (char*)malloc((size_t)num_images * OPJ_PATH_LEN * sizeof( -- char)); /* Stores at max 10 image file names*/ -+ /* Stores at max 10 image file names*/ -+ dirptr->filename_buf = (char*) calloc((size_t) num_images, -+ OPJ_PATH_LEN * sizeof(char)); - if (!dirptr->filename_buf) { - free(dirptr); - return EXIT_FAILURE; - } -- dirptr->filename = (char**) malloc((size_t)num_images * sizeof(char*)); -+ dirptr->filename = (char**) calloc((size_t) num_images, sizeof(char*)); - - if (!dirptr->filename) { - goto fails; diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild deleted file mode 100644 index 554c61b5304b..000000000000 --- a/media-libs/openjpeg/openjpeg-2.4.0-r1.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic - -# Make sure that test data are not newer than release; -# otherwise we will see "Found-But-No-Test" test failures! -MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60" - -DESCRIPTION="Open-source JPEG 2000 library" -HOMEPAGE="https://www.openjpeg.org"; -SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )" - -LICENSE="BSD-2" -SLOT="2/7" # based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/lcms:2 - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib:=" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150 -) - -src_prepare() { - if use test; then - mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || - die "Failed to rename test data" - fi - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 - -DBUILD_TESTING="$(multilib_native_usex test)" - -DBUILD_DOC=$(multilib_native_usex doc ON OFF) - -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - # Cheat a little bit and force disabling fixed point magic - # The test suite is extremely fragile to small changes - # bug 715130, bug 715422 - # https://github.com/uclouvain/openjpeg/issues/1017 - multilib_is_native_abi && use test && append-cflags "-ffp-contract=off" - - cmake_src_configure -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - elog "Cannot run tests for non-multilib abi." - return 0 - fi - - local myctestargs= - - pushd "${BUILD_DIR}" > /dev/null || die - [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" - - [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) - - echo ctest "${myctestargs[@]}" "$@" - if ctest "${myctestargs[@]}" "$@" ; then - einfo "Tests succeeded." - popd > /dev/null || die - return 0 - else - local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" - - if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then - # Should never happen - die "Cannot analyze test failures: LastTestsFailed.log is missing!" - fi - - echo "" - einfo "Note: Upstream is maintaining a list of known test failures." - einfo "We will now compare our test results against this list and sort out any known failure." - - local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" - cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die - - local ARCH_SPECIFIC_FAILURES= - if use amd64 ; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - elif use x86 || use arm || use arm64; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - fi - - if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then - einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." - cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die - fi - - # Logic copied from $S/tools/travis-ci/run.sh - local FAILEDTEST= - local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" - local HAS_UNKNOWN_TEST_FAILURES=0 - - echo "" - - awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" - while read FAILEDTEST; do - # is this failure known? - if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then - ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." - continue - fi - - eerror "New/unknown test failure found: '${FAILEDTEST}'" - HAS_UNKNOWN_TEST_FAILURES=1 - done < "${FAILURES_LOG}" - - if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then - die "Test suite failed. New/unknown test failure(s) found!" - else - echo "" - einfo "Test suite passed. No new/unknown test failure(s) found!" - fi - - return 0 - fi -} diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild deleted file mode 100644 index cecc59d76a7f..000000000000 --- a/media-libs/openjpeg/openjpeg-2.4.0-r2.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic - -# Make sure that test data are not newer than release; -# otherwise we will see "Found-But-No-Test" test failures! -MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60" - -DESCRIPTION="Open-source JPEG 2000 library" -HOMEPAGE="https://www.openjpeg.org"; -SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )" - -LICENSE="BSD-2" -SLOT="2/7" # based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/lcms:2 - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib:=" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150 - "${FILESDIR}/${PN}-2.4.0-r2-fix-segfault.patch" # bug 832007 -) - -src_prepare() { - if use test; then - mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || - die "Failed to rename test data" - fi - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 - -DBUILD_TESTING="$(multilib_native_usex test)" - -DBUILD_DOC=$(multilib_native_usex doc ON OFF) - -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - # Cheat a little bit and force disabling fixed point magic - # The test suite is extremely fragile to small changes - # bug 715130, bug 715422 - # https://github.com/uclouvain/openjpeg/issues/1017 - multilib_is_native_abi && use test && append-cflags "-ffp-contract=off" - - cmake_src_configure -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - elog "Cannot run tests for non-multilib abi." - return 0 - fi - - local myctestargs= - - pushd "${BUILD_DIR}" > /dev/null || die - [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" - - [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) - - echo ctest "${myctestargs[@]}" "$@" - if ctest "${myctestargs[@]}" "$@" ; then - einfo "Tests succeeded." - popd > /dev/null || die - return 0 - else - local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" - - if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then - # Should never happen - die "Cannot analyze test failures: LastTestsFailed.log is missing!" - fi - - echo "" - einfo "Note: Upstream is maintaining a list of known test failures." - einfo "We will now compare our test results against this list and sort out any known failure." - - local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" - cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die - - local ARCH_SPECIFIC_FAILURES= - if use amd64 ; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - elif use x86 || use arm || use arm64; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - fi - - if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then - einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." - cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die - fi - - # Logic copied from $S/tools/travis-ci/run.sh - local FAILEDTEST= - local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" - local HAS_UNKNOWN_TEST_FAILURES=0 - - echo "" - - awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" - while read FAILEDTEST; do - # is this failure known? - if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then - ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." - continue - fi - - eerror "New/unknown test failure found: '${FAILEDTEST}'" - HAS_UNKNOWN_TEST_FAILURES=1 - done < "${FAILURES_LOG}" - - if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then - die "Test suite failed. New/unknown test failure(s) found!" - else - echo "" - einfo "Test suite passed. No new/unknown test failure(s) found!" - fi - - return 0 - fi -} diff --git a/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild b/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild deleted file mode 100644 index d2b85a157420..000000000000 --- a/media-libs/openjpeg/openjpeg-2.4.0-r3.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib flag-o-matic - -# Make sure that test data are not newer than release; -# otherwise we will see "Found-But-No-Test" test failures! -MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60" - -DESCRIPTION="Open-source JPEG 2000 library" -HOMEPAGE="https://www.openjpeg.org"; -SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )" - -LICENSE="BSD-2" -SLOT="2/7" # based on SONAME -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/lcms:2 - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib:=" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.4.0-r1-gnuinstalldirs.patch" # bug 667150 - "${FILESDIR}/${PN}-2.4.0-r2-fix-segfault.patch" # bug 832007 - "${FILESDIR}/${PN}-2.4.0-r3-fix-integer-overflow.patch" # bug 783513 - "${FILESDIR}/${PN}-2.4.0-r3-avoid-mult-overflow.patch" # bug 783513 -) - -src_prepare() { - if use test; then - mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || - die "Failed to rename test data" - fi - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 - -DBUILD_TESTING="$(multilib_native_usex test)" - -DBUILD_DOC=$(multilib_native_usex doc ON OFF) - -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - # Cheat a little bit and force disabling fixed point magic - # The test suite is extremely fragile to small changes - # bug 715130, bug 715422 - # https://github.com/uclouvain/openjpeg/issues/1017 - multilib_is_native_abi && use test && append-cflags "-ffp-contract=off" - - cmake_src_configure -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - elog "Cannot run tests for non-multilib abi." - return 0 - fi - - local myctestargs= - - pushd "${BUILD_DIR}" > /dev/null || die - [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" - - [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) - - echo ctest "${myctestargs[@]}" "$@" - if ctest "${myctestargs[@]}" "$@" ; then - einfo "Tests succeeded." - popd > /dev/null || die - return 0 - else - local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" - - if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then - # Should never happen - die "Cannot analyze test failures: LastTestsFailed.log is missing!" - fi - - echo "" - einfo "Note: Upstream is maintaining a list of known test failures." - einfo "We will now compare our test results against this list and sort out any known failure." - - local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" - cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die - - local ARCH_SPECIFIC_FAILURES= - if use amd64 ; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - elif use x86 || use arm || use arm64; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - fi - - if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then - einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." - cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die - fi - - # Logic copied from $S/tools/travis-ci/run.sh - local FAILEDTEST= - local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" - local HAS_UNKNOWN_TEST_FAILURES=0 - - echo "" - - awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" - while read FAILEDTEST; do - # is this failure known? - if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then - ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." - continue - fi - - eerror "New/unknown test failure found: '${FAILEDTEST}'" - HAS_UNKNOWN_TEST_FAILURES=1 - done < "${FAILURES_LOG}" - - if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then - die "Test suite failed. New/unknown test failure(s) found!" - else - echo "" - einfo "Test suite passed. No new/unknown test failure(s) found!" - fi - - return 0 - fi -} diff --git a/media-libs/openjpeg/openjpeg-2.4.0.ebuild b/media-libs/openjpeg/openjpeg-2.4.0.ebuild deleted file mode 100644 index 2541abf1fe5b..000000000000 --- a/media-libs/openjpeg/openjpeg-2.4.0.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# 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 - -# Make sure that test data are not newer than release; -# otherwise we will see "Found-But-No-Test" test failures! -MY_TESTDATA_COMMIT="cd724fb1f93e6af41ebc68c4904f4bf2a4cd1e60" - -DESCRIPTION="Open-source JPEG 2000 library" -HOMEPAGE="https://www.openjpeg.org"; -SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - test? ( https://github.com/uclouvain/openjpeg-data/archive/${MY_TESTDATA_COMMIT}.tar.gz -> ${PN}-data_20201130.tar.gz )" - -LICENSE="BSD-2" -SLOT="2/7" # based on SONAME -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-libs/lcms:2 - media-libs/libpng:0= - media-libs/tiff:0 - sys-libs/zlib:=" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( app-doc/doxygen )" - -DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) - -PATCHES=( - "${FILESDIR}/${PN}-2.4.0-gnuinstalldirs.patch" # bug 667150 -) - -src_prepare() { - if use test; then - mv "${WORKDIR}"/openjpeg-data-${MY_TESTDATA_COMMIT} "${WORKDIR}"/data || - die "Failed to rename test data" - fi - - cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 - -DBUILD_TESTING="$(multilib_native_usex test)" - -DBUILD_DOC=$(multilib_native_usex doc ON OFF) - -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) - -DBUILD_STATIC_LIBS=$(usex static-libs) - ) - - # Cheat a little bit and force disabling fixed point magic - # The test suite is extremely fragile to small changes - # bug 715130, bug 715422 - # https://github.com/uclouvain/openjpeg/issues/1017 - multilib_is_native_abi && use test && append-cflags "-ffp-contract=off" - - cmake_src_configure -} - -multilib_src_test() { - if ! multilib_is_native_abi ; then - elog "Cannot run tests for non-multilib abi." - return 0 - fi - - local myctestargs= - - pushd "${BUILD_DIR}" > /dev/null || die - [[ -e CTestTestfile.cmake ]] || die "Test suite not available! Check source!" - - [[ -n ${TEST_VERBOSE} ]] && myctestargs+=( --extra-verbose --output-on-failure ) - - echo ctest "${myctestargs[@]}" "$@" - if ctest "${myctestargs[@]}" "$@" ; then - einfo "Tests succeeded." - popd > /dev/null || die - return 0 - else - local FAILEDTEST_LOG="${BUILD_DIR}/Testing/Temporary/LastTestsFailed.log" - - if [[ ! -f "${FAILEDTEST_LOG}" ]] ; then - # Should never happen - die "Cannot analyze test failures: LastTestsFailed.log is missing!" - fi - - echo "" - einfo "Note: Upstream is maintaining a list of known test failures." - einfo "We will now compare our test results against this list and sort out any known failure." - - local KNOWN_FAILURES_LIST="${T}/known_failures_compiled.txt" - cat "${S}/tools/travis-ci/knownfailures-all.txt" > "${KNOWN_FAILURES_LIST}" || die - - local ARCH_SPECIFIC_FAILURES= - if use amd64 ; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*x86_64*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - elif use x86 || use arm || use arm64; then - ARCH_SPECIFIC_FAILURES="$(find "${S}/tools/travis-ci/" -name 'knownfailures-*i386*.txt' -print0 | sort -z | tail -z -n 1 | tr -d '\0')" - fi - - if [[ -f "${ARCH_SPECIFIC_FAILURES}" ]] ; then - einfo "Adding architecture specific failures (${ARCH_SPECIFIC_FAILURES}) to known failures list ..." - cat "${ARCH_SPECIFIC_FAILURES}" >> "${KNOWN_FAILURES_LIST}" || die - fi - - # Logic copied from $S/tools/travis-ci/run.sh - local FAILEDTEST= - local FAILURES_LOG="${BUILD_DIR}/Testing/Temporary/failures.txt" - local HAS_UNKNOWN_TEST_FAILURES=0 - - echo "" - - awk -F: '{ print $2 }' "${FAILEDTEST_LOG}" > "${FAILURES_LOG}" - while read FAILEDTEST; do - # is this failure known? - if grep -x "${FAILEDTEST}" "${KNOWN_FAILURES_LIST}" > /dev/null; then - ewarn "Test '${FAILEDTEST}' is known to fail, ignoring ..." - continue - fi - - eerror "New/unknown test failure found: '${FAILEDTEST}'" - HAS_UNKNOWN_TEST_FAILURES=1 - done < "${FAILURES_LOG}" - - if [[ ${HAS_UNKNOWN_TEST_FAILURES} -ne 0 ]]; then - die "Test suite failed. New/unknown test failure(s) found!" - else - echo "" - einfo "Test suite passed. No new/unknown test failure(s) found!" - fi - - return 0 - fi -}
