| [proaudio] proaudio/proaudio: [3021] zynaddsubfx: new USE flags; make configure phase to work with new options; doc patch |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 3021
Author: dominique
Date: 2016-11-18 20:16:14 +0100 (Fri, 18 Nov 2016)
Log Message:
-----------
zynaddsubfx: new USE flags; make configure phase to work with new options; doc patch
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml
trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2016-11-18 15:36:49 UTC (rev 3020)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/ChangeLog 2016-11-18 19:16:14 UTC (rev 3021)
@@ -5,8 +5,10 @@
18 Nov 2016; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
-files/* -*.ebuild: remove old stuffs; zynaddsubfx is now in portage
+files/gnustd.diff: fix compilation errors on gentoo
- +zynaddsubfx-9999.ebuild: 99999999-r1 but use git-r3 eclass.
-
+ +zynaddsubfx-9999.ebuild: renamed 99999999-r1
+ +files/zynaddsubx-9999-docs.patch
+ zynaddsubfx-9999.ebuild: Use git-r3 eclass; new USE flags; make configure phase to work with new options.
+
31 Mar 2014; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxxxxxxxx>
+zynaddsubfx-99999999-r1.ebuild:
Experimental ebuild for the git version. Need some work on the configure
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2016-11-18 15:36:49 UTC (rev 3020)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest 2016-11-18 19:16:14 UTC (rev 3021)
@@ -1,5 +1,6 @@
AUX gnustd.diff 391 SHA256 33810a39a73b389a74cab5f9473a81aa202e600e2110a218b2645c5c61b40f6e SHA512 fce0a12d96ac18f8852416ad32d5a541377abb10f8fdcd7344bc2b1d894fc5fbceaf85ad25d66ce26153b6b028b467eee5f7b7195ab3b81c59e648b35cbd1146 WHIRLPOOL a72fcbc9d5cc54d0d99ff1db1c4e116d17bab93b67f8b1b2017f118abd94ac02bc8b8a38d22ff8a96b9168d2102c937460690537f5bab3605890902a05c5661d
+AUX zynaddsubfx-9999-docs.patch 471 SHA256 56084c4be358c83b0fe0e1d083973dec1806df6c073dd71cd56cf96ae4aaa761 SHA512 cfc53ea1db49e6788312c9209bc9e71c0ce5a4746be9421240fe0e3322472dc85f31989d2ee5ca61a30694a6cb6fed1409cbbf53f2b9302ccf2946e61f3c7b71 WHIRLPOOL 922d4c8d4e98fb5f306d6ffacd5afd8615d455e47a86aac27e014209cb218113c2a6299576aa56f6a5518ee22c92761cf41b9d7ac5fc1139aca940d0d76aab4d
DIST zynaddsubfx-presets-0.1.tar.bz2 27052 SHA256 b2fc41cc8b45531007270efd81536c9a99a6a169d2433ec12d3d6854cb9a10d6 SHA512 63cbe5306d01a325958cdcb8938a517944f6ab33c6a1eb8f9986dc26fabc8e0d3b32be14d2cf0ec4b30b3b594880fa478478367b6657545a3a0b6d1ae7ed3626 WHIRLPOOL 582674fbdfe7b770b93a6559c38bb79f718aa042e6f9795dbac8d5821f50ef1caa1655e71c350f28b7f7a8f94151bb07365d20896dd5101f925af56e21b993fc
-EBUILD zynaddsubfx-9999.ebuild 2409 SHA256 e1648b9b947f592b6e12217d43ae08eb7150d5d6c72b1b25f9c199309536b52a SHA512 9dbf6bb1cd629dc161296735007bc36815f25b413b188491309c7ba4541eff2824f92a06f343325bfdba750fb2ee540745f9c50b585b2d78eb3ef9c172094558 WHIRLPOOL f5245a2b91fe49f4278de1a6b9828e929fdcb3a4a92df4349abcf164e31f0da2ea2479a85d397bafb189bba8338f1afe3a790ee5c1b62258c253bb261068446a
-MISC ChangeLog 2775 SHA256 56b94543bca9755ee2a13e47e130d38db323a095f8243c4f73e153d1e6f70b66 SHA512 7e710507fbe8ac7f8d9c38420fea28a3a9513dff9e4d8955278ca929a6b82628130461026d2c4755b94e1eecc15e0716350220e6a1d91b6d45051ceec8dd2199 WHIRLPOOL 4a7b1c906a8bde525f49c31d03fb6d950f1ec54412f66afb0aede4ac049dce9ef129da5e2a0632a150cfe35a4a2425ea35600f037239bfc5990763b3a3ef3c41
-MISC metadata.xml 261 SHA256 3812db1cff66d287c945fc7987f7d2cb37fea10ad28fdae3b7277beb8cfe7392 SHA512 590077890c7cc0e1fd1c8b4388764030dcf95e6bd04f996a73839809b011e666a859417ae2ec91eba8af11e4fe5bbe9c89791e1eccd23b7fc6ec43cca304e0b1 WHIRLPOOL 539e44c7fa67fe66d40aea271af64a7da8cb15c7f990400572ea7372b6268575cf1bf1d536772276b8df4340a7919392d21120a7f7321d198a24460b3b383154
+EBUILD zynaddsubfx-9999.ebuild 2559 SHA256 a68bab87ede8600aff86e677ce13821540c80e91564057cb1491af1021d9ea25 SHA512 88547d56244f933e7a43d673320c99b866de88d0890968601c4c964c013fd38d9613c47a675c99e46c60e81100b1923ba78154e1532a2451606e45e3ee770f93 WHIRLPOOL 7ea84da021863d8bd83107259a86bfd959d6fc891b740361f53c008a7f6d697aef4cf1943019d3eaa1071f96cbd1c450e8e3b9792be36755688dc7e60b24876f
+MISC ChangeLog 2906 SHA256 12d2d0537a4f748494db79ee2b804a744f863db18c889e1a2e610c6d78782a71 SHA512 89c6bb9ad533de9ed490b274dbd589b2a88483a91ef22737e4ac7db762cd42ffbccdfe4515398a9a251e132c2255a2780ad910118f9c98f33665f6b1297d1d5b WHIRLPOOL 81d36aae0624471d21da25516a72069a7b4b4b97f3908f748e51d8121baf080d7cdbccc9c81f372cdf62ef9fb8251ba3aa6d456df2e1367dc482ff49af266c2c
+MISC metadata.xml 326 SHA256 f3e37c808dddd53bc913272601760ff96e5ca07976b535144ce7ee3c575363df SHA512 b86e3fe10ee613ea43dca311723a961de75b421ea2f46e09fdabe7c89ff32590ec3bfbd76e787de1c836a067c8fa85d720de38ed5c7fd9c06890763db09e72be WHIRLPOOL 00670bf609512dec7507070744facc1115200824c40c7844f92c16386f1056086241b7403ce5975bcc23b4ebf749caaa55450ad31df7a2f243f8b31ab7d3adb1
Added: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch 2016-11-18 19:16:14 UTC (rev 3021)
@@ -0,0 +1,12 @@
+--- zynaddsubfx-9999/CMakeLists.txt.orig 2016-11-18 17:01:05.000000000 +0100
++++ zynaddsubfx-9999/CMakeLists.txt 2016-11-18 17:09:30.203026188 +0100
+@@ -30,9 +30,6 @@
+ #Currently the only directory that uses cmake
+ add_subdirectory(src)
+
+-install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+- DESTINATION share/doc/zynaddsubfx
+- )
+ install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop
+ DESTINATION share/applications)
+ install(FILES zynaddsubfx.svg
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml 2016-11-18 15:36:49 UTC (rev 3020)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/metadata.xml 2016-11-18 19:16:14 UTC (rev 3021)
@@ -5,4 +5,7 @@
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>
</maintainer>
+ <use>
+ <flag name="ntk">Build x11-libs/ntk GUI></flag>
+ </use>
</pkgmetadata>
Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild 2016-11-18 15:36:49 UTC (rev 3020)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild 2016-11-18 19:16:14 UTC (rev 3021)
@@ -4,8 +4,7 @@
EAPI=5
-inherit cmake-utils exteutils git-r3 jackmidi
-#patcher toolchain-funcs jackmidi
+inherit cmake-utils exteutils git-r3 multilib
RESTRICT="mirror"
DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
@@ -18,26 +17,27 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="oss alsa jack jackmidi lash portaudio"
+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 )"
-DEPEND=">=x11-libs/fltk-1.1.2
- =sci-libs/fftw-3*
+RDEPEND=">=dev-libs/mini-xml-2.2.1
+ sci-libs/fftw:3.0
+ alsa? ( media-libs/alsa-lib )
+ dssi? ( media-libs/dssi )
+ fltk? ( >=x11-libs/fltk-1.3:1 )
+ jack? ( media-sound/jack-audio-connection-kit )
jackmidi? ( >=media-sound/jack-audio-connection-kit-0.100.0-r3 )
- !jackmidi? ( media-sound/jack-audio-connection-kit )
- >=dev-libs/mini-xml-2.2.1
lash? ( virtual/liblash )
+ ntk? ( x11-libs/ntk )
portaudio? ( media-libs/portaudio )"
+DEPEND="!media-libs/zynaddsubfx-banks
+ !media-sound/zynaddsubfx-cvs
+ virtual/pkgconfig"
-RDEPEND="!media-libs/zynaddsubfx-banks
- !media-sound/zynaddsubfx-cvs"
+PATCHES=( "${FILESDIR}/gnustd.diff"
+ "${FILESDIR}/${P}-docs.patch" )
-PATCHES=( "${FILESDIR}/gnustd.diff" )
-
-#pkg_setup() {
- # jackmidi.eclass
-# use jackmidi && need_jackmidi
-#}
-
src_unpack() {
git-r3_src_unpack
unpack "zynaddsubfx-presets-0.1.tar.bz2"
@@ -44,46 +44,22 @@
}
src_configure() {
- # the last used flag is used as default input and output
- # it doesn't work, comment everything
-# INPUT="null"
-# OUTPUT="null"
-# if use oss ; then
-# WOSS="1"
-# INPUT="oss"
-# OUTPUT="oss"
-# else
-# WOSS="0"
-# fi
-# if use portaudio ; then
-# WPA="1"
-# OUTPUT="portaudio"
-# else
-# WPA="0"
-# fi
-# if use alsa ; then
-# WALSA="1"
-# INPUT="alsa"
-# OUTPUT="alsa"
-# else
-# WALSA="0"
-# fi
-# if use jack ; then
-# WJACK="1"
-# INPUT="jack"
-# OUTPUT="jack"
-# else
-# WJACK="0"
-# fi
+ # overide upstream GUI preference
+ MYGUI="off"
+ use fltk && MYGUI="fltk"
+ use ntk && MYGUI="ntk"
-# local mycmakeargs=(
-# -OssEnable="${WOSS}"
-# -PaEnable="${WPA}"
-# -AlsaEnable="${WALSA}"
-# -JackEnable="${WJACK}"
-# -DefaultInput="${INPUT}"
-# -DefaultOuput="${OUTPUT}"
-# )
+ 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"`
+ -DPluginLibDir=$(get_libdir)
+ )
cmake-utils_src_configure
}