diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-11-03 22:10:38 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-11-03 22:30:52 +0100 |
| commit | d1f0d027ec3be50b66a9ce69aed19cb795c23460 (patch) | |
| tree | 37f8b928dfade519f46077a2aed60947366e6f9d /media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | |
| parent | media-libs/openjpeg: Always install pkgconfig (diff) | |
| download | gentoo-d1f0d027ec3be50b66a9ce69aed19cb795c23460.tar.gz gentoo-d1f0d027ec3be50b66a9ce69aed19cb795c23460.tar.bz2 gentoo-d1f0d027ec3be50b66a9ce69aed19cb795c23460.zip | |
media-libs/openjpeg: Use GNUInstallDirs
Patches pending upstream: https://github.com/uclouvain/openjpeg/pull/1165
Bug: https://bugs.gentoo.org/667150
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Diffstat (limited to 'media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild')
| -rw-r--r-- | media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild index 4dd04ca70f2c..8d15446c08e0 100644 --- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild +++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild @@ -31,6 +31,7 @@ DOCS=( AUTHORS.md CHANGELOG.md NEWS.md README.md THANKS.md ) PATCHES=( "${FILESDIR}/${P}-fix-disable-static-libs.patch" # bug 650322 + "${FILESDIR}/${P}-gnuinstalldirs.patch" # bug 667150 ) src_prepare() { @@ -40,18 +41,11 @@ src_prepare() { fi cmake-utils_src_prepare - - # Stop installing LICENSE file, and install CHANGES from DOCS instead: - sed -i -e '/install.*FILES.*DESTINATION.*OPENJPEG_INSTALL_DOC_DIR/d' CMakeLists.txt || die - - # Install doxygen docs to the right directory: - sed -i -e "s:DESTINATION\s*share/doc:\0/${PF}:" doc/CMakeLists.txt || die } multilib_src_configure() { local mycmakeargs=( -DBUILD_PKGCONFIG_FILES=ON # always build pkgconfig files, bug #539834 - -DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)" -DBUILD_TESTING="$(multilib_native_usex test)" -DBUILD_DOC=$(multilib_native_usex doc ON OFF) -DBUILD_CODEC=$(multilib_is_native_abi && echo ON || echo OFF) |