[proaudio] [2146] various fixes in libclam + NetworkEditor

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

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] [2146] various fixes in libclam + NetworkEditor
From: subversion@xxxxxxxxxxxxx
Date: Sun, 17 Jun 2012 15:50:34 +0200

Revision: 2146
Author:   dominique
Date:     2012-06-17 15:50:33 +0200 (Sun, 17 Jun 2012)
Log Message:
-----------
various fixes in libclam + NetworkEditor

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/libclam/ChangeLog
    trunk/overlays/proaudio/media-libs/libclam/Manifest
    trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild
    trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild
    trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog
    trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest
    trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild
    trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-9999.ebuild

Modified: trunk/overlays/proaudio/media-libs/libclam/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/ChangeLog	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-libs/libclam/ChangeLog	2012-06-17 13:50:33 UTC (rev 2146)
@@ -2,10 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  17 Jun 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  17+18 Jun 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   libclam-1.0.0-r1.ebuild, libclam-1.1.0.ebuild, libclam-1.2.0.ebuild,
-  libclam-1.3.0.ebuild, libclam-9999-r1.ebuild: updated libjpeg DEPEND
-  to virtual/jpeg
+  libclam-1.3.0.ebuild, libclam-1.4.0.ebuild, libclam-9999-r1.ebuild:
+  updated libjpeg DEPEND to virtual/jpeg
+  libclam-1.4.0.ebuild, libclam-9999-r1.ebuild: Fixed python setup
 
   20 Jan 2012; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
   libclam-1.0.0-r1.ebuild, libclam-1.1.0.ebuild, libclam-1.2.0.ebuild,

Modified: trunk/overlays/proaudio/media-libs/libclam/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/Manifest	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-libs/libclam/Manifest	2012-06-17 13:50:33 UTC (rev 2146)
@@ -7,7 +7,7 @@
 EBUILD libclam-1.1.0.ebuild 3077 RMD160 6fba8cece42d9a477d93232345e2180ae0879632 SHA1 494ca68ddec5f41c78ff573c7d4e1ac406ffe341 SHA256 312533142010d9dd7550c291da6cf2e0e65b7eeed952561a26ada80f49c6f9e0
 EBUILD libclam-1.2.0.ebuild 3888 RMD160 a321453f9fa34ea777ffba789dd02c81ad377815 SHA1 1a9184c8f0d0c7ebf75b074e36ff9f698aa4e314 SHA256 fd54af97daf9d06480db012db83c405ed7e81df9ba00451ba3e1ea6ee6a16132
 EBUILD libclam-1.3.0.ebuild 3888 RMD160 a321453f9fa34ea777ffba789dd02c81ad377815 SHA1 1a9184c8f0d0c7ebf75b074e36ff9f698aa4e314 SHA256 fd54af97daf9d06480db012db83c405ed7e81df9ba00451ba3e1ea6ee6a16132
