From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 480E41580EB for ; Mon, 26 May 2025 19:43:41 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 32B37343143 for ; Mon, 26 May 2025 19:43:41 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 5F5EA1104B0; Mon, 26 May 2025 19:43:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 4BB0B1104AE for ; Mon, 26 May 2025 19:43:23 +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 C91AB34313D for ; Mon, 26 May 2025 19:43:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4420028E0 for ; Mon, 26 May 2025 19:43:20 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1748288574.122bf8c867be5a04783d73f83a8b2b49ffd694b8.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/openscad/Manifest media-gfx/openscad/openscad-2024.11.14_pre.ebuild X-VCS-Directories: media-gfx/openscad/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 122bf8c867be5a04783d73f83a8b2b49ffd694b8 X-VCS-Branch: master Date: Mon, 26 May 2025 19:43:20 +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: 377b7543-71c2-4244-a10a-af3a170c34b5 X-Archives-Hash: a5051ccc75de426abb456b6497942c69 commit: 122bf8c867be5a04783d73f83a8b2b49ffd694b8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 26 17:49:42 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 26 19:42:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122bf8c8 media-gfx/openscad: drop 2024.11.14_pre Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/openscad/Manifest | 2 - media-gfx/openscad/openscad-2024.11.14_pre.ebuild | 240 ---------------------- 2 files changed, 242 deletions(-) diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 68d7adcadab6..33a19df1450f 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,6 +1,4 @@ DIST openscad-2024.12.30_pre.tar.gz 25338952 BLAKE2B 41baa7f5df30e46611a2ef59dc0aa05ccb85644dddfb979224b5b026f1b9338285eecd50e2078543163621c89fbc81e97b7593b641a223b48ca02029962f8076 SHA512 e63ac792c16852c1bbdf06a3cb044b453e05c20a95158adddbc09239bcf228fd113a6e33f83d5580e615ecab3cdab8436da9e21d2ab3c3f8846f66219218713b -DIST openscad-20241114.tar.gz 25288312 BLAKE2B 0c1a9b4b15c12f4b3b600e81cdb5eeddb34887c83e2ae67735d7221b6660730dc5e7f97f80b84d187772adfa20d15e20f0cded1b4937e26305434847bbf2af27 SHA512 6c66c09e4b72ec5ef200d077b58fcb7a5a9acd359551a5daebdc3e24cb2cb7ed7d607b04e5563ea6f14d9d929310c3a9194ac889f2530c2c933235271040981a DIST openscad-2025.05.01_pre.tar.gz 24447451 BLAKE2B fb7575d254e8c80028c639493515c008cfaa23c6d98cd4857c6d71161451a90d8fcbc43c56202902eab3e6eea5a5e8c7df77a9d25d37247315b3aba8b4e3658a SHA512 6eaf7c9b0998d2cc02573aa148a36aa2fe8a7082a5b16f29f4848e95944db63e5948fbcc3aec91833517ff20740fa24e3b104e77a1052c7771630c57b4696b1f DIST openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26.tar.gz 58895 BLAKE2B e154a38e1c36873a34f7c80b8fa484e4bbcb1b0c217e15b977e6cedc9a83fd2e1518791f9a58a4f0e893c2a55947d7eaddb660d8b725eca048c30f0ea41cf14a SHA512 c6208a90f6a58ebdc0477d3e1b6be2f52e4ce976ac619a87818437cb9696b7e83285564fde757d32efaf50033d5217b55f67b6ce342250de838dd09fef334f36 DIST sanitizers-cmake-0573e2ea8651b9bb3083f193c41eb086497cc80a.tar.gz 7495 BLAKE2B 57efaac8861755fd7fe3a9c9db2a68f775169ef82b91fbcf44da375540dce7673f319908c0d1a8ac324584bc217f9e2a1e27d6f935fe84f1f640049324ea3b24 SHA512 80d1c471492a771b12291e36cc7523e65c8f9add5b14643c9554156bbcc3e1753772054998306c3f89d33b7f5c9969e89670e16428a72040033b41329c9cb71b -DIST sanitizers-cmake-3f0542e4e034aab417c51b2b22c94f83355dee15.tar.gz 7451 BLAKE2B 2ca72e3ecda02d4f0eed05be0954af02706425e94626d5a4b9d897968e35c341413171e2388ece7e83dad9eb7b5e2c2f73811ea8db8fa33b0bce6d5dd53550b7 SHA512 10cd4eeb3bbb7bf5c6f5cf8b5bc6a531b1ec8bdc147583d8de028a3e4b8b9d0e258aad81f02135267ce8f7d87b30999dedd25b44c0754b5c31e00d8481cd412f diff --git a/media-gfx/openscad/openscad-2024.11.14_pre.ebuild b/media-gfx/openscad/openscad-2024.11.14_pre.ebuild deleted file mode 100644 index e1239db68909..000000000000 --- a/media-gfx/openscad/openscad-2024.11.14_pre.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic optfeature virtualx xdg - -DESCRIPTION="The Programmers Solid 3D CAD Modeller" -HOMEPAGE="https://openscad.org/" - -if [[ ${PV} = *9999* ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openscad/openscad.git" - EGIT_SUBMODULES=( - '*' - '-mimalloc' - '-submodules/manifold' - '-OpenCSG' - ) -else - COMMIT="bc0d078e0361d7dba66723ac31bdb3b650ecff37" - SANITIZERS_CMAKE_COMMIT="3f0542e4e034aab417c51b2b22c94f83355dee15" - MCAD_COMMIT="bd0a7ba3f042bfbced5ca1894b236cea08904e26" - - SRC_URI=" - https://github.com/openscad/openscad/archive/${COMMIT}.tar.gz - -> ${PN}-20241114.tar.gz - https://github.com/arsenm/sanitizers-cmake/archive/${SANITIZERS_CMAKE_COMMIT}.tar.gz - -> sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}.tar.gz - test? ( - https://github.com/openscad/MCAD/archive/${MCAD_COMMIT}.tar.gz -> ${PN}-MCAD-${MCAD_COMMIT}.tar.gz - ) - " - # doc downloads are not versioned and found at: - # https://files.openscad.org/documentation/ - S="${WORKDIR}/${PN}-${COMMIT}" - KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" -fi - -# Code is GPL-3+, MCAD library is LGPL-2.1 -LICENSE="GPL-3+ LGPL-2.1" -SLOT="0" - -IUSE="dbus +egl experimental glx +gui hidapi +manifold mimalloc pdf spacenav test" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - dbus? ( gui ) - hidapi? ( gui ) - spacenav? ( gui ) - || ( egl glx ) -" - -RDEPEND=" - dev-libs/boost:= - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/libzip:= - media-gfx/opencsg:= - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lib3mf:= - sci-mathematics/cgal:= - media-libs/libglvnd[X] - gui? ( - dev-qt/qt5compat:6 - dev-qt/qtbase:6[concurrent,dbus?,-gles2-only,network,opengl,widgets] - dev-qt/qtmultimedia:6 - dev-qt/qtsvg:6 - x11-libs/qscintilla:=[qt6] - ) - hidapi? ( dev-libs/hidapi ) - manifold? ( - dev-cpp/tbb - sci-mathematics/manifold - ) - mimalloc? ( dev-libs/mimalloc:= ) - pdf? ( x11-libs/cairo ) - spacenav? ( dev-libs/libspnav ) -" -DEPEND=" - ${RDEPEND} - dev-cpp/eigen:3 -" -BDEPEND=" - app-alternatives/yacc - app-alternatives/lex - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig -" - -DOCS=( - README.md - RELEASE_NOTES.md - doc/TODO.txt - doc/contributor_copyright.txt - doc/hacking.md - doc/testing.txt - doc/translation.txt -) - -src_prepare() { - if use test && [[ ${PV} != *9999* ]] ; then - mv -f "${WORKDIR}/MCAD-${MCAD_COMMIT}"/* "${S}/libraries/MCAD/" || die - fi - - # NOTE adhere CMP0167 - # https://cmake.org/cmake/help/latest/policy/CMP0167.html - sed \ - -e '/find_package(Boost/s/)/ CONFIG)/g' \ - -i CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # -Werror=odr - # https://github.com/openscad/openscad/issues/5239 - filter-lto - - local mycmakeargs=( - -DCLANG_TIDY="no" - -DENABLE_CAIRO="$(usex pdf)" - -DENABLE_CGAL="yes" - -DENABLE_EGL="$(usex egl)" - -DENABLE_GLX="$(usex glx)" - -DENABLE_MANIFOLD="$(usex manifold)" - -DENABLE_PYTHON="no" - -DENABLE_TESTS="$(usex test)" - - -DEXPERIMENTAL="$(usex experimental)" - - -DHEADLESS="$(usex !gui)" - -DUSE_BUILTIN_MANIFOLD="no" - -DUSE_CCACHE="no" - -DUSE_GLAD="yes" - -DUSE_GLEW="no" - -DUSE_LEGACY_RENDERERS="no" - -DUSE_MIMALLOC="$(usex mimalloc)" - -DUSE_QT6="$(usex gui)" - -DOFFLINE_DOCS="no" # TODO - ) - - if use gui; then - mycmakeargs+=( - -DENABLE_HIDAPI="$(usex hidapi)" - -DENABLE_QTDBUS="$(usex dbus)" - -DENABLE_SPNAV="$(usex spacenav)" - ) - fi - - if [[ ${PV} != *9999* ]] ; then - mycmakeargs+=( - -DCMAKE_MODULE_PATH="${WORKDIR}/sanitizers-cmake-${SANITIZERS_CMAKE_COMMIT}/cmake" - -DOPENSCAD_COMMIT="${COMMIT:0:9}" - -DOPENSCAD_VERSION="${PV:0:4}.${PV:4:2}.${PV:6:2}" - ) - fi - - cmake_src_configure -} - -src_test() { - local i WRITE=() - - if [[ -d "/dev/udmabuf" ]]; then - WRITE+=( - "/dev/udmabuf" - ) - fi - - if [[ -d /sys/module/nvidia ]]; then - # /dev/dri/card* - # /dev/dri/renderD* - readarray -t dri <<<"$( - find /sys/module/nvidia/drivers/*/*:*:*.*/drm \ - -mindepth 1 -maxdepth 1 -type d -exec basename {} \; \ - | sed 's:^:/dev/dri/:' - )" - - # /dev/nvidia{0-9} - readarray -t cards <<<"$(find /dev -regextype sed -regex '/dev/nvidia[0-9]*')" - - WRITE+=( - "${dri[@]}" - "${cards[@]}" - "/dev/nvidiactl" - "/dev/nvidia-caps/" - "/dev/nvidia-modeset" - "/dev/nvidia-uvm" - "/dev/nvidia-uvm-tools" - ) - fi - - WRITE+=( - # for portage - "/proc/self/task/" - ) - for i in "${WRITE[@]}"; do - if [[ ! -w "$i" ]]; then - eqawarn "addwrite $i" - addwrite "$i" - - if [[ ! -d "$i" ]] && [[ ! -w "$i" ]]; then - eqawarn "can not access $i after addwrite" - fi - fi - done - - sed \ - -e "s/OPENSCAD_BINARY/OPENSCADPATH/g" \ - -i tests/test_cmdline_tool.py || die - - cd "${BUILD_DIR}" || die - - # NOTE link in from CMAKE_USE_DIR - ln -s "${CMAKE_USE_DIR}/color-schemes" . || die - ln -s "${CMAKE_USE_DIR}/locale" . || die - ln -s "${CMAKE_USE_DIR}/shaders" . || die - - virtx cmake_src_test -j1 -} - -src_install() { - DOCS+=( doc/*.pdf ) - - cmake_src_install - - mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales" - dosym -r /usr/share/locale /usr/share/openscad/locale -} - -pkg_postinst() { - xdg_pkg_postinst - - optfeature "support scad major mode in GNU Emacs" app-emacs/scad-mode -}