[proaudio] proaudio/proaudio: [3200] jackminidesk: fix URI; zyn: various

[proaudio] proaudio/proaudio: [3200] jackminidesk: fix URI; zyn: various fixes

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] proaudio/proaudio: [3200] jackminidesk: fix URI; zyn: various fixes
From: subversion@xxxxxxxxxxxxx
Date: Sat, 24 Oct 2020 22:12:42 +0200

Revision: 3200
Author:   dominique
Date:     2020-10-24 22:12:41 +0200 (Sat, 24 Oct 2020)
Log Message:
-----------
jackminidesk: fix URI; zyn: various fixes

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jackmixdesk/Manifest
    trunk/overlays/proaudio/media-sound/jackmixdesk/jackmixdesk-9999.ebuild
    trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
    trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch
    trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff

Modified: trunk/overlays/proaudio/media-sound/jackmixdesk/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jackmixdesk/Manifest	2020-10-24 07:36:14 UTC (rev 3199)
+++ trunk/overlays/proaudio/media-sound/jackmixdesk/Manifest	2020-10-24 20:12:41 UTC (rev 3200)
@@ -1,5 +1,5 @@
 DIST jackmixdesk-0.3-r4.tar.gz 633076 BLAKE2B 2bcccf7482dacda7940a9ed2d712ce2d1d7f67b98dad85beae7dcadf033e44faf6348260de846c1fbbca79bfcc75b85c0359e2a9d277bf87eb514a687ecc0391 SHA512 abb4dad05b0230ff3b94a2ac878216b5044899282fc1aee607f77a4c4ffc5a15bf17c1cc7774340ff35faf8298a0ac8994fba55e09ac3c0b8c8d2a936f53c09a
 EBUILD jackmixdesk-0.3_p4.ebuild 1022 BLAKE2B f383fa3c8df7313263635950665fbc3f1f7ee765dac727f8054244ccfbd0c75f34637e17a50e8e877abbae1496ee314dce79ecd72c60ac49d0ae9ea57e3276ad SHA512 eec4d2b26c752cc430136b55d353b4b0c3f2c247720823cf3de5641432aa8855662b2fad0ed0538b447239bdbbca614b690732dcbd66e96d32ae360fd4e74002
-EBUILD jackmixdesk-9999.ebuild 1022 BLAKE2B f383fa3c8df7313263635950665fbc3f1f7ee765dac727f8054244ccfbd0c75f34637e17a50e8e877abbae1496ee314dce79ecd72c60ac49d0ae9ea57e3276ad SHA512 eec4d2b26c752cc430136b55d353b4b0c3f2c247720823cf3de5641432aa8855662b2fad0ed0538b447239bdbbca614b690732dcbd66e96d32ae360fd4e74002
+EBUILD jackmixdesk-9999.ebuild 1012 BLAKE2B 876856a5e5dd24068427c6bc7e15dbcedefffff2da4b7a4a53c69a64284bf08c4b5a8a47eded793ccc58d0d01133d28d4dac732b98b0e8c58b07b0442d78bad6 SHA512 f1ca567de0b6d637b104600c45f9779b211d8ade7b3fa3e1ea6cb42e923a86e332d76c3b8ad8040226f535723621bdfcd98021f5fcbaccaf03e63361eee8cf51
 MISC ChangeLog 1071 BLAKE2B e7954e1954da6c748daa9b46e486c48a9bd4a185661c046baea24b53f94db4b39e8e2df5b6eee4fccc2360dc3551150696231f1fe2ef6e5b9a1981b374283005 SHA512 8807ac5f008ba9ebe879f408465260efdddcdb42e143324324085000791b6b35457d3b13c110f0f4d436387eb0ffb99b92ecfe6429a2495bba6ca2ce8bac4094
 MISC metadata.xml 246 BLAKE2B d01c2d2909dd5f50ce592242d40f40fae29ef3192305559942ca767891376f57436e9549aa2706fe139b8071956294706485b07a3678d59f050efdd5b0534914 SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4

Modified: trunk/overlays/proaudio/media-sound/jackmixdesk/jackmixdesk-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jackmixdesk/jackmixdesk-9999.ebuild	2020-10-24 07:36:14 UTC (rev 3199)
+++ trunk/overlays/proaudio/media-sound/jackmixdesk/jackmixdesk-9999.ebuild	2020-10-24 20:12:41 UTC (rev 3200)
@@ -11,7 +11,7 @@
 HOMEPAGE="http://sourceforge.net/projects/${PN}";
 
 if [[ "${PV}" = 9999 ]]; then
