From a2dda4d7baea302c7c32704e511136967381e492 Mon Sep 17 00:00:00 2001 From: Miroslav Šulc Date: Wed, 17 Jun 2020 19:44:41 +0200 Subject: media-sound/zynaddsubfx: added support for zyn-fusion from bug #700326 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Miroslav Šulc --- media-sound/zynaddsubfx/Manifest | 4 ++-- media-sound/zynaddsubfx/metadata.xml | 1 + media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild | 13 ++++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest index 471dcea25..23ea4deca 100644 --- a/media-sound/zynaddsubfx/Manifest +++ b/media-sound/zynaddsubfx/Manifest @@ -1,3 +1,3 @@ AUX zynaddsubfx-9999-docs.patch 502 BLAKE2B b362c254a40ae6f20db0d9352de65bedc6eafce3a8a6389c0b2a5599f6ca79d61c6e9ba54a36600e53431db8a320069a85562f085fc2ed53157fc476aedf5ecc SHA512 0e6f5e144e410dad9f3c2e146098ca3273945af2f02f2a5a53ccc26ba1ee287a91c29580f05238fd62db9a972d4a97e5bdd7aa40bde63ca11b8244c6425a745c -EBUILD zynaddsubfx-9999.ebuild 1977 BLAKE2B 81af63d574ae3e984acbedbc742448291ed6cd0a50be5d78c099ed053a95947238d5047032541998c5802dbb32f787b41a77f1fc716b07bf75534231b52ea60a SHA512 8fa50112f61797a3e7117af02ad47a42bdab28b42ffc52c0eb7c43e67f0597de0b40b095135457b0d2ae8f48bed864ae82b1519a5c907432c15c4f82c2d59099 -MISC metadata.xml 313 BLAKE2B 25ed099512347bc2cd6207c06513b4cdc9e9be6bc2e7ba29a91794f1bc73850ae6cb37886f793b7624d067fb1e0dcafd0d14a1e04bb5c168bc636d8fceda9180 SHA512 3f57c05723cadbe3eb970933cd493df0f50618d9c870fa7e71940c811063a215e70493d2f7c9b7292c3d8250c5bf76343a52a16ce2a7bdb206721d0dbcfd4bfe +EBUILD zynaddsubfx-9999.ebuild 2133 BLAKE2B 7149d5162c22929204cfa952f273ece19d11aca29a411cf6589a9842b568bc7e7577d1213da98bccfe240717b45f1b4dc8d834cacb5fa2717a5e392c71420242 SHA512 3a8c5bcd39cb017671a6abce772be7d1b2bb75dc8251fb12e5594ff4e53cc041d304ef23fc26b83a821089b040e41d8829e85d9dbad9818fdd4199f2a9c9bd01 +MISC metadata.xml 371 BLAKE2B ff3f5b9688b9f3af6c0a4b0ae1d5e9b0c777c4cb31515a923b81a18a41649aa5fd52391feb91c641ae5ddfb194cf13b778123d5b9df50b24bb830c66037ce5fa SHA512 63c4b17474143a7145f7983a88265d90525fd3b30858184acc7c27e9f70c07a619a8cc962c6a433ccf58633d1c16e554b5f844d766dff0b1623fbd53f4f8909b diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml index 99020151b..fc97e06cb 100644 --- a/media-sound/zynaddsubfx/metadata.xml +++ b/media-sound/zynaddsubfx/metadata.xml @@ -7,5 +7,6 @@ Adds support for DSSI + Builds new ZynFusion interface diff --git a/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild index 767559bdc..9ac1db8be 100644 --- a/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild +++ b/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild @@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/zynaddsubfx/zynaddsubfx.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="alsa doc dssi +fltk jack lash portaudio" +IUSE="alsa doc dssi +fltk jack lash portaudio zest" REQUIRED_USE="|| ( alsa jack portaudio )" @@ -36,8 +36,11 @@ DEPEND=" lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + zest? ( media-sound/zyn-fusion ) +" +REQUIRED_USE="^^ ( zest fltk )" PATCHES=( "${FILESDIR}"/${P}-docs.patch ) DOCS=( NEWS.txt README.adoc TODO-release.md ) @@ -64,12 +67,16 @@ src_prepare() { src_configure() { append-cxxflags -std=c++11 + local UI + use fltk && UI=fltk + use zest && UI=zest local mycmakeargs=( -DPluginLibDir=$(get_libdir) + -DGuiModule=${UI} $(cmake_use_find_package alsa Alsa) $(cmake_use_find_package doc Doxygen) - $(cmake_use_find_package fltk FLTK) + $(use fltk && cmake_use_find_package fltk FLTK) ) cmake_src_configure } -- cgit v1.2.3-65-gdbad