diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-15 20:28:49 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-15 20:28:49 +0100 |
commit | 7255c5d5fcd8fcdd07d2791563dc43bf4e14cf3a (patch) | |
tree | 515e0e28ee6d81ce42725bd00b369ea0c1130d91 /media-libs/openjpeg/files | |
parent | 1c3adf43f1b866276828623dd63f9e10d29421d3 (diff) |
gentoo auto-resync : 15:08:2022 - 20:28:49
Diffstat (limited to 'media-libs/openjpeg/files')
5 files changed, 0 insertions, 996 deletions
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 <asturm@gentoo.org> -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 sam@gentoo.org 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 <asturm@gentoo.org> -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 sam@gentoo.org 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 <lliangliang2007@163.com> -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; |