From 1300f5f73c69b5d2e0352cdb0a5f8f5e169e0723 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 11 Apr 2019 12:47:25 +0200 Subject: [PATCH] media-libs/openjpeg: Bump to version 2.3.1 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Lars Wendler --- media-libs/openjpeg/Manifest | 2 + .../files/openjpeg-2.3.1-gnuinstalldirs.patch | 495 ++++++++++++++++++ media-libs/openjpeg/openjpeg-2.3.1.ebuild | 131 +++++ 3 files changed, 628 insertions(+) create mode 100644 media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch create mode 100644 media-libs/openjpeg/openjpeg-2.3.1.ebuild diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest index 62efea271dd2..cd6c971b7360 100644 --- a/media-libs/openjpeg/Manifest +++ b/media-libs/openjpeg/Manifest @@ -1,3 +1,5 @@ DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572bd590206cd823dedccfd4001444d73a81ccbf82616a40a35ad8b1fae8d2f08d7c265a771d9d9ef413beac5e84ac1 SHA512 b945cf4f8b5e3227a0c07120c94b0ed5bf30c901de73059ee1d47975f46744fb62bbe84cdb2917c6431128f400020874eb07160af870b5448ced897998b08862 DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568 +DIST openjpeg-2.3.1.tar.gz 2214401 BLAKE2B ecc7e573592a5302dcdbade791f6aa6e48f6791c7412fdd44976f3619c8fc0cca7d904fa42013f33ab17dd0f569a76d3c49a73eccaf0a749d34f305362367af9 SHA512 339fbc899bddf2393d214df71ed5d6070a3a76b933b1e75576c8a0ae9dfcc4adec40bdc544f599e4b8d0bc173e4e9e7352408497b5b3c9356985605830c26c03 DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24 +DIST openjpeg-data_20180620.tar.gz 497894373 BLAKE2B 3a596f8f9ee56037bf567b6f2d3731b97299dba24e0c9d3562d38c15ddf58d352a918edaccb528f054cf288f87d6362d90d3450d4a5b968e9c8dfe05f54d89fe SHA512 32189a10c4d8cf00c23cda455f9e4353deb2175189d85f9b3aab1c4375a02a491ec2de89815725ebbcaea86c2c7ab274b89ee2583ffd8bf0dc32d4fc2d8f7507 diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch new file mode 100644 index 000000000000..b0b2666c7220 --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch @@ -0,0 +1,495 @@ +From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 11 Apr 2019 13:10:57 +0200 +Subject: [PATCH] Use GNUInstallDirs for standard installation directories + +Raises minimum cmake version by a little. +--- + CMakeLists.txt | 61 +++++------------------- + cmake/OpenJPEGConfig.cmake.in | 2 +- + doc/CMakeLists.txt | 2 +- + src/bin/jp2/CMakeLists.txt | 4 +- + src/bin/jp3d/CMakeLists.txt | 2 +- + src/bin/jpip/CMakeLists.txt | 10 ++-- + src/bin/jpwl/CMakeLists.txt | 2 +- + src/bin/mj2/CMakeLists.txt | 2 +- + src/lib/openjp2/CMakeLists.txt | 12 ++--- + src/lib/openjp2/libopenjp2.pc.cmake.in | 10 ++-- + src/lib/openjp3d/CMakeLists.txt | 4 +- + src/lib/openjp3d/libopenjp3d.pc.cmake.in | 10 ++-- + src/lib/openjpip/CMakeLists.txt | 8 ++-- + src/lib/openjpip/libopenjpip.pc.cmake.in | 10 ++-- + src/lib/openjpwl/CMakeLists.txt | 6 +-- + src/lib/openjpwl/libopenjpwl.pc.cmake.in | 10 ++-- + src/lib/openmj2/CMakeLists.txt | 4 +- + wrapping/java/openjp2/CMakeLists.txt | 2 +- + 18 files changed, 61 insertions(+), 100 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ea2424a..1f70226a 100644 +--- 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) +@@ -103,59 +103,28 @@ endif() + + # -------------------------------------------------------------------------- + # Install directories ++include(GNUInstallDirs) ++ + # Build DOCUMENTATION (not in ALL target and only if Doxygen is found) + 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() + +@@ -339,14 +308,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) + +@@ -363,14 +324,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) +@@ -378,7 +339,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) +@@ -386,7 +347,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() + +diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in +index 2925108a..702e2790 100644 +--- a/cmake/OpenJPEGConfig.cmake.in ++++ b/cmake/OpenJPEGConfig.cmake.in +@@ -29,7 +29,7 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake) + + # We find a relative path from the PKG directory to header files. + set(PKG_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_PACKAGE_DIR@") +- set(INC_DIR "@CMAKE_INSTALL_PREFIX@/@OPENJPEG_INSTALL_INCLUDE_DIR@") ++ set(INC_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@") + file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}") + + get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE) +diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt +index d4f3ddbe..ed5cb44c 100644 +--- 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 share/doc ++ DESTINATION ${CMAKE_INSTALL_DOCDIR} + PATTERN ".svn" EXCLUDE + ) + else() +diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt +index 4d4bd952..29b4dd20 100644 +--- 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() +diff --git a/src/bin/jp3d/CMakeLists.txt b/src/bin/jp3d/CMakeLists.txt +index 3cac1a8f..ed62b4f3 100644 +--- 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() +diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt +index 301d885b..ddd867dc 100644 +--- 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() +diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt +index 5df225de..8a798e61 100644 +--- 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() +diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt +index 5d3e288b..6669c502 100644 +--- 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() +diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt +index b2714858..9cbc4c3f 100644 +--- 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) +diff --git a/src/lib/openjp2/libopenjp2.pc.cmake.in b/src/lib/openjp2/libopenjp2.pc.cmake.in +index 62159b00..ebad9578 100644 +--- 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) +diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt +index b0469af1..6e251984 100644 +--- 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 + ) +diff --git a/src/lib/openjp3d/libopenjp3d.pc.cmake.in b/src/lib/openjp3d/libopenjp3d.pc.cmake.in +index e9b6c404..866a0174 100644 +--- 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) +diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt +index b3cb8ce8..aace36d4 100644 +--- 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() +diff --git a/src/lib/openjpip/libopenjpip.pc.cmake.in b/src/lib/openjpip/libopenjpip.pc.cmake.in +index 7c3f29af..4cfa6fce 100644 +--- 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) +diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt +index 1b33adbe..bb90c87c 100644 +--- 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 + ) +diff --git a/src/lib/openjpwl/libopenjpwl.pc.cmake.in b/src/lib/openjpwl/libopenjpwl.pc.cmake.in +index b1244197..8acc1457 100644 +--- 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) +diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt +index 25294b20..dced53f6 100644 +--- 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 + #) +diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt +index eb3da0ed..4504da5f 100644 +--- 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 + ) +-- +2.21.0 + diff --git a/media-libs/openjpeg/openjpeg-2.3.1.ebuild b/media-libs/openjpeg/openjpeg-2.3.1.ebuild new file mode 100644 index 000000000000..9140607a0a34 --- /dev/null +++ b/media-libs/openjpeg/openjpeg-2.3.1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-multilib + +# Make sure that test data are not newer than release; +# otherwise we will see "Found-But-No-Test" test failures! +MY_TESTDATA_COMMIT="25632d6deca2e567d30ef476b4abe63916c36f6e" + +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_20180620.tar.gz )" + +LICENSE="BSD-2" +SLOT="2/7" # based on SONAME +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="doc static-libs 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.3.1-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-utils_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) + ) + + cmake-utils_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 +} -- 2.26.2