| 1 |
commit: 8000a18e51631d5ef563000469ab6d0a3d60e24e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 29 08:35:03 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 29 08:35:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8000a18e |
| 7 |
|
| 8 |
media-libs/openjpeg: fix install locations patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/762373 |
| 11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.2 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
.../files/openjpeg-2.4.0-gnuinstalldirs.patch | 25 +++++++++++++++++----- |
| 15 |
1 file changed, 20 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch |
| 18 |
index 7b0014980fd..82ad4075a94 100644 |
| 19 |
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch |
| 20 |
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch |
| 21 |
@@ -4,7 +4,7 @@ Date: Thu, 11 Apr 2019 13:10:57 +0200 |
| 22 |
Subject: [PATCH] Use GNUInstallDirs for standard installation directories |
| 23 |
|
| 24 |
Raises minimum cmake version by a little. |
| 25 |
-- Later rebased by sam@g.o for 2.4.0 |
| 26 |
+(Later rebased by sam@g.o for 2.4.0) |
| 27 |
--- a/CMakeLists.txt |
| 28 |
+++ b/CMakeLists.txt |
| 29 |
@@ -7,7 +7,7 @@ |
| 30 |
@@ -81,7 +81,22 @@ Raises minimum cmake version by a little. |
| 31 |
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) |
| 32 |
endif() |
| 33 |
|
| 34 |
-@@ -366,14 +335,14 @@ if(BUILD_PKGCONFIG_FILES) |
| 35 |
+@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake |
| 36 |
+ ) |
| 37 |
+ |
| 38 |
+ #----------------------------------------------------------------------------- |
| 39 |
+-# install CHANGES and LICENSE |
| 40 |
+-if(BUILD_DOC) |
| 41 |
+-if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) |
| 42 |
+- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
| 43 |
+-endif() |
| 44 |
+- |
| 45 |
+-install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) |
| 46 |
+-endif() |
| 47 |
+ |
| 48 |
+ include (cmake/OpenJPEGCPack.cmake) |
| 49 |
+ |
| 50 |
+@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES) |
| 51 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in |
| 52 |
${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) |
| 53 |
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION |
| 54 |
@@ -98,7 +113,7 @@ Raises minimum cmake version by a little. |
| 55 |
endif() |
| 56 |
# |
| 57 |
if(BUILD_JPIP) |
| 58 |
-@@ -381,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES) |
| 59 |
+@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES) |
| 60 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in |
| 61 |
${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) |
| 62 |
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION |
| 63 |
@@ -107,7 +122,7 @@ Raises minimum cmake version by a little. |
| 64 |
endif() |
| 65 |
# |
| 66 |
if(BUILD_JP3D) |
| 67 |
-@@ -389,7 +358,7 @@ if(BUILD_PKGCONFIG_FILES) |
| 68 |
+@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES) |
| 69 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in |
| 70 |
${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) |
| 71 |
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION |
| 72 |
@@ -318,7 +333,7 @@ Raises minimum cmake version by a little. |
| 73 |
+mandir=${prefix}/@CMAKE_INSTALL_MANDIR@ |
| 74 |
+docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@ |
| 75 |
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ |
| 76 |
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
| 77 |
++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ |
| 78 |
|
| 79 |
Name: openjp3d |
| 80 |
Description: JPEG2000 Extensions for three-dimensional data (Part 10) |
Archives