commit: ac9818774b2a9cda816cdb921b71000aee0e64d0 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Sun Nov 23 13:11:49 2025 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Thu Nov 27 01:22:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac981877
media-sound/easyeffects: add 8.0.5 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44744 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> media-sound/easyeffects/Manifest | 1 + ...ffects-9999.ebuild => easyeffects-8.0.5.ebuild} | 29 +++++--- media-sound/easyeffects/easyeffects-9999.ebuild | 29 +++++--- .../files/easyeffects-8.0.4-remove-webengine.patch | 81 ++++++++++++++++++++++ media-sound/easyeffects/metadata.xml | 1 + profiles/arch/arm/package.use.mask | 4 ++ profiles/arch/powerpc/package.use.mask | 4 ++ profiles/arch/x86/package.use.mask | 4 ++ 8 files changed, 137 insertions(+), 16 deletions(-) diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest index 21aec207fbe6..7920c45080ab 100644 --- a/media-sound/easyeffects/Manifest +++ b/media-sound/easyeffects/Manifest @@ -1,2 +1,3 @@ DIST easyeffects-7.2.3.tar.gz 3760575 BLAKE2B 86ab6c3bdff4bb74b51064abb138c91c3d1a40c8227c412a7255a66654fb54361a5fac78b6e1238bb613860d9f9b5f32feac4a4eafe920560cc48ab99b2ae95b SHA512 4bb7fd19f51fd503773ab584ad1b376bd71bf5e43751dc8e220ac4191a3d6237002b1cf105efc38f596c0046006d36649f73778497cd32c9c024a88ed4f433d3 DIST easyeffects-7.2.5.tar.gz 3803064 BLAKE2B ae4c9471245eb96682ea2e49a10cf720e3e17b417122971d34cbd6eca0505b915fb0820b50866aac0efc85fa4a92fc9a8dcbcae0c55327848eb0db96e51a1565 SHA512 74cb86501b6bc063186c1885c1dd9bfd394478f4b2bc034de63d5769e36e146e5a08d8e8525eb72da7daa56a47fdc24ed79f8ddbd0edae8357c221d9287fb4d5 +DIST easyeffects-8.0.5.tar.gz 3946320 BLAKE2B 6b99ee57de61896924bd0519df84c4270de25d83ed78ceac1649706a0ac9bf36d4342fc844174fff10a44fb3c74cad811e94fbf37063703ac326b1dccbf43f6c SHA512 114f6e313588d620b40af7ec2f6905d94a5213c891547b047ac5fe20ce5e0adc12907db21fd45c28273ae910f2551d7c3cdf041b8160f7cc2f6c7a99d94f039a diff --git a/media-sound/easyeffects/easyeffects-9999.ebuild b/media-sound/easyeffects/easyeffects-8.0.5.ebuild similarity index 80% copy from media-sound/easyeffects/easyeffects-9999.ebuild copy to media-sound/easyeffects/easyeffects-8.0.5.ebuild index 71149b8e76ba..c896ea7f665f 100644 --- a/media-sound/easyeffects/easyeffects-9999.ebuild +++ b/media-sound/easyeffects/easyeffects-8.0.5.ebuild @@ -14,12 +14,13 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/wwmm/easyeffects"; else SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-3" SLOT="0" +IUSE="webengine" # No real tests. ECM brings appstream test which isn't relevant downstream. RESTRICT="test" @@ -32,13 +33,14 @@ RDEPEND=" dev-qt/qtbase:6[dbus,gui,network,widgets] dev-qt/qtdeclarative:6 dev-qt/qtgraphs:6 - kde-frameworks/kconfig:6 - kde-frameworks/kconfigwidgets:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/ki18n:6 - kde-frameworks/kiconthemes:6 - kde-frameworks/kirigami:6 - kde-frameworks/qqc2-desktop-style:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 media-libs/libbs2b >=media-libs/libebur128-1.2.6:= media-libs/libsamplerate @@ -52,6 +54,7 @@ RDEPEND=" >=media-video/pipewire-1.0.6:=[sound-server] sci-libs/fftw:3.0= sci-libs/gsl:= + webengine? ( dev-qt/qtwebengine:6[qml] ) " DEPEND="${RDEPEND} media-libs/ladspa-sdk @@ -74,6 +77,16 @@ pkg_pretend() { fi } +src_prepare() { + default + + if use !webengine; then + eapply "${FILESDIR}"/easyeffects-8.0.4-remove-webengine.patch + fi + + cmake_prepare +} + src_configure() { local libcxx=false [[ $(tc-get-cxx-stdlib) == "libc++" ]] && libcxx=true diff --git a/media-sound/easyeffects/easyeffects-9999.ebuild b/media-sound/easyeffects/easyeffects-9999.ebuild index 71149b8e76ba..c896ea7f665f 100644 --- a/media-sound/easyeffects/easyeffects-9999.ebuild +++ b/media-sound/easyeffects/easyeffects-9999.ebuild @@ -14,12 +14,13 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/wwmm/easyeffects"; else SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-3" SLOT="0" +IUSE="webengine" # No real tests. ECM brings appstream test which isn't relevant downstream. RESTRICT="test" @@ -32,13 +33,14 @@ RDEPEND=" dev-qt/qtbase:6[dbus,gui,network,widgets] dev-qt/qtdeclarative:6 dev-qt/qtgraphs:6 - kde-frameworks/kconfig:6 - kde-frameworks/kconfigwidgets:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/ki18n:6 - kde-frameworks/kiconthemes:6 - kde-frameworks/kirigami:6 - kde-frameworks/qqc2-desktop-style:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 media-libs/libbs2b >=media-libs/libebur128-1.2.6:= media-libs/libsamplerate @@ -52,6 +54,7 @@ RDEPEND=" >=media-video/pipewire-1.0.6:=[sound-server] sci-libs/fftw:3.0= sci-libs/gsl:= + webengine? ( dev-qt/qtwebengine:6[qml] ) " DEPEND="${RDEPEND} media-libs/ladspa-sdk @@ -74,6 +77,16 @@ pkg_pretend() { fi } +src_prepare() { + default + + if use !webengine; then + eapply "${FILESDIR}"/easyeffects-8.0.4-remove-webengine.patch + fi + + cmake_prepare +} + src_configure() { local libcxx=false [[ $(tc-get-cxx-stdlib) == "libc++" ]] && libcxx=true diff --git a/media-sound/easyeffects/files/easyeffects-8.0.4-remove-webengine.patch b/media-sound/easyeffects/files/easyeffects-8.0.4-remove-webengine.patch new file mode 100644 index 000000000000..90d604a6aff0 --- /dev/null +++ b/media-sound/easyeffects/files/easyeffects-8.0.4-remove-webengine.patch @@ -0,0 +1,81 @@ +Optional patch to remove use of qtwebengine. + +This is to make the package less controversial to users while making keywording +a smoother ride on arches without qtwebengine. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb4393fef..031801b2e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,7 +51,6 @@ find_package(Qt${QT_MAJOR_VERSION} REQUIRED NO_MODULE COMPONENTS + Quick + QuickControls2 + Widgets +- WebEngineQuick + ) + + find_package(KF${QT_MAJOR_VERSION} REQUIRED COMPONENTS +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 885d9a30f..7c149577c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -53,7 +53,6 @@ qt_add_qml_module(easyeffects + contents/ui/Expander.qml + contents/ui/Filter.qml + contents/ui/Gate.qml +- contents/ui/HelpSheet.qml + contents/ui/LevelMeter.qml + contents/ui/Limiter.qml + contents/ui/Loudness.qml +@@ -238,7 +237,6 @@ target_link_libraries(easyeffects PRIVATE + Qt::Quick + Qt::QuickControls2 + Qt::Widgets +- Qt::WebEngineQuick + TBB::tbb + GSL::gsl + GSL::gslcblas +diff --git a/src/contents/ui/Main.qml b/src/contents/ui/Main.qml +index d550231fd..7512fb146 100644 +--- a/src/contents/ui/Main.qml ++++ b/src/contents/ui/Main.qml +@@ -161,7 +161,7 @@ Kirigami.ApplicationWindow { + Shortcut { + sequences: ["F1"] + onActivated: { +- helpSheet.open(); ++ Qt.openUrlExternally("https://wwmm.github.io/easyeffects/";) + } + } + +@@ -224,10 +224,6 @@ Kirigami.ApplicationWindow { + id: shortcutsSheet + } + +- HelpSheet { +- id: helpSheet +- } +- + Kirigami.PromptDialog { + id: resetPromptDialog + +@@ -401,9 +397,7 @@ Kirigami.ApplicationWindow { + text: i18n("Manual") // qmllint disable + icon.name: "help-contents-symbolic" + onTriggered: { +- appWindow.show(); +- appWindow.raise(); +- helpSheet.open(); ++ Qt.openUrlExternally("https://wwmm.github.io/easyeffects/";) + } + } + +@@ -550,7 +544,7 @@ Kirigami.ApplicationWindow { + icon.name: "help-contents-symbolic" + displayHint: Kirigami.DisplayHint.AlwaysHide + onTriggered: { +- helpSheet.open(); ++ Qt.openUrlExternally("https://wwmm.github.io/easyeffects/";) + } + }, + Kirigami.Action { diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml index 059cd8466e9e..ce6596c5e533 100644 --- a/media-sound/easyeffects/metadata.xml +++ b/media-sound/easyeffects/metadata.xml @@ -9,6 +9,7 @@ <flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag> <flag name="doc">Install packages needed to display built-in user documentation</flag> <flag name="mda-lv2">Enable use of <pkg>media-plugins/mda-lv2</pkg> for the loudness FX</flag> + <flag name="webengine">Read documentation inside the application with <pkg>dev-qt/qtwebengine</pkg></flag> <flag name="zamaudio">Enable use of <pkg>media-plugins/zam-plugins</pkg> for the maximizer FX</flag> </use> <upstream> diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 7fa9ddfb1598..2c920cbbabe8 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Alfred Wingate <[email protected]> (2025-11-23) +# Requires dev-qt/qtwebengine +media-sound/easyeffects webengine + # Sam James <[email protected]> (2025-11-16) # Needs unkeyworded dev-libs/capstone which fails tests on arm (bug #924922) app-emulation/qemu capstone diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask index e561c65393aa..f87399e892cf 100644 --- a/profiles/arch/powerpc/package.use.mask +++ b/profiles/arch/powerpc/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Alfred Wingate <[email protected]> (2025-11-23) +# Requires dev-qt/qtwebengine +media-sound/easyeffects webengine + # Michał Górny <[email protected]> (2025-10-03) # Now keyworded on ppc* too. sci-libs/flexiblas -system-blas diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask index 1ae150506db6..4ebe2333870b 100644 --- a/profiles/arch/x86/package.use.mask +++ b/profiles/arch/x86/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Alfred Wingate <[email protected]> (2025-11-23) +# Requires dev-qt/qtwebengine +media-sound/easyeffects webengine + # Ionen Wolkens <[email protected]> (2025-11-13) # media-libs/libvmaf is keyworded here media-libs/x265 -vmaf
