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 386FE1581EE for ; Fri, 11 Apr 2025 08:29:51 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1BEB83435EF for ; Fri, 11 Apr 2025 08:29:51 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 15F881104B0; Fri, 11 Apr 2025 08:29:50 +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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 0BA951104B0 for ; Fri, 11 Apr 2025 08:29:50 +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 AEB573435EF for ; Fri, 11 Apr 2025 08:29:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F0A0C1BEE for ; Fri, 11 Apr 2025 08:29:47 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1744360185.51b55e9094f901b0d075627d9f79da2c64b35fcb.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/calf/files/, media-plugins/calf/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/calf/calf-9999.ebuild media-plugins/calf/files/calf-0.90.6-docdir.patch X-VCS-Directories: media-plugins/calf/ media-plugins/calf/files/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 51b55e9094f901b0d075627d9f79da2c64b35fcb X-VCS-Branch: master Date: Fri, 11 Apr 2025 08:29:47 +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: 27ebcf21-13ce-4558-9fcb-ffc3990dfc60 X-Archives-Hash: 36c7ef1b59c3f415a16290df363e36a4 commit: 51b55e9094f901b0d075627d9f79da2c64b35fcb Author: Miroslav Šulc gentoo org> AuthorDate: Fri Apr 11 08:29:24 2025 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Apr 11 08:29:45 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b55e90 media-plugins/calf: updated live ebuild Signed-off-by: Miroslav Šulc gentoo.org> media-plugins/calf/calf-9999.ebuild | 49 +++++++++-------------- media-plugins/calf/files/calf-0.90.6-docdir.patch | 31 ++++++++++++++ 2 files changed, 51 insertions(+), 29 deletions(-) diff --git a/media-plugins/calf/calf-9999.ebuild b/media-plugins/calf/calf-9999.ebuild index 7afb6c757c68..3594dd730429 100644 --- a/media-plugins/calf/calf-9999.ebuild +++ b/media-plugins/calf/calf-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools flag-o-matic toolchain-funcs xdg +inherit cmake flag-o-matic toolchain-funcs xdg DESCRIPTION="A set of open source instruments and effects for digital audio workstations" HOMEPAGE="https://calf-studio-gear.org/" @@ -18,10 +18,14 @@ fi LICENSE="LGPL-2.1" SLOT="0" -IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2 static-libs" +IUSE="cpu_flags_x86_sse experimental gtk jack lash lv2" REQUIRED_USE="jack? ( gtk )" +PATCHES=( + "${FILESDIR}/calf-0.90.6-docdir.patch" +) + BDEPEND=" virtual/pkgconfig " @@ -42,41 +46,28 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( - "${FILESDIR}/${PN}-0.90.4-no-automagic.patch" - "${FILESDIR}/${PN}-0.90.4-htmldir.patch" - "${FILESDIR}/${PN}-0.90.4-desktop.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { +src_configure() { # Upstream append -ffast-math by default, however since libtool links C++ # shared libs with -nostdlib, this causes symbol resolution error for # __powidn2 when using compiler-rt. Disable fast math on compiler-rt until # a better fix is found. [[ $(tc-get-c-rtlib) = "compiler-rt" ]] && append-cxxflags "-fno-fast-math" - local myeconfargs=( - --prefix="${EPREFIX}"/usr - --without-obsolete-check - $(use_enable experimental) - $(use_enable gtk gui) - $(use_enable jack) - $(use_with lash) - $(use_with lv2 lv2) - $(usex lv2 "--with-lv2-dir=${EPREFIX}/usr/$(get_libdir)/lv2" "") - $(use_enable static-libs static) - $(use_enable cpu_flags_x86_sse sse) + local mycmakeargs=( + -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/ + -DWANT_GUI=$(usex gtk) + -DWANT_JACK=$(usex jack) + -DWANT_LASH=$(usex lash) + -DWANT_LV2=$(usex lv2) + -DWANT_LV2_GUI=$(usex lv2) + -DWANT_SORDI=ON + -DWANT_EXPERIMENTAL=$(usex experimental) ) - econf "${myeconfargs[@]}" + cmake_src_configure } src_install() { - default + cmake_src_install mv "${ED}"/usr/share/bash-completion/completions/calf \ - "${ED}"/usr/share/bash-completion/completions/calfjackhost + "${ED}"/usr/share/bash-completion/completions/calfjackhost || die "Failed to install bash completion" } diff --git a/media-plugins/calf/files/calf-0.90.6-docdir.patch b/media-plugins/calf/files/calf-0.90.6-docdir.patch new file mode 100644 index 000000000000..6ffc4e59bf2d --- /dev/null +++ b/media-plugins/calf/files/calf-0.90.6-docdir.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df2fde63..95525397 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -210,19 +210,19 @@ add_subdirectory(icons) + + include(GNUInstallDirs) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/ +- DESTINATION share/doc/${PROJECT_NAME} FILES_MATCHING PATTERN "*.html") ++ DESTINATION ${DOCDIR} FILES_MATCHING PATTERN "*.html") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/ +- DESTINATION share/doc/${PROJECT_NAME}/images FILES_MATCHING PATTERN "*.png") ++ DESTINATION ${DOCDIR}/images FILES_MATCHING PATTERN "*.png") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/ +- DESTINATION share/doc/${PROJECT_NAME}/images FILES_MATCHING PATTERN "*.jpg") ++ DESTINATION ${DOCDIR}/images FILES_MATCHING PATTERN "*.jpg") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/prettyPhoto/dark_rounded/ +- DESTINATION share/doc/${PROJECT_NAME}/images/prettyPhoto/dark_rounded) ++ DESTINATION ${DOCDIR}/images/prettyPhoto/dark_rounded) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/images/icons/ +- DESTINATION share/doc/${PROJECT_NAME}/images/icons) ++ DESTINATION ${DOCDIR}/images/icons) + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts +- DESTINATION share/doc/${PROJECT_NAME} FILES_MATCHING PATTERN "*.css") ++ DESTINATION ${DOCDIR} FILES_MATCHING PATTERN "*.css") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/doc/manuals/scripts/ +- DESTINATION share/doc/${PROJECT_NAME}/scripts FILES_MATCHING PATTERN "*.js") ++ DESTINATION ${DOCDIR}/scripts FILES_MATCHING PATTERN "*.js") + install(DIRECTORY ${CMAKE_SOURCE_DIR}/sf2/ + DESTINATION share/${PROJECT_NAME}/sf2 FILES_MATCHING PATTERN "*.sf2") + install(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop