* [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/
@ 2016-12-29 13:14 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2016-12-29 13:14 UTC (permalink / raw
To: gentoo-commits
commit: 56051b2a7d5aca0f7d18b43b874023cbade03405
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Dec 23 16:11:24 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 29 13:11:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56051b2a
media-libs/openjpeg: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3224
.../openjpeg/files/openjpeg-2.0.0-build.patch | 14 --------
.../files/openjpeg-2.0.0-pkgconfig-static.patch | 10 ------
.../openjpeg/files/openjpeg-2.0.0-pkgconfig.patch | 37 ----------------------
3 files changed, 61 deletions(-)
diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
deleted file mode 100644
index 31ae12f..00000000
--- a/media-libs/openjpeg/files/openjpeg-2.0.0-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- openjpeg-2.0.0/CMakeLists.txt
-+++ openjpeg-2.0.0/CMakeLists.txt
-@@ -279,11 +279,4 @@
- DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
- )
-
--#-----------------------------------------------------------------------------
--# install CHANGES and LICENSE
--if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
-- install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--endif()
--install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
--
- include (cmake/OpenJPEGCPack.cmake)
diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig-static.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig-static.patch
deleted file mode 100644
index 60a5a47..00000000
--- a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig-static.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Upstream issue 223, http://code.google.com/p/openjpeg/issues/detail?id=223
-
---- openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
-+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
-@@ -10,4 +10,5 @@
- URL: http://www.openjpeg.org/
- Version: @OPENJPEG_VERSION@
- Libs: -L${libdir} -lopenjp2
-+Libs.private: -L${libdir} -lopenjp2 -lm
- Cflags: -I${includedir}
diff --git a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch b/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
deleted file mode 100644
index 656f4c2..00000000
--- a/media-libs/openjpeg/files/openjpeg-2.0.0-pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Pkgconfig support http://code.google.com/p/openjpeg/source/detail?r=2250
-
---- openjpeg-2.0.0/CMakeLists.txt
-+++ openjpeg-2.0.0/CMakeLists.txt
-@@ -171,6 +171,16 @@
- endif()
-
- #-----------------------------------------------------------------------------
-+# pkgconfig support
-+if(UNIX)
-+ # install in lib and not share (see multi-arch note above)
-+ 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 )
-+endif()
-+
-+#-----------------------------------------------------------------------------
- # Compiler specific flags:
- if(CMAKE_COMPILER_IS_GNUCC)
- # For all builds, make sure openjpeg is std99 compliant:
---- /dev/null
-+++ openjpeg-2.0.0/src/lib/openjp2/libopenjp2.pc.cmake.in
-@@ -0,0 +1,13 @@
-+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@
-+
-+Name: openjp2
-+Description: JPEG2000 library (Part 1 and 2)
-+URL: http://www.openjpeg.org/
-+Version: @OPENJPEG_VERSION@
-+Libs: -L${libdir} -lopenjp2
-+Cflags: -I${includedir}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/
@ 2019-10-12 10:18 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2019-10-12 10:18 UTC (permalink / raw
To: gentoo-commits
commit: ef58e4bf1e89bb88381263c85ea4f55d9aae7efc
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 21 18:24:49 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 10:18:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef58e4bf
media-libs/openjpeg: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12761
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../openjpeg-2.3.0-fix-disable-static-libs.patch | 23 -
.../files/openjpeg-2.3.0-gnuinstalldirs.patch | 501 ---------------------
2 files changed, 524 deletions(-)
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
deleted file mode 100644
index 9e30f4694f3..00000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-fix-disable-static-libs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Mon, 9 Oct 2017 11:40:43 +0200
-Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
- static-only build lacks the installation target for the library (#1019, fixes
- regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
-
----
- src/lib/openjp2/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
-index 0b4520384..f8990ccf0 100644
---- a/src/lib/openjp2/CMakeLists.txt
-+++ b/src/lib/openjp2/CMakeLists.txt
-@@ -99,6 +99,7 @@ else()
- set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
- else()
- add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
-+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
- endif()
- endif()
-
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch
deleted file mode 100644
index 41942e45155..00000000000
--- a/media-libs/openjpeg/files/openjpeg-2.3.0-gnuinstalldirs.patch
+++ /dev/null
@@ -1,501 +0,0 @@
-From: Andreas Sturmlechner <asturm@gentoo.com>
-Date: Fri, 2 Nov 2018 17:23:49 +0100
-Subject: Use GNUInstallDirs for standard installation directories
-
-Raises minimum cmake version by a little.
-
-
-commit 24fd3ce777a64b8b315cfe1ee642ec7b1cc6aa97
-Author: Libor Bukata <libor.bukata@oracle.com>
-Date: Fri Aug 31 12:57:40 2018 +0200
-
- The change makes a relative path to header files
- always correct regardless of the number of sub-
- directories in OPENJPEG_INSTALL_PACKAGE_DIR variable.
-
-diff --git a/cmake/OpenJPEGConfig.cmake.in b/cmake/OpenJPEGConfig.cmake.in
-index b20294ca..2925108a 100644
---- a/cmake/OpenJPEGConfig.cmake.in
-+++ b/cmake/OpenJPEGConfig.cmake.in
-@@ -26,8 +26,13 @@ get_filename_component(SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
- if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
- # This is an install tree
- include(${SELF_DIR}/OpenJPEGTargets.cmake)
-- get_filename_component(OPENJPEG_INCLUDE_ROOT "${SELF_DIR}/../../@OPENJPEG_INSTALL_INCLUDE_DIR@" ABSOLUTE)
-- set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_ROOT})
-+
-+ # 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@")
-+ file(RELATIVE_PATH PKG_TO_INC_RPATH "${PKG_DIR}" "${INC_DIR}")
-+
-+ get_filename_component(OPENJPEG_INCLUDE_DIRS "${SELF_DIR}/${PKG_TO_INC_RPATH}" ABSOLUTE)
-
- else()
- if(EXISTS ${SELF_DIR}/OpenJPEGExports.cmake)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb545666..2ff3b00a 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)
-@@ -102,59 +102,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()
-
-@@ -338,14 +307,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)
-
-@@ -362,14 +323,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)
-@@ -377,7 +338,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)
-@@ -385,7 +346,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
- )
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/
@ 2020-12-29 8:35 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2020-12-29 8:35 UTC (permalink / raw
To: gentoo-commits
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 sam@gentoo.org for 2.4.0
+(Later rebased by sam@gentoo.org 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)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/
@ 2021-01-18 17:48 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-01-18 17:48 UTC (permalink / raw
To: gentoo-commits
commit: ac08393ceca2d9c7bedbd874cbe48180fa079705
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 17:47:14 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 17:47:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac08393c
media-libs/openjpeg: fix email in patch
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
index b0b2666c722..7eb393b8922 100644
--- a/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.3.1-gnuinstalldirs.patch
@@ -1,5 +1,5 @@
From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.com>
+From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 11 Apr 2019 13:10:57 +0200
Subject: [PATCH] Use GNUInstallDirs for standard installation directories
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/
@ 2022-05-22 21:08 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-22 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 2272d501ef511b7ebc4e687129cb924c33cfc77e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 22 21:08:21 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 22 21:08:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2272d501
media-libs/openjpeg: add link to upstream PR for patch
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
index 1b0a424e3e38..f82b64485979 100644
--- a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -1,3 +1,5 @@
+https://github.com/uclouvain/openjpeg/pull/1165
+
From fecc8e9e23f78de94c41bc641b3e5b9e9a84560b Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Thu, 11 Apr 2019 13:10:57 +0200
@@ -294,6 +296,3 @@ Raises minimum cmake version by a little.
- DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule
)
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/
@ 2022-05-23 20:46 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2022-05-23 20:46 UTC (permalink / raw
To: gentoo-commits
commit: f0941fb5417e182ffce947e0242caa0b61fee71c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 23 20:45:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 23 20:45:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0941fb5
media-libs/openjpeg: cleanup patch
Bug: https://bugs.gentoo.org/847013
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
index 9e0eebbfdfb7..1e5617cc3e3a 100644
--- a/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.5.0-gnuinstalldirs.patch
@@ -120,21 +120,6 @@ Raises minimum cmake version by a little.
endif()
endif()
-@@ -385,3 +346,14 @@ endif()
-
- # build our version of astyle
- SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")
-+
-+message(STATUS "<<< Gentoo configuration >>>
-+Build type ${CMAKE_BUILD_TYPE}
-+Install path ${CMAKE_INSTALL_PREFIX}
-+Compiler flags:
-+C ${CMAKE_C_FLAGS}
-+C++ ${CMAKE_CXX_FLAGS}
-+Linker flags:
-+Executable ${CMAKE_EXE_LINKER_FLAGS}
-+Module ${CMAKE_MODULE_LINKER_FLAGS}
-+Shared ${CMAKE_SHARED_LINKER_FLAGS}\n")
--- a/cmake/OpenJPEGConfig.cmake.in
+++ b/cmake/OpenJPEGConfig.cmake.in
@@ -27,12 +27,8 @@ if(EXISTS ${SELF_DIR}/OpenJPEGTargets.cmake)
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-05-23 20:46 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-23 20:46 [gentoo-commits] repo/gentoo:master commit in: media-libs/openjpeg/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-05-22 21:08 Sam James
2021-01-18 17:48 Sam James
2020-12-29 8:35 Sam James
2019-10-12 10:18 David Seifert
2016-12-29 13:14 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox