From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F2AB015808D for ; Sat, 23 Apr 2022 17:49:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92F0FE095D; Sat, 23 Apr 2022 17:49:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A2E4E095D for ; Sat, 23 Apr 2022 17:49:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D72CA341E0A for ; Sat, 23 Apr 2022 17:49:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5280F443 for ; Sat, 23 Apr 2022 17:49:16 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1650678775.8983c9529f931d9e61c41e5d863b881d7cf95ac3.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sci-libs/dart/files/, sci-libs/dart/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sci-libs/dart/dart-6.12.1-r1.ebuild sci-libs/dart/dart-6.12.1.ebuild sci-libs/dart/files/dart-6.12.1-no-deprecated-examples.patch X-VCS-Directories: sci-libs/dart/ sci-libs/dart/files/ X-VCS-Committer: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 8983c9529f931d9e61c41e5d863b881d7cf95ac3 X-VCS-Branch: master Date: Sat, 23 Apr 2022 17:49:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8da265ad-df2c-477a-9b5b-9d4f2f022b29 X-Archives-Hash: b8c18b2f73a6180d97429d02323c17a2 commit: 8983c9529f931d9e61c41e5d863b881d7cf95ac3 Author: Alessandro Barbieri gmail com> AuthorDate: Sat Apr 23 00:52:47 2022 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Sat Apr 23 01:52:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8983c952 sci-libs/dart: fix examples/tutorials installation Signed-off-by: Alessandro Barbieri gmail.com> .../{dart-6.12.1.ebuild => dart-6.12.1-r1.ebuild} | 36 ++++++++++++++++------ .../files/dart-6.12.1-no-deprecated-examples.patch | 9 ++++++ 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/sci-libs/dart/dart-6.12.1.ebuild b/sci-libs/dart/dart-6.12.1-r1.ebuild similarity index 83% rename from sci-libs/dart/dart-6.12.1.ebuild rename to sci-libs/dart/dart-6.12.1-r1.ebuild index 9186f3021..58aa8a47e 100644 --- a/sci-libs/dart/dart-6.12.1.ebuild +++ b/sci-libs/dart/dart-6.12.1-r1.ebuild @@ -5,6 +5,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..10} ) +CMAKE_BUILD_TYPE="Release" + inherit cmake python-single-r1 DESCRIPTION="Dynamic Animation and Robotics Toolkit" @@ -45,7 +47,7 @@ RDEPEND=" glut? ( media-libs/freeglut ) gui? ( dev-games/openscenegraph - media-libs/imgui:=[opengl(-)] + media-libs/imgui:=[glut(-)?,opengl(-)] media-libs/lodepng:= virtual/opengl x11-libs/libXi @@ -67,10 +69,7 @@ DEPEND=" dev-cpp/gtest dev-libs/urdfdom_headers ) - test? ( - dev-cpp/gtest - python? ( $(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]') ) - ) + test? ( dev-cpp/gtest ) urdfdom? ( dev-libs/urdfdom_headers ) " BDEPEND=" @@ -81,6 +80,7 @@ BDEPEND=" RESTRICT="!test? ( test )" PATCHES=( + "${FILESDIR}/${P}-no-deprecated-examples.patch" "${FILESDIR}/${PN}-respect-ldflags.patch" "${FILESDIR}/${P}-respect-cflags.patch" "${FILESDIR}/${P}-use-system-gtest.patch" @@ -88,6 +88,7 @@ PATCHES=( ) REQUIRED_USE=" examples? ( gui ) + gui? ( glut ) python? ( ${PYTHON_REQUIRED_USE} gui @@ -101,9 +102,11 @@ pkg_setup() { } src_prepare() { - # delete bundled gtest + # delete bundled libs rm -r unittests/gtest || die rm -r dart/external/{imgui,lodepng} || die + # delete deprecated examples + rm -r examples/deprecated_examples || die dos2unix unittests/CMakeLists.txt || die cmake_src_prepare } @@ -135,9 +138,10 @@ src_configure() { use cpu_flags_arm_iwmmxt2 && simd=ON use cpu_flags_arm_neon && simd=ON + export ODE_DIR="${EPREFIX}/usr" + local mycmakeargs=( -DBUILD_SHARED_LIBS=ON - -DCMAKE_BUILD_TYPE=Release -DDART_CODECOV=OFF -DDART_VERBOSE=ON -DDART_TREAT_WARNINGS_AS_ERRORS=OFF @@ -152,14 +156,26 @@ src_configure() { src_compile() { cmake_src_compile use examples && cmake_build examples - use python && cmake_build dartpy # no work to do ... + use python && cmake_build dartpy use test && cmake_build tests use tutorials && cmake_build tutorials } src_install() { cmake_src_install - #TODO: python examples tests tutorials - mv "${ED}/usr/share/doc/dart" "${ED}/usr/share/doc/${PF}" || die + #TODO: python (?) + if ! use examples ; then + rm -rf "${ED}/usr/share/doc/dart/examples" || die + fi + if ! use tutorials ; then + rm -rf "${ED}/usr/share/doc/dart/tutorials" || die + fi + if use examples || use tutorials ; then + exeinto "/usr/libexec/${PN}" + doexe "${BUILD_DIR}"/bin/* + fi +# use python && cmake_build install-dartpy + mv "${ED}/usr/share/doc/dart/data" "${ED}/usr/share/${PN}" || die + mv "${ED}"/usr/share/doc/dart/* "${ED}/usr/share/doc/${PF}" || die docompress -x "/usr/share/doc/${PF}" } diff --git a/sci-libs/dart/files/dart-6.12.1-no-deprecated-examples.patch b/sci-libs/dart/files/dart-6.12.1-no-deprecated-examples.patch new file mode 100644 index 000000000..a16045d94 --- /dev/null +++ b/sci-libs/dart/files/dart-6.12.1-no-deprecated-examples.patch @@ -0,0 +1,9 @@ +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -27,6 +27,3 @@ + + # MJCF model based examples + add_subdirectory(fetch) +- +-# Deprecated examples +-add_subdirectory(deprecated_examples)