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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F77815ACB3 for ; Thu, 6 Apr 2023 06:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3DC36E0729; Thu, 6 Apr 2023 06:54:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 16C98E0729 for ; Thu, 6 Apr 2023 06:54:30 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10908340F37 for ; Thu, 6 Apr 2023 06:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 966618EB for ; Thu, 6 Apr 2023 06:54:26 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1680764062.a834e3baa2c0cad3d1f954866687d79b18682b28.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/openscad/metadata.xml media-gfx/openscad/openscad-9999.ebuild X-VCS-Directories: media-gfx/openscad/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: a834e3baa2c0cad3d1f954866687d79b18682b28 X-VCS-Branch: master Date: Thu, 6 Apr 2023 06:54:26 +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: b6344af3-860b-4f34-b417-47a3590aeae8 X-Archives-Hash: cbab6eacc61264fc4dbbac5924e12ced commit: a834e3baa2c0cad3d1f954866687d79b18682b28 Author: Bernd Waibel posteo net> AuthorDate: Fri Mar 24 17:58:20 2023 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Apr 6 06:54:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a834e3ba media-gfx/openscad: allow experimental features add experimental USE flag to enable newer features update ebuild to reflect upstream changes Thanks to Michael Moon for pointing this out. Suggested-by: Michael Moon gmail.com> Closes: https://bugs.gentoo.org/899658 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/30334 Signed-off-by: Joonas Niilola gentoo.org> media-gfx/openscad/metadata.xml | 16 ++++++++-- media-gfx/openscad/openscad-9999.ebuild | 55 +++++++++++++++++---------------- 2 files changed, 43 insertions(+), 28 deletions(-) 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