From efca56beb6bbb9547d49163cac02eac0b5c1f657 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 6 Apr 2023 11:27:38 +0100 Subject: gentoo auto-resync : 06:04:2023 - 11:27:37 --- media-gfx/openscad/Manifest | 4 +-- media-gfx/openscad/metadata.xml | 16 ++++++++-- media-gfx/openscad/openscad-9999.ebuild | 55 +++++++++++++++++---------------- 3 files changed, 45 insertions(+), 30 deletions(-) (limited to 'media-gfx/openscad') diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index d1e09a9384da..915109f0f122 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -9,5 +9,5 @@ AUX openscad-2021.01-Fix-build-issue-with-overloaded-join.patch 3336 BLAKE2B c92 AUX openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch 775 BLAKE2B eed37277c3e7ea84635c0b8cd02cc4ffde7abea78400ee39e67bcc782800197c57dae07a82084df47705951ced8968be78243a1d0e14a551783b8adcb669d43f SHA512 94306e68e53b01e799a5feb6f16a8f44c965a4b653b60227833013712f23648d20ac8272a7bfe38bde201af42946f91fe17231f120adfbe5b16e42b07d9f8d10 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 EBUILD openscad-2021.01-r4.ebuild 2748 BLAKE2B 46c396688866709ff0cafa95df8c20a8d89e97632d4b18471605d54d2016ad8f4fd72771e1749b09f396b60150617ab1a1a4dd37a04c79fb6f18f720af603011 SHA512 cbdc31e4d7a58941b5ed62c19626613d00e113a6da8f2e41fb141603174e502b0ff3f642dce1dbdf4fadf825e982fbb3924657735d8c36dba5c4f66892e7bb1c -EBUILD openscad-9999.ebuild 2508 BLAKE2B f3842eee85e9da815b3dda59c553f4cd97193bd7732d2bd65820b7283a2e8699c352cf8643b67fc3c4e8e411628b2262998d65ede1ca1154c4c0cec3edcd4f5c SHA512 a214cdebcb5be8a052b78b9b34741cf0680d262ce07a740803ee9a351a63d0e0f03fd733d754c4cdc161ffa35e6713eb8cd2ffe7627014e0851d647360eeb418 -MISC metadata.xml 1348 BLAKE2B b15a74a20ef94a6a47de57826c5279a4e8c388a52bf9d1058a1ba0b347fcd77e0c8b79a42515f5411d0991fb8fb71c604f792dd2a2addaaca78bc85dbfc7a611 SHA512 fea109a00324f0bdcaae855e18fba456a449bb8192e633cfd5806fa1040fe3bba24f75493e0012d54afe8828073fc4d02ae01533b45648e05c575777b23572d1 +EBUILD openscad-9999.ebuild 2789 BLAKE2B def23a8ea17a444915a193c28d08e8cc314f451063bf08f5fa05ffa1c0310fa1c4c117d9031a2b55d4de2996c65e6f0735569be3af381e4e9480efb8528e41e9 SHA512 abcdb04c5dc97c3cc9255952385d5fbc95e03eb8616c0e30169248144e8c6ad989b0e252791373765c620629946980f39dab19937a3ad79d2ca74c9f0b613ee0 +MISC metadata.xml 1684 BLAKE2B aad64157a479a4267e8efba1d310f26505535450ced650526c357d11472a2cd922861eaf063451fff6283a16691b074c8a390963fff46589cf1c0c3bc25e22bd SHA512 d86f2d7b5ebcfe71a6cafffc45f016c2ed8da4a918855260f8dd67ca0779f1feb17e5c58e170e8f1665d0e02b7566f0f38066dc2c69f2cd0049115c6747d4b6f diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml index 817a36f21ccf..0b965cbf4ac8 100644 --- a/media-gfx/openscad/metadata.xml +++ b/media-gfx/openscad/metadata.xml @@ -21,11 +21,23 @@ Mac OS X. + + Build using EGL instead of GLX + + + Enable experimental features + Add support for gamepads through dev-qt/qtgamepad - - Build a binary without GUI + + Enable or disable building of the GUI + + + Build in support for HID-Class devices using dev-libs/hidapi + + + Build using dev-libs/mimalloc as memory allocator Add support for space navigator devices through diff --git a/media-gfx/openscad/openscad-9999.ebuild b/media-gfx/openscad/openscad-9999.ebuild index 425d55c09f81..94342d5766f0 100644 --- a/media-gfx/openscad/openscad-9999.ebuild +++ b/media-gfx/openscad/openscad-9999.ebuild @@ -1,11 +1,15 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=8 +# TODO's +# package and unbundle manifold +# package Emacs scad-mode (and scad-dbus) and re-add emacs USE flag +# set up proper testing +# set up OFFLINE_DOCS and add doc USE flag -inherit cmake elisp-common git-r3 xdg +EAPI=8 -SITEFILE="50${PN}-gentoo.el" +inherit cmake git-r3 xdg DESCRIPTION="The Programmers Solid 3D CAD Modeller" HOMEPAGE="https://www.openscad.org/" @@ -16,11 +20,14 @@ EGIT_REPO_URI="https://github.com/openscad/openscad.git" LICENSE="GPL-3+ LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="cairo dbus emacs gamepad headless spacenav" +# TODO: emacs mode files have been moved to a separate repo: github://openscad/emacs-scad-mode +IUSE="cairo dbus egl experimental gamepad gui hidapi mimalloc spacenav" RESTRICT="test" # 32 out 1300+ tests fail REQUIRED_USE=" - headless? ( !dbus !gamepad !spacenav ) + dbus? ( gui ) + gamepad? ( gui ) + spacenav? ( gui ) " RDEPEND=" @@ -39,8 +46,7 @@ RDEPEND=" sci-mathematics/cgal:= virtual/opengl cairo? ( x11-libs/cairo ) - emacs? ( app-editors/emacs:* ) - !headless? ( + gui? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5[-gles2-only] @@ -49,10 +55,13 @@ RDEPEND=" dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 + x11-libs/libX11 x11-libs/qscintilla:= dbus? ( dev-qt/qtdbus:5 ) gamepad? ( dev-qt/qtgamepad:5 ) ) + hidapi? ( dev-libs/hidapi ) + mimalloc? ( dev-libs/mimalloc:= ) spacenav? ( dev-libs/libspnav ) " DEPEND="${RDEPEND}" @@ -65,24 +74,33 @@ BDEPEND=" " DOCS=( + README.md RELEASE_NOTES.md doc/TODO.txt doc/contributor_copyright.txt doc/hacking.md doc/testing.txt + doc/translation.txt ) src_configure() { local mycmakeargs=( -DCLANG_TIDY=OFF -DENABLE_CAIRO=$(usex cairo) + -DENABLE_EGL=$(usex egl) + -DENABLE_HIDAPI=$(usex hidapi) + # needs python deps, unbundle first before enabling + -DENABLE_MANIFOLD=OFF -DENABLE_SPNAV=$(usex spacenav) -DENABLE_TESTS=OFF - -DHEADLESS=$(usex headless) + -DEXPERIMENTAL=$(usex experimental) + -DHEADLESS=$(usex gui OFF ON) + -DOFFLINE_DOCS=OFF -DUSE_CCACHE=OFF + -DUSE_MIMALLOC=$(usex mimalloc) ) - if use !headless; then + if use gui; then mycmakeargs+=( -DENABLE_GAMEPAD=$(usex gamepad) -DENABLE_QTDBUS=$(usex dbus) @@ -92,36 +110,21 @@ src_configure() { cmake_src_configure } -src_compile() { - cmake_src_compile - - if use emacs ; then - elisp-compile contrib/*.el - fi -} - src_install() { DOCS+=( doc/*.pdf ) cmake_src_install mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales" - ln -sf ../locale "${ED}"/usr/share/openscad/locale || die - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - elisp-install ${PN} contrib/*.el contrib/*.elc - fi + dosym -r /usr/share/locale /usr/share/openscad/locale } pkg_postinst() { - use emacs && elisp-site-regen xdg_desktop_database_update xdg_icon_cache_update xdg_mimeinfo_database_update } pkg_postrm() { - use emacs && elisp-site-regen xdg_desktop_database_update xdg_icon_cache_update xdg_mimeinfo_database_update -- cgit v1.2.3