diff options
| author | dakkar <dakkar@thenautilus.net> | 2020-04-11 14:19:47 +0100 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2020-04-11 14:20:15 +0100 |
| commit | 4f73bd43e34b36820201916941ae69661e2fdc33 (patch) | |
| tree | e722b07a7c8f2124a7ad12170ac26632454ba2f0 | |
| parent | patch PrusaSlicer (diff) | |
| download | gentoo-overlay-4f73bd43e34b36820201916941ae69661e2fdc33.tar.gz gentoo-overlay-4f73bd43e34b36820201916941ae69661e2fdc33.tar.bz2 gentoo-overlay-4f73bd43e34b36820201916941ae69661e2fdc33.zip | |
patch openexr pkg-config
https://github.com/AcademySoftwareFoundation/openexr/issues/567
| -rw-r--r-- | media-libs/openexr/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/openexr/files/openexr-2.4-fix-pkg-config.patch | 48 | ||||
| -rw-r--r-- | media-libs/openexr/openexr-2.4.1.ebuild | 4 |
3 files changed, 54 insertions, 1 deletions
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index 7f6cf1c..fb4a9d0 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,3 +1,4 @@ +AUX openexr-2.4-fix-pkg-config.patch 2196 BLAKE2B 9321d532a9a9b2360119d4c0e9e0849f488cc18ca4478e7ccf6bea5f7afb651e047edf5af4b23231c3b15fdb885102f8be83119505e42236c64895e50f922542 SHA512 75ca2291854b4628465549b6ed2fc6221200330c340851960cef47a6809f45a4714ba44a699a50897745e4b1ccb94350a15c2661d5f0b47f9819d2d68a270a42 DIST v2.4.1.tar.gz 26809861 BLAKE2B e43b064c82e8b0fb0ad1c4fa82160fc2d3739c42d4e317d9b02b43ce05f7f4576cc7aae9274e6b59303fc58c75c32bf74a7007c86cbbdd608b9b951576e36d66 SHA512 23c0c07fafa42f832e67cbfeeeb12b6b9e373dd0a5b858f463bf5c4d0661c58fad662cef64ef6a3053f0db2f69aee46816568b814872d617284664d1effbbbab -EBUILD openexr-2.4.1.ebuild 699 BLAKE2B 65360b9ba066b8c292558ef065df31edeb67451e1de5bdb35d84454f38cf9beb32fc5aa437bd7b9f533c35dec86b5e6ee2dfd005fedee52a0d5b07b81e11d44e SHA512 79f0efadc34b9907025701a39406f80428b97f6fbd2e280ee8a811f3ecf1b30b828bff01288d8f91bd16b462bdc42decdad0fcee45b892a6e2e864e4d78a3686 +EBUILD openexr-2.4.1.ebuild 760 BLAKE2B feb281d65e359805dde1dead859ba14f5ce7abe5597006067967b23a2a6ae0a64e1f96f17a55c8fcd2e85f3192fdddeb55668b686a4b689f40ced9752a92ac9a SHA512 033288c0ae37f53b3f044d6a2921ffc7aa1505b83fa5f024b714004b3dbca754aeb160780179722355bf97a4a2b7036007b7849f6a21ac5130b11bb54a569e33 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca diff --git a/media-libs/openexr/files/openexr-2.4-fix-pkg-config.patch b/media-libs/openexr/files/openexr-2.4-fix-pkg-config.patch new file mode 100644 index 0000000..47fc75b --- /dev/null +++ b/media-libs/openexr/files/openexr-2.4-fix-pkg-config.patch @@ -0,0 +1,48 @@ +From fe2fccde18bc35db11895718d0b77d3f23d427b5 Mon Sep 17 00:00:00 2001 +From: Kimball Thurston <kdt3rd@gmail.com> +Date: Tue, 5 Nov 2019 21:42:45 +1300 +Subject: [PATCH] Fix #595 and others, issue with pkgconfig generation under + cmake + +autoconf seems to automatically insert the ${prefix} variable reference +when emitting the pkg-config file. Make cmake rules conform to that +pattern. +--- + IlmBase/config/CMakeLists.txt | 6 +++--- + OpenEXR/config/CMakeLists.txt | 6 +++--- + 2 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt +index 508176a4..a6bff04a 100644 +--- a/IlmBase/config/CMakeLists.txt ++++ b/IlmBase/config/CMakeLists.txt +@@ -71,9 +71,9 @@ if(ILMBASE_INSTALL_PKG_CONFIG) + # use a helper function to avoid variable pollution, but pretty simple + function(ilmbase_pkg_config_help pcinfile) + set(prefix ${CMAKE_INSTALL_PREFIX}) +- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) +- set(libdir ${CMAKE_INSTALL_LIBDIR}) +- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(exec_prefix "\${prefix}") ++ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") ++ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions +diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt +index 1ef829a2..8d6d7ac8 100644 +--- a/OpenEXR/config/CMakeLists.txt ++++ b/OpenEXR/config/CMakeLists.txt +@@ -72,9 +72,9 @@ if(OPENEXR_INSTALL_PKG_CONFIG) + # use a helper function to avoid variable pollution, but pretty simple + function(openexr_pkg_config_help pcinfile) + set(prefix ${CMAKE_INSTALL_PREFIX}) +- set(exec_prefix ${CMAKE_INSTALL_BINDIR}) +- set(libdir ${CMAKE_INSTALL_LIBDIR}) +- set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) ++ set(exec_prefix "\${prefix}") ++ set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") ++ set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions diff --git a/media-libs/openexr/openexr-2.4.1.ebuild b/media-libs/openexr/openexr-2.4.1.ebuild index c16fbcc..54fc885 100644 --- a/media-libs/openexr/openexr-2.4.1.ebuild +++ b/media-libs/openexr/openexr-2.4.1.ebuild @@ -20,6 +20,10 @@ RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656 DOCS=( CHANGES.md README.md ) +PATCHES=( + "${FILESDIR}/openexr-2.4-fix-pkg-config.patch" +) + src_configure() { cmake-utils_src_configure } |