-EBUILD libclam-1.4.0.ebuild 4064 RMD160 f12cbaa19e1b5273f8e1cb92633fe13a40171aea SHA1 315ae4fdd1963d29b4d5b2e0c9e3a45b0a9108bb SHA256 d3f2bae4b9e7710d2cabb65997892025f3f795a992d93b8df2a2aaccc7fae81d
-EBUILD libclam-9999-r1.ebuild 3757 RMD160 f84e0840ef6f47f37cbaa16426ca45cb5148bbe4 SHA1 5ad1d9661853c8689a0c384dc0ec6b7ed752535b SHA256 a0ae19ce735d4c0b95b5c1bb09d256560e9b5f659dd14862781028a5fd25370b
-MISC ChangeLog 2010 RMD160 b7d6fdc6e947d62319966e6853574f3c70e656b7 SHA1 bd8512348152d690a067d6d44f7c034af470fbad SHA256 7df89d6ea702fa1e58cfd5dc78c97fa8299c81e9213ccb6ac06d65941285a198
+EBUILD libclam-1.4.0.ebuild 4138 RMD160 8c65f3cc561656d9ff6d6fa6bd9c9875be3297a1 SHA1 36465722419fe884f130bbc9417b3ddb99f77174 SHA256 b21300fa867d39d1e8e2627aa9d2673ca2723d4fdeff8b65c91ee368944a5452
+EBUILD libclam-9999-r1.ebuild 4644 RMD160 9d711689f78bb54c40b835eb2780ee2bf565e407 SHA1 2a4dc5af305e7de0a2de37c0a61c330295f73907 SHA256 20211f6c1567b0cdbabea8abe1567b59f65b2a5202a2d9e5543db79b483dc9eb
+MISC ChangeLog 2102 RMD160 03c200e7655142385e8031d60de70c6d5a67c9cc SHA1 6750c37ecb3c29bbaabf850e6389151aa8db2f73 SHA256 1d7286ecc1ab6fdeb95691625b7b621d1dfefe0f30b58168a0940489c5f64309
 MISC metadata.xml 775 RMD160 0531993e7eef40e7ab38bed70785d7e877e83135 SHA1 0e77e51cba4a8c75f6fd11bb398a5ecc3d2e6044 SHA256 a277660c48b7b9f113dfc648ef20d35b0adb1f7bc3d1891a9d9071cefec72b6d

Modified: trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-1.4.0.ebuild	2012-06-17 13:50:33 UTC (rev 2146)
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit eutils qt4-r2
+inherit eutils python qt4-r2
 
 DESCRIPTION="Framework for research and application development in the Audio and Music domain"
 HOMEPAGE="http://clam-project.org/";
@@ -22,6 +22,8 @@
 
 RESTRICT="mirror"
 
+PYTHON_DEPEND="2:7"
+
 RDEPEND="
 	dev-util/cppunit
 	virtual/jpeg
@@ -52,6 +54,10 @@
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
 src_compile() {
 	# required for scons to "see" intermediate install location
 	mkdir -p "${D}"/usr

Modified: trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-libs/libclam/libclam-9999-r1.ebuild	2012-06-17 13:50:33 UTC (rev 2146)
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit subversion
-#scons-ccache
+EAPI="2"
+inherit subversion eutils python qt4-r2
 
 DESCRIPTION="Framework for research and application development in the Audio and Music domain"
 HOMEPAGE="http://clam-project.org/index.html";
@@ -11,68 +11,101 @@
 MY_PN="CLAM"
 
 SRC_URI=""
-ESVN_REPO_URI="http://iua-share.upf.edu/svn/clam/trunk/CLAM";
+ESVN_REPO_URI="http://clam-project.org/clam/trunk";
+ESVN_PROJECT="clam"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc double jack ladspa osc fftw fft alsa qt3 sndfile vorbis mad id3 portaudio"
+IUSE="doc double fft fftw jack ladspa lv2 mad optimize osc portaudio portmidi qt3 rtaudio sndfile vorbis xercesc +xmlpp"
 RESTRICT="mirror"
 
-DEPEND="dev-util/scons
-	ladspa? ( media-libs/ladspa-sdk )
-	>=dev-libs/xerces-c-2.7
+PYTHON_DEPEND="2:7"
+RDEPEND="ladspa? ( media-libs/ladspa-sdk )
+	xercesc? ( >=dev-libs/xerces-c-2.7[icu] )
+	xmlpp? ( dev-cpp/libxmlpp:2.6 )
 	fftw? ( =sci-libs/fftw-3* )
 	virtual/opengl
 	x11-libs/fltk
 	jack? ( media-sound/jack-audio-connection-kit )
 	vorbis? ( media-libs/libvorbis
 	    media-libs/libogg )
-	mad? ( media-libs/libmad )
+	mad? ( media-libs/libmad
+		media-libs/id3lib )
 	sndfile? ( media-libs/libsndfile )
-	id3? ( media-libs/id3lib )
 	portaudio? ( =media-libs/portaudio-19* )
+	portmidi? ( media-libs/portmidi )
 	virtual/jpeg
-	alsa? ( media-libs/alsa-lib )
+	lv2? ( media-libs/slv2 )
+	rtaudio? ( media-libs/alsa-lib )
 	media-libs/libpng
 	x11-libs/libXext
 	x11-libs/libXft
 	x11-libs/libXi
 	qt3? ( =x11-libs/qt-3* )
-	app-doc/doxygen
 	dev-util/cppunit
 	osc? ( media-libs/oscpack )"
 
-RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-util/scons
+	app-doc/doxygen"
 
 S="${WORKDIR}/${MY_PN}"
+MY_S="${S}/${MY_PN}"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_unpack() {
+	subversion_src_unpack
+}
+
 src_compile() {
 	# required for scons to "see" intermediate install location
 	mkdir -p "${D}"/usr
 
-	cd "${S}"/scons/libs
+	cd "${MY_S}" || die
 
-	local myconf="DESTDIR=${D}/usr prefix=/usr install_prefix=${D}/usr"
+	local myconf="DESTDIR=${D}/usr prefix=/usr prefix_for_packaging=${D}/usr"
 	if use double; then
 	    myconf="${myconf} double=yes"
 	fi
+	if use optimize; then
+	    myconf="${myconf} optimize_and_lise_precision=yes"
+	fi
+	if use xercesc; then
+		if use xmlpp; then
+			myconf+=" xmlbackend=both"
+		else
+			myconf+=" xmlbackend=xercesc"
+		fi
+	else
+		if use xmlpp; then
+			myconf+=" xmlbackend=xmlpp"
+		else
+			myconf>=" xmlbackend=none"
+		fi
+	fi
 	if ! use ladspa; then
-	    myconf="${myconf} with_ladspa_support=no"
+	    myconf="${myconf} with_ladspa=no"
 	fi
 	if use osc; then
-	    myconf="${myconf} with_osc_support=yes"
+	    myconf="${myconf} with_osc=yes"
 	fi
 	if ! use jack; then
-	    myconf="${myconf} with_jack_support=no"
+	    myconf="${myconf} with_jack=no"
 	fi
+	if ! use lv2; then
+	    myconf="${myconf} with_lv2=no"
+	fi
 	if ! use fftw; then
-	    myconf="${myconf} with_fftw=no"
+	    myconf="${myconf} with_fftw3=no"
 	    else
-		myconf="${myconf} with_fftw=no with_fftw3=yes"
+		myconf="${myconf} with_fftw3=yes"
 	fi
 	if ! use fft; then
-	    myconf="${myconf} with_nr_fft=no"
+	    myconf="${myconf} with_nr_fftw=no"
 	fi
 	if ! use sndfile; then
 	    myconf="${myconf} with_sndfile=no"
@@ -82,23 +115,30 @@
 	fi
 	if ! use mad; then
 	    myconf="${myconf} with_mad=no"
+	    myconf="${myconf} with_id3=no" # workaround buggy buildsys
 	fi
-	if ! use id3; then
-	    myconf="${myconf} with_id3=no"
+	if use mad; then # was ! use id3 
+	    myconf="${myconf} with_mad=yes"
+	    myconf="${myconf} with_id3=yes" # was no
 	fi
 	if ! use portaudio; then
 	    myconf="${myconf} with_portaudio=no"
 	fi
-	if ! use alsa; then
-	    myconf="${myconf} with_alsa=no"
+	if ! use rtaudio; then
+	    myconf="${myconf} audio_backend=portaudio"
+	else
+	    myconf="${myconf} audio_backend=rtaudio"
 	fi
-	scons configure ${myconf} KSI=0 || die "configuration failed"
+	if ! use portmidi; then
+	    myconf="${myconf} with_portmidi=no"
+	fi
+	scons configure ${myconf} || die "configuration failed"
 	scons --help configure
 	scons || die "compilation failed"
 }
 
 src_install() {
-	cd "${S}"/scons/libs
+	cd "${MY_S}" || die
 	dodir /usr
 
 	scons install || die "scons install failed"

Modified: trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/ChangeLog	2012-06-17 13:50:33 UTC (rev 2146)
@@ -2,8 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  17 Jun 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
+  17+18 Jun 2012; Dominique Michel <dominique_libre@xxxxxxxxxxxxxxx>
   NetworkEditor-9999.ebuild: Fixed depend to libclam
+  9999 + 1.4.0: FixedPythn setup
 
   20 Jan 2012; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
   NetworkEditor-1.0.0.ebuild, NetworkEditor-1.1.0.ebuild,

Modified: trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/Manifest	2012-06-17 13:50:33 UTC (rev 2146)
@@ -7,7 +7,7 @@
 EBUILD NetworkEditor-1.1.0.ebuild 1677 RMD160 138ed31ca3c9b0e7ab26a9b1506999194ea088b7 SHA1 679ecebffdf5e15ba3ef5e0d69ef7098ce314158 SHA256 a5286ef6817625e49b5e6aa559a2820efa1e687754963001e72e02334851a236
 EBUILD NetworkEditor-1.2.0.ebuild 1677 RMD160 6223a5d36b6d7fb121e46e6fc0c5a82f50422ee9 SHA1 887c38f0b6d2ed8845048157fed1f54a1e02d4dd SHA256 acd8fd1cd4c959baa9718d8c2935c2853f94f48572250eb0335592201f424bbf
 EBUILD NetworkEditor-1.3.0.ebuild 1680 RMD160 fc37d842d4f195bcedcc94d6497748c0b3a96279 SHA1 73bf9973ba519270cf8c8c3897650b99fff46d7e SHA256 cae0fa435d2c27d54332e16445177b0d917e3e7661c3e2839e3d8ffa65986c7d
-EBUILD NetworkEditor-1.4.0.ebuild 1671 RMD160 d8b528c8fdbb3e6f579d51d251c6f8b38196cf96 SHA1 4cd769316bad007f9caa7e7931fe673071193590 SHA256 5b5e9198e722c74c0562c850824613324185713189acb11b3ed9253528f7c810
-EBUILD NetworkEditor-9999.ebuild 1674 RMD160 113fca26daa49a3eaa28aa5e0cc0054eefaed0a6 SHA1 917f6664650fba2aa5f26522040a8bb9486b4802 SHA256 3b6188f68679595625dd6d6286e07b985586a4517523d4af46853149d6de3ee8
-MISC ChangeLog 1332 RMD160 a35b9e7516a0f35c42887d74b22b0d11c6b75786 SHA1 72774af1aa87542e8fe671de15893f44406223db SHA256 f24bc8746d99d0b0af7407e7c0604f54f9734ff9ded98c37322895b0571d4ec5
+EBUILD NetworkEditor-1.4.0.ebuild 1729 RMD160 86b492ede448842a2fa5d24e8a2992751a1b0bd6 SHA1 bdd6f2c8ccd1d0e66bc3d6f4464bbe9d1a14f832 SHA256 678c3a8da5e12dc041445dd65d66c211523cafe1644042163f1db29aadbb15f0
+EBUILD NetworkEditor-9999.ebuild 1805 RMD160 235162d3e1769a2f5df3714ab00168ddf4c676be SHA1 73a9ce919beeab4cef30f4613d3a41d3be3c8316 SHA256 e8415cd01da63222e57a1db9b2adb5115244851b6c2b559003f7b762c34a5386
+MISC ChangeLog 1368 RMD160 75e658f765834977a3e6eb5c51ff48ef4c356761 SHA1 f616db0cf393ae0362bdfdc3df607c7dde1b22a7 SHA256 4f9534dd9310efcc233dfe0d5f23cd23835807df7bec9be4d020d5a233c99d43
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-1.4.0.ebuild	2012-06-17 13:50:33 UTC (rev 2146)
@@ -4,7 +4,7 @@
 
 EAPI=1
 
-inherit eutils qt4
+inherit eutils python qt4
 
 DESCRIPTION="CLAM's visual builder"
 HOMEPAGE="http://clam-project.org/";
@@ -17,6 +17,8 @@
 IUSE=""
 RESTRICT="mirror"
 
+PYTHON_DEPEND="2:7"
+
 DEPEND="dev-util/scons
 	>=media-libs/libclam-1.4.0
 	<media-libs/libclam-9999
@@ -35,6 +37,8 @@
 		eerror "You need to build qt4 with opengl support to have it in ${PN}"
 		die "Enabling opengl for $PN requires qt4 to be built with opengl support"
 	fi
+
+	set_python_active_version 2
 }
 
 src_compile() {

Modified: trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-9999.ebuild	2012-06-16 23:15:57 UTC (rev 2145)
+++ trunk/overlays/proaudio/media-sound/NetworkEditor/NetworkEditor-9999.ebuild	2012-06-17 13:50:33 UTC (rev 2146)
@@ -4,13 +4,14 @@
 
 EAPI=1
 
-inherit subversion qt4
+inherit subversion python qt4
 
 DESCRIPTION="CLAM's visual builder"
 HOMEPAGE="http://clam-project.org/index.html";
 
 SRC_URI=""
-ESVN_REPO_URI="http://iua-share.upf.edu/svn/clam/trunk/${PN}";
+ESVN_REPO_URI="http://clam-project.org/clam/trunk";
+ESVN_PROJECT="clam"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,6 +19,8 @@
 IUSE=""
 RESTRICT="mirror"
 
+PYTHON_DEPEND="2:7"
+
 DEPEND="dev-util/scons
 	>=media-libs/libclam-9999
  	|| ( ( x11-libs/qt-core x11-libs/qt-gui 
@@ -31,28 +34,35 @@
 QTDIR=""
 
 S="${WORKDIR}/${PN}"
+MY_S="${S}/${PN}"
 
 pkg_setup() {
 	if ! has_version x11-libs/qt-opengl && ! built_with_use =x11-libs/qt-4* opengl; then
 		eerror "You need to build qt4 with opengl support to have it in ${PN}"
 		die "Enabling opengl for $PN requires qt4 to be built with opengl support"
 	fi
+
+	python_set_active_version 2
 }
 
+src_unpack() {
+	subversion_src_unpack
+}
+
 src_compile() {
 	# required for scons to "see" intermediate install location
 	mkdir -p ${D}/usr
 	addpredict /usr/share/clam/sconstools
 
-	cd ${S}
-	scons clam_prefix=/usr DESTDIR="${D}/usr" install_prefix="${D}/usr" \
+	cd ${MY_S} || die
+	scons clam_prefix=/usr DESTDIR="${D}/usr" prefix="${D}/usr" \
 		qt_plugins_install_path="/lib/qt4/plugins/designer" || die "Build failed"
 	convert -resize 48x48 -colors 24 src/images/NetworkEditor-icon.png clam-networkeditor.xpm || die "convert NE icon failed"
 	convert -resize 48x48 -colors 24 src/images/Prototyper-icon.png clam-prototyper.xpm || die "convert P icon failed"
 }
 
 src_install() {
-	cd ${S}
+	cd ${MY_S}
 	dodir /usr
 	addpredict /usr/share/clam/sconstools

Messages sorted by: [ date | thread ]
Prev by Date: [proaudio] [2145] CLAM *.9999: Removed subversion DEPEND
Next by Date: [proaudio] [2147] various fixes in Voice2MIDI
Previous by thread: [proaudio] [2145] CLAM *.9999: Removed subversion DEPEND
Next by thread: [proaudio] [2147] various fixes in Voice2MIDI

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/