-	ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${PN}/trunk";
+	ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/";
 	KEYWORDS=""
 else
 	MY_PV="${PV/_p/-r}"

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest	2020-10-24 07:36:14 UTC (rev 3199)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/Manifest	2020-10-24 20:12:41 UTC (rev 3200)
@@ -1,6 +1,5 @@
-AUX gnustd.diff 352 BLAKE2B f1d322d8db2fc809ded2c2984c18129100fd6c813f3acc8cf5df6a81733d676e07fcc9212928045ea5fa886304747976b11bd26235f2012fc860e54d1a7bcd02 SHA512 7f657c87d3b99b3329a4abc3287f441674415ea1c20be315d77357792562c33812f86a8b239d04d52ca902d927ad10784337d4436a6f9b209589b4c793237ee3
-AUX zynaddsubfx-9999-docs.patch 517 BLAKE2B c6c796c6b4c2ba029ce074179d52c13c4e06707c04fd6574c64c8162d0ef46a9bb1c878328783e0de8a6815992b4ae3b4fa6bceb53b69c317a462ada1535e866 SHA512 4b7fa081ac39a1092c163a28e108b28f597bd67b33f31fbca50550ddfdc2b58d876886d38fe0005d0df47e37e762fbcd1dc60dfe8e5818c2dc093aa5e42a0202
+AUX zynaddsubfx-9999-docs.patch 505 BLAKE2B 7542e9c5edafc0313c132cd6cbaebd70c709f5b4937cf1ce97414c03f151607a1a3103f04fa973298225bcc9d88d68f4f990747dc5a76382b1495b0c7cb9507f SHA512 6855b5370e04844d8cde3ff182d463cb3900d5c1f17223c5947efdd231736402d8c8ff47e567a58dec115fd52ad638a0480438216fef917a50b3787603a099b9
 DIST zynaddsubfx-presets-0.1.tar.bz2 27052 BLAKE2B 215eca9a8daefbd3a63ef0ff0970b19e9ffc0503d623bcb8b1659be2f61132cd707bbdde6ba5ee0d01a51a908614c1735bd830bd2efaf6bfbe5da97b6dc63270 SHA512 63cbe5306d01a325958cdcb8938a517944f6ab33c6a1eb8f9986dc26fabc8e0d3b32be14d2cf0ec4b30b3b594880fa478478367b6657545a3a0b6d1ae7ed3626
-EBUILD zynaddsubfx-9999.ebuild 2497 BLAKE2B 9b4ca136a02c65d849f371979b832b34cc56f004afc2912c13e03ad02b4ad515ceef12c4f74f8c11100154ca388ac9a330a6ced66dc53ca45626e3e20d0900ce SHA512 669ad15d90bcb180da0d163b62a59847251d32f85ff8bbca626f5658b6fb9011515dc537e87f6ba52a47a0e77c82c2b85f91ff513e41d7da4821ead654a7922c
+EBUILD zynaddsubfx-9999.ebuild 2618 BLAKE2B 1bbbed4ed2037b8467aa17aa24f9afde04ef0d88488c1616ea91675f3a6e912e3770c6adbd2a17edde021bfbdd0a428e78741813df6b5ce9fffda2a13f2e1379 SHA512 ca2f8727bb314d5b57c5f75e2bbffb18a42b8f05a60886cb437b01a684ba03a4d9a447ca66f56265cabd0d7434214d656f5ecb023a35d554b247386d67026865
 MISC ChangeLog 3204 BLAKE2B 819dce43af85477dec0cb78f025967426070c04eff633ea049a0e85a91b0027b57f6929a7139ff1520bde995ed36eb827816dc0937f96fffbc1cbad5c72e26b6 SHA512 90109532b3cf2f63fea97d29c707edb7344e34c892af8fda8df6f0dc85665a45b0e8bfd72723a22c9a548940c6e7fbf97eb19998058c0dfd54f8953520998278
 MISC metadata.xml 326 BLAKE2B b23a189d0fc8d8fb0598c54fc1da2e5c558d3e5eaf16be5480908486805d23a14f0bd0beac71bb615a87518a7ff79e25406c3ebd491fddbc946811f7051a6ff3 SHA512 b86e3fe10ee613ea43dca311723a961de75b421ea2f46e09fdabe7c89ff32590ec3bfbd76e787de1c836a067c8fa85d720de38ed5c7fd9c06890763db09e72be

