commit: 8000a18e51631d5ef563000469ab6d0a3d60e24e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Dec 29 08:35:03 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Dec 29 08:35:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8000a18e
media-libs/openjpeg: fix install locations patch Closes: https://bugs.gentoo.org/762373 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/openjpeg-2.4.0-gnuinstalldirs.patch | 25 +++++++++++++++++----- 1 file changed, 20 insertions(+), 5 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 index 7b0014980fd..82ad4075a94 100644 --- a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch +++ b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch @@ -4,7 +4,7 @@ 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 +(Later rebased by [email protected] for 2.4.0) --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ @@ -81,7 +81,22 @@ Raises minimum cmake version by a little. option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) endif() -@@ -366,14 +335,14 @@ if(BUILD_PKGCONFIG_FILES) +@@ -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 @@ -98,7 +113,7 @@ Raises minimum cmake version by a little. endif() # if(BUILD_JPIP) -@@ -381,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES) +@@ -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 @@ -107,7 +122,7 @@ Raises minimum cmake version by a little. endif() # if(BUILD_JP3D) -@@ -389,7 +358,7 @@ if(BUILD_PKGCONFIG_FILES) +@@ -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 @@ -318,7 +333,7 @@ Raises minimum cmake version by a little. +mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ +docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ -+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ Name: openjp3d Description: JPEG2000 Extensions for three-dimensional data (Part 10)
