summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2020-04-02 10:47:11 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2020-04-02 10:47:11 +0200
commit269b802b196f670ecb8402749c9a732e89bcbdb9 (patch)
tree5b796ed5bf6b1a38b36758e94dfd484bb8ef4907
parentdev-util/netbeans-standalone: bump to 12.0_beta1 + symlink fix (diff)
downloadfordfrog-269b802b196f670ecb8402749c9a732e89bcbdb9.tar.gz
fordfrog-269b802b196f670ecb8402749c9a732e89bcbdb9.tar.bz2
fordfrog-269b802b196f670ecb8402749c9a732e89bcbdb9.zip
media-sound/zynaddsubfx: sync'd 9999 from the main tree
Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--media-sound/zynaddsubfx/Manifest7
-rw-r--r--media-sound/zynaddsubfx/files/gnustd.diff10
-rw-r--r--media-sound/zynaddsubfx/files/zynaddsubfx-9999-bashcomp.patch13
-rw-r--r--media-sound/zynaddsubfx/metadata.xml2
-rw-r--r--media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild122
5 files changed, 60 insertions, 94 deletions
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index fc948cff9..471dcea25 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,6 +1,3 @@
-AUX gnustd.diff 352 BLAKE2B 36b220568cb016c0ae3079b54cda4396b1f01a72376598bb14b4e83880a85b736da09af7c329a2772945bc43e67888380936f2de1236d37c10ca4f54216231b4 SHA512 4a2232c41b41a9d5f8d891aea57de65b5dc37352c55b0054f6bd59ff9b256c24aa4a4981e507d1846db62fb09e2bf261c9101da60e81bc253de7209f3bcacb86
-AUX zynaddsubfx-9999-bashcomp.patch 501 BLAKE2B 93ce20e0971527eb42c763132cd68179fa453f4389e93cd569eaf769bb03c30e2e12a7e20c7e6cbd6c19fac3b278af3847a2425294b6d1aa06e411b119e4316c SHA512 2cef71b2880e1d68f3e074f835d68bdf4d8a7d355cff4faca885d1f51fde04e35e01549b55af5499f48b2851a5d54a84cbfe1e7495a702711f514230f3f55564
AUX zynaddsubfx-9999-docs.patch 502 BLAKE2B b362c254a40ae6f20db0d9352de65bedc6eafce3a8a6389c0b2a5599f6ca79d61c6e9ba54a36600e53431db8a320069a85562f085fc2ed53157fc476aedf5ecc SHA512 0e6f5e144e410dad9f3c2e146098ca3273945af2f02f2a5a53ccc26ba1ee287a91c29580f05238fd62db9a972d4a97e5bdd7aa40bde63ca11b8244c6425a745c
-DIST zynaddsubfx-presets-0.1.tar.bz2 27052 BLAKE2B 215eca9a8daefbd3a63ef0ff0970b19e9ffc0503d623bcb8b1659be2f61132cd707bbdde6ba5ee0d01a51a908614c1735bd830bd2efaf6bfbe5da97b6dc63270 SHA512 63cbe5306d01a325958cdcb8938a517944f6ab33c6a1eb8f9986dc26fabc8e0d3b32be14d2cf0ec4b30b3b594880fa478478367b6657545a3a0b6d1ae7ed3626
-EBUILD zynaddsubfx-9999.ebuild 2496 BLAKE2B f4820790e30f230057cf2734177e1713d8d478638f35edcd6b8aaf80d1163e3bd65cc486f68850eb876ababc95ea8a18a547f35fc4689c1b8f944adc699c1130 SHA512 718dd735d2ca8ba1f1025fb28db529f74d3dffc830f9dd0902ee95a570feebb683fc3eb29bdc9ceb7f6f4bdd00dfbd9a64e3baaee0dac27b6fd3da39d4ffd790
-MISC metadata.xml 421 BLAKE2B b870b4f6a8392aec858e4b6489728076dff7cb8c2bce9ccf4571e1fe94e83b4671615e1985284e503fb3f87491549127090a31028dfc6b3dfcbe702b61a6b3b6 SHA512 4053e14d3e44daffa42b8c4daf54e6f3a8a2a0d629202d14f3cefb80e7a6aa79e21df5fc55d75adbc5f4cc3a9c0570311079b3aef3187b0777d3517cfd760cc3
+EBUILD zynaddsubfx-9999.ebuild 1977 BLAKE2B 81af63d574ae3e984acbedbc742448291ed6cd0a50be5d78c099ed053a95947238d5047032541998c5802dbb32f787b41a77f1fc716b07bf75534231b52ea60a SHA512 8fa50112f61797a3e7117af02ad47a42bdab28b42ffc52c0eb7c43e67f0597de0b40b095135457b0d2ae8f48bed864ae82b1519a5c907432c15c4f82c2d59099
+MISC metadata.xml 313 BLAKE2B 25ed099512347bc2cd6207c06513b4cdc9e9be6bc2e7ba29a91794f1bc73850ae6cb37886f793b7624d067fb1e0dcafd0d14a1e04bb5c168bc636d8fceda9180 SHA512 3f57c05723cadbe3eb970933cd493df0f50618d9c870fa7e71940c811063a215e70493d2f7c9b7292c3d8250c5bf76343a52a16ce2a7bdb206721d0dbcfd4bfe
diff --git a/media-sound/zynaddsubfx/files/gnustd.diff b/media-sound/zynaddsubfx/files/gnustd.diff
deleted file mode 100644
index 6aafbc3a1..000000000
--- a/media-sound/zynaddsubfx/files/gnustd.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- zynaddsubfx-9999/CMakeLists.txt.orig 2017-08-19 15:30:09.072566313 +0200
-+++ zynaddsubfx-9999/CMakeLists.txt 2017-08-19 15:39:42.538545388 +0200
-@@ -4,6 +4,7 @@
- set(VERSION_MAJOR "3")
- set(VERSION_MINOR "0")
- set(VERSION_REVISION "5")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-
- #Set data directory, if any
- if(DEFINED ZYN_DATADIR)
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-9999-bashcomp.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-9999-bashcomp.patch
deleted file mode 100644
index 51fb1a931..000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-9999-bashcomp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/BashCompletion.cmake b/cmake/BashCompletion.cmake
-index 0eb16fff..383397c9 100644
---- a/cmake/BashCompletion.cmake
-+++ b/cmake/BashCompletion.cmake
-@@ -73,7 +73,7 @@ ELSE()
- FILE(WRITE ${BASHCOMP_SCRIPT} "\
- #!${BASH}\n\
- set -e\n\
--BASHCOMP_PKG_PATH=\"${BASHCOMP_USER_PATH}\"\n\
-+BASHCOMP_PKG_PATH=\"/var/tmp/portage/media-sound/zynaddsubfx-9999/image${BASHCOMP_USER_PATH}\"\n\
- if [ -n \"${BASHCOMP_PKG_PATH}\" ]; then\n\
- BASHCOMP_PKG_PATH=\"${BASHCOMP_PKG_PATH}\"\n\
- fi\n\
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index 46fa6f765..99020151b 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -7,7 +7,5 @@
</maintainer>
<use>
<flag name="dssi">Adds support for DSSI</flag>
- <flag name="jackmidi">Adds support for JACK MIDI</flag>
- <flag name="ntk">Build x11-libs/ntk GUI></flag>
</use>
</pkgmetadata>
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
index 1b22075b7..767559bdc 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
@@ -1,93 +1,87 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit cmake-utils git-r3 multilib
-RESTRICT="mirror"
+inherit cmake flag-o-matic git-r3
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="http://download.tuxfamily.org/proaudio/distfiles/zynaddsubfx-presets-0.1.tar.bz2"
-
-EGIT_REPO_URI="git://git.code.sf.net/p/zynaddsubfx/code"
-EGIT_SUBMODULES=( '*' )
+EGIT_REPO_URI="https://github.com/zynaddsubfx/zynaddsubfx.git"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="oss alsa dssi fltk jack jackmidi lash +ntk portaudio"
-# upstream the following preference ntk -> fltk; we waant to choose the GUI:
-REQUIRED_USE="?? ( fltk ntk )"
+IUSE="alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
-RDEPEND="
- dev-libs/mxml
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ >=dev-libs/mxml-2.2.1
+ media-libs/liblo
sci-libs/fftw:3.0
+ sys-libs/zlib
alsa? ( media-libs/alsa-lib )
dssi? ( media-libs/dssi )
- fltk? ( >=x11-libs/fltk-1.3:1 )
+ fltk? (
+ >=x11-libs/fltk-1.3:1
+ x11-libs/libX11
+ x11-libs/libXpm
+ )
jack? ( virtual/jack )
- jackmidi? ( virtual/jack )
- lash? ( virtual/liblash )
- ntk? ( x11-libs/ntk )
- portaudio? ( media-libs/portaudio )"
-DEPEND="!media-libs/zynaddsubfx-banks
- !media-sound/zynaddsubfx-cvs
- virtual/pkgconfig"
+ lash? ( media-sound/lash )
+ portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+
+DOCS=( NEWS.txt README.adoc TODO-release.md )
-PATCHES=(
- "${FILESDIR}/gnustd.diff"
- "${FILESDIR}/${P}-docs.patch"
- "${FILESDIR}/${P}-bashcomp.patch"
-)
+src_prepare() {
+ cmake_src_prepare
-src_unpack() {
- git-r3_src_unpack
- unpack "zynaddsubfx-presets-0.1.tar.bz2"
+ if ! use dssi; then
+ sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use jack; then
+ sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+ fi
+ if ! use lash; then
+ sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use portaudio; then
+ sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+
+ # FIXME upstream: sandbox error
+ sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
}
src_configure() {
- # overide upstream GUI preference
- MYGUI="off"
- use fltk && MYGUI="fltk"
- use ntk && MYGUI="ntk"
+ append-cxxflags -std=c++11
- mycmakeargs=(
- -DGuiModule="${MYGUI}"
- `use alsa && echo "-DAlsaEnable=TRUE" || echo "-DAlsaEnable=FALSE"`
- `use jack && echo "-DJackEnable=TRUE" || echo "-DJackEnable=FALSE"`
- `use oss && echo "-DOssEnable=TRUE" || echo "-DOssEnable=FALSE"`
- `use portaudio && echo "-DPaEnable=TRUE" || echo "-DPaEnable=FALSE"`
- `use lash && echo "-DLashEnable=TRUE" || echo "-DLashEnable=FALSE"`
- `use dssi && echo "-DDssiEnable=TRUE" || echo "-DDssiEnable=FALSE"`
- `use lash && echo "-DLashEnable=TRUE" || echo "-DLashEnable=FALSE"`
+ local mycmakeargs=(
-DPluginLibDir=$(get_libdir)
+ $(cmake_use_find_package alsa Alsa)
+ $(cmake_use_find_package doc Doxygen)
+ $(cmake_use_find_package fltk FLTK)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
- cd "${S}"/ExternalPrograms/Spliter
- emake
- cd "${S}"/ExternalPrograms/Controller
- emake
+ cmake_src_compile
+ use doc && cmake_src_compile doc
}
src_install() {
- cmake-utils_src_install
-
- # -------- install examples presets
-## [ "${#MY_PN}" == "0" ] && MY_PN="${PN}"
- insinto /usr/share/${PN}/presets
- doins "${WORKDIR}/presets/"*
- insinto /usr/share/${PN}/examples
- doins "${WORKDIR}/examples/"*
- doins "${S}/instruments/examples/"*
- # --------
-}
-
-pkg_postinst() {
- einfo "Banks are now provided with this package"
- einfo "To get some nice sounding parameters emerge zynaddsubfx-extras"
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ cmake_src_install
+ insinto /usr/share/${PN}
+ doins -r instruments/*
}