diff options
| author |   Markus Meier <maekke@gentoo.org> | 2023-07-03 22:16:20 +0200 |
|---|---|---|
| committer | Markus Meier <maekke@gentoo.org> | 2023-07-03 22:19:40 +0200 |
| commit | 53fde4bcfc4abc06c04199a625fca797dc32d104 (patch) | |
| tree | 40516b0cdeaa4cfadf2849745813c55c1040146c | |
| parent | media-libs/lensfun: sync with main tree (diff) | |
| download | maekke-53fde4bcfc4abc06c04199a625fca797dc32d104.tar.gz maekke-53fde4bcfc4abc06c04199a625fca797dc32d104.tar.bz2 maekke-53fde4bcfc4abc06c04199a625fca797dc32d104.zip | |
media-libs/lensfun: install python part directly in ebuild
Signed-off-by: Markus Meier <maekke@gentoo.org>
| -rw-r--r-- | media-libs/lensfun/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/lensfun/files/lensfun-0.3.4_rc1_python.patch | 27 | ||||
| -rw-r--r-- | media-libs/lensfun/lensfun-0.3.4_rc1.ebuild | 4 |
3 files changed, 32 insertions, 2 deletions
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest index a895c06..ca0d5b0 100644 --- a/media-libs/lensfun/Manifest +++ b/media-libs/lensfun/Manifest @@ -1,3 +1,4 @@ +AUX lensfun-0.3.4_rc1_python.patch 1243 BLAKE2B 1308911bd0d7ae50d187cda901ba68b5841b36e7e1f17edee7119e007108465262b0ad4475b7ac79e8c0c48c6b7135f325d405029ea08c258e1c5362b309f0ff SHA512 563a8bdb8b87abc1ddeffb4dcdb42c7a9ea1bddc9a3cd029ab75d94bcac0799657ae16791a14205670ff4edcb979d6e7a24356cb62bd6527ce06df4d5e79c710 DIST lensfun-0.3.4_rc1.tar.gz 1045616 BLAKE2B fee14b97dcda98be4e8a32443ff71347ba75e46192f8437be580cb6697f6ef2eca92ef57cfcb2de5bd87fe7ba96542a6b5551b12f50fec09a035c69d6f4b427f SHA512 0d034c6996e5650b022d33a7e00ef7e0e00dfa99155aa62c6c3ab48b9ac936e46f812ceea46e2070514e2c77150a1d7c827831686b1cf73e2acf88b6b3dfb6c5 -EBUILD lensfun-0.3.4_rc1.ebuild 1478 BLAKE2B 8d174b0fb60812e9855176ee9b2021c1f162ceb2d04d1a8bddc2e6211c8f6cd35159436a2781f741a299e0b8f907063519a3d1abdf720420fa8ae03144e8a760 SHA512 1280a1013cb934823031f9bb7a2400f281d588fbe9ed38316939c4e18106f1d7a3fc13f1d987d3aa808eee97a9a21afd23bd2d59ca4a938a5a47f223157d38c4 +EBUILD lensfun-0.3.4_rc1.ebuild 1573 BLAKE2B 4c7bf7e2dc71f5deb56e702494584a28373f0a37bd8a1b34f092e5cb714997ecb8cae2ee71c2e2b2ea0929cb0a49eccf6ace3ba9a0c0c2581414cbce2ff0877b SHA512 52214d366dcd08398a5dfb9363b7eaffeca99458957ea8a4f901d3ea7f52a9e6a273831e16d58aedcad2c8d5dd7d1104923724b031c209f812d1c7caad2478b0 MISC metadata.xml 716 BLAKE2B 866b92afec30235731857799268948cf0d63be654432c72bf6a93084d2e344d486d0156571e08accfce4c9323aee6e7f155620d2e7a72ebfe69ef27b39bb13cb SHA512 fa3c54e5ea453bcefb5e9b9c76c3a45fa74280ba52b713ac93aa5a95341dc0f9111130b1952bc0a4b3b7898d5d0bde46234e1b42453757ead0c42c002141e6c4 diff --git a/media-libs/lensfun/files/lensfun-0.3.4_rc1_python.patch b/media-libs/lensfun/files/lensfun-0.3.4_rc1_python.patch new file mode 100644 index 0000000..17df4e0 --- /dev/null +++ b/media-libs/lensfun/files/lensfun-0.3.4_rc1_python.patch @@ -0,0 +1,27 @@ +diff -ru lensfun-0.3.4-RC1.orig/apps/CMakeLists.txt lensfun-0.3.4-RC1/apps/CMakeLists.txt +--- lensfun-0.3.4-RC1.orig/apps/CMakeLists.txt 2023-07-03 22:08:51.275590471 +0200 ++++ lensfun-0.3.4-RC1/apps/CMakeLists.txt 2023-07-03 22:09:35.124594218 +0200 +@@ -23,17 +23,13 @@ + + FIND_PROGRAM(PYTHON "python3") + IF(PYTHON) +- SET(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in") +- SET(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py") + SET(DEPS_IN "${CMAKE_CURRENT_SOURCE_DIR}/lensfun/__init__.py.in") + SET(DEPS "${CMAKE_CURRENT_BINARY_DIR}/lensfun/__init__.py") + SET(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/build/timestamp") + +- CONFIGURE_FILE(${SETUP_PY_IN} ${SETUP_PY}) + CONFIGURE_FILE(${DEPS_IN} ${DEPS}) + + ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT} +- COMMAND ${PYTHON} ${SETUP_PY} build + COMMAND ${CMAKE_COMMAND} -E touch ${OUTPUT} + DEPENDS ${DEPS_IN}) + +@@ -42,5 +38,4 @@ + IF(NOT DEFINED SETUP_PY_INSTALL_PREFIX) + SET(SETUP_PY_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") + ENDIF() +- INSTALL(CODE "execute_process(COMMAND ${PYTHON} ${SETUP_PY} install --prefix=\$ENV{DESTDIR}${SETUP_PY_INSTALL_PREFIX})") + ENDIF(PYTHON) diff --git a/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild index 2ce6102..77c69c8 100644 --- a/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild +++ b/media-libs/lensfun/lensfun-0.3.4_rc1.ebuild @@ -34,11 +34,11 @@ BDEPEND=" " DOCS=( README.md docs/mounts.txt ChangeLog ) +PATCHES=( "${FILESDIR}/${P}_python.patch" ) src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html - -DSETUP_PY_INSTALL_PREFIX=/usr -DBUILD_LENSTOOL=ON -DBUILD_STATIC=OFF -DBUILD_DOC=$(usex doc) @@ -58,5 +58,7 @@ src_test() { src_install() { cmake_src_install + python_moduleinto lensfun + python_domodule "${BUILD_DIR}"/apps/lensfun/__init__.py python_optimize } |