Deleted: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff	2020-10-24 07:36:14 UTC (rev 3199)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/gnustd.diff	2020-10-24 20:12:41 UTC (rev 3200)
@@ -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 "3")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
- 
- #Set data directory, if any
- if(DEFINED ZYN_DATADIR)

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch	2020-10-24 07:36:14 UTC (rev 3199)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/files/zynaddsubfx-9999-docs.patch	2020-10-24 20:12:41 UTC (rev 3200)
@@ -1,10 +1,10 @@
---- zynaddsubfx-9999/CMakeLists.txt.orig	2017-08-19 15:39:42.538545388 +0200
-+++ zynaddsubfx-9999/CMakeLists.txt	2017-08-19 15:42:24.546539477 +0200
-@@ -36,9 +36,6 @@
+--- zynaddsubfx-9999/CMakeLists.txt.orig	2020-10-24 20:51:28.893717482 +0200
++++ zynaddsubfx-9999/CMakeLists.txt	2020-10-24 20:54:59.285726557 +0200
+@@ -35,9 +35,6 @@
  add_subdirectory(src)
  add_subdirectory(doc) # Doxygen only
  
--install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
+-install(FILES AUTHORS.txt COPYING README.adoc
 -	DESTINATION share/doc/zynaddsubfx
 -	)
  install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop

Modified: trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild	2020-10-24 07:36:14 UTC (rev 3199)
+++ trunk/overlays/proaudio/media-sound/zynaddsubfx/zynaddsubfx-9999.ebuild	2020-10-24 20:12:41 UTC (rev 3200)
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils exteutils git-r3 multilib
+inherit cmake exteutils git-r3 multilib flag-o-matic
 RESTRICT="mirror"
 
 DESCRIPTION="ZynAddSubFX is an opensource software synthesizer."
@@ -17,15 +17,19 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="oss alsa dssi fltk jack jackmidi lash +ntk portaudio"
+IUSE="oss alsa doc dssi fltk jack jackmidi lash +ntk portaudio"
 # upstream the following preference ntk -> fltk; we waant to choose the GUI:
 REQUIRED_USE="?? ( fltk ntk )"
 
-RDEPEND=">=dev-libs/mini-xml-2.2.1
+RDEPEND=">=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? ( media-sound/lash )
@@ -35,8 +39,7 @@
 	!media-sound/zynaddsubfx-cvs
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/gnustd.diff"
-	"${FILESDIR}/${P}-docs.patch" )
+PATCHES=( "${FILESDIR}/${P}-docs.patch" )
 
 src_unpack() {
 	git-r3_src_unpack
@@ -44,6 +47,8 @@
 }
 
 src_configure() {
+	append-cxxflags -std=c++11
+
 	# overide upstream GUI preference
 	MYGUI="off"
 	use fltk && MYGUI="fltk"
@@ -60,27 +65,29 @@
 		`use lash && echo "-DLashEnable=TRUE" || echo "-DLashEnable=FALSE"`
 		-DPluginLibDir=$(get_libdir)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 	cd "${S}"/ExternalPrograms/Spliter
 	emake
 	cd "${S}"/ExternalPrograms/Controller
 	emake
+	use doc && cmake_src_compile doc
 }
 
 src_install() {
-	cmake-utils_src_install
+	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	cmake_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/"*
+	insinto /usr/share/${PN}
+	doins -r instruments/*
+	doins -r ../presets/*
+#	doins -r ../examples/*
+#	doins "${S}/instruments/examples/"*
 	# --------
 }

Messages sorted by: [ date | thread ]
Prev by Date: [proaudio] proaudio/proaudio: [3199] fix lash depends
Next by Date: [proaudio] proaudio/proaudio: [3201] Remove python2 only boodler
Previous by thread: [proaudio] proaudio/proaudio: [3199] fix lash depends
Next by thread: [proaudio] proaudio/proaudio: [3201] Remove python2 only boodler

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/