[proaudio] [1280] move stk to media-libs, add examples useflag, don' t

[proaudio] [1280] move stk to media-libs, add examples useflag, don' t install project headers and .cpp files

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

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] [1280] move stk to media-libs, add examples useflag, don' t install project headers and .cpp files
From: subversion@xxxxxxxxxxxxx
Date: Fri, 08 Aug 2008 13:05:51 +0200

Revision: 1280
Author:   gimpel
Date:     2008-08-08 13:05:50 +0200 (Fri, 08 Aug 2008)

Log Message:
-----------
move stk to media-libs, add examples useflag, don't install project headers and .cpp files

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/stk/Manifest
    trunk/overlays/proaudio/media-libs/stk/stk-4.3.1.ebuild
    trunk/overlays/proaudio/media-sound/lmms/Manifest
    trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild
    trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-libs/stk/

Removed Paths:
-------------
    trunk/overlays/proaudio/media-libs/stk/stk-4.3.0.ebuild
    trunk/overlays/proaudio/media-sound/stk/

Copied: trunk/overlays/proaudio/media-libs/stk (from rev 1278, trunk/overlays/proaudio/media-sound/stk)


Property changes on: trunk/overlays/proaudio/media-libs/stk
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: trunk/overlays/proaudio/media-libs/stk/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/stk/Manifest	2008-08-07 16:10:28 UTC (rev 1278)
+++ trunk/overlays/proaudio/media-libs/stk/Manifest	2008-08-08 11:05:50 UTC (rev 1280)
@@ -2,9 +2,7 @@
 AUX stk-4.3.1-fpic.patch 1327 RMD160 f8bb978968cd194e80cb099fb33bd479dcea7fb0 SHA1 86858582fb8d235d0aaa16fc29e0d7c88255be2f SHA256 d1215c76d362298c530dfcd1e0ca3a3b4c19a9b84c60129549919cea2f9c0e95
 AUX stk-4.3.1-gcc43.patch 8066 RMD160 db8cbe250fc36f3855c22a7449e0b90b29e2e372 SHA1 265a9f591b86fcc55e17c625bba82232a79cbf40 SHA256 ddd36ac2a288d363d57ec1960ec9be68f01282131dd7b90b3be2d2e124274d43
 AUX stk-4.3.1-missing.patch 184 RMD160 7934473e75e5dfb7a7abbaba321b0ac24d6ad485 SHA1 306fdf8dbe2f265dfc3a983d851c26915ecac413 SHA256 413f49d39320c4c5af3da6c45f2927fc75eac101cd64c8d0fcc1a054907ed3cb
-DIST stk-4.3.0.tar.gz 2015826 RMD160 6c363ffe6e9914791a88262020a8870b62a36483 SHA1 3274d88765bce69d2f2edf0b4cd00e17a5b43385 SHA256 dcc064c393d88fdf912d8df4c37dcbbb4e83019890990faa198a0d106932bd8b
 DIST stk-4.3.1.tar.gz 1952667 RMD160 f0cde3c13af08f4ae58174272bfd09df6f00fec1 SHA1 56922c001f9fc8f7c5cefe5f0c2e64ffa273dffe SHA256 e87fae4fe4e4681185afb752f5ce90cf8fcf16600a0c76d025a3f638be32cee0
-EBUILD stk-4.3.0.ebuild 1521 RMD160 ac2d32e5dbbc8cd714a45436563e40dc77da22f1 SHA1 d91775bbab60059c9be05bb215f0bc34ff3c2dc0 SHA256 0c9be10615e819312529d7b502f92c98e1b106985958fb2ea055fd085d91dd5b
-EBUILD stk-4.3.1.ebuild 1766 RMD160 47f6510d0697008fb3e435b6774e7ea5c8a6c20c SHA1 d0bdec2989283c214e17dd39e5de601d84e7afef SHA256 2782821abbbfa12e5c3f05b95edad330e3e8a267635dcb8449a9a47dec29e4d6
+EBUILD stk-4.3.1.ebuild 1966 RMD160 83fecac509753534dfb1014b8721b245130d72dc SHA1 9231f211d0625a0d71d335788a144b6666101010 SHA256 8f17c51826995fa77d13d5d5f81af06f5746fd08ae511da327a82f37edf75723
 MISC ChangeLog 446 RMD160 5c2005e3c70d6e64a157e843d898e42da8a4ce63 SHA1 34353031aa640176fd3e8909f3cb27b100cd58d4 SHA256 12b0f53dbc8c179ba46f27436f461372fd06b72eedfaf4f2612043827d619dfa
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Deleted: trunk/overlays/proaudio/media-libs/stk/stk-4.3.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/stk/stk-4.3.0.ebuild	2008-08-07 16:10:28 UTC (rev 1278)
+++ trunk/overlays/proaudio/media-libs/stk/stk-4.3.0.ebuild	2008-08-08 11:05:50 UTC (rev 1280)
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Synthesis ToolKit in C++"
-HOMEPAGE="http://ccrma.stanford.edu/software/stk/";
-SRC_URI="http://ccrma.stanford.edu/software/stk/release/${P}.tar.gz";
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="alsa jack midi oss"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-		jack? ( media-sound/jack-audio-connection-kit )
-		midi? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-		dev-lang/perl"
-
-src_compile() {
-	econf \
-		`use_with alsa` \
-		`use_with jack` \
-		`use_with oss` \
-		RAWWAVE_PATH=/usr/share/stk/rawwaves/ \
-		|| die "configure failed!"
-
-	# build the whole bunch
-	cd src
-	emake || die "make in src failed!"
-
-	cd ../projects
-	for i in demo effects examples ragamatic; do
-		cd $i
-		emake || die
-		rm -f Release/*.o
-		cd ..
-	done
-
-	# reconfigure to correct paths, hell knows
-	cd "${S}"
-	econf \
-		`use_with alsa` \
-		`use_with jack` \
-		`use_with oss` \
-		RAWWAVE_PATH=/usr/share/stk/rawwaves \
-		INCLUDE_PATH=/usr/include/stk \
-		|| die "re-configure failed!"
-
-	# fix include paths
-	find . -type f -name Makefile\* -exec \
-		perl -p -i -e "s|../../src|/usr/share/stk/src|g" {} \;
-}
-
-src_install() {
-	dodoc README STK_TODO.txt
-	insinto /usr/include/stk
-	doins include/*.h include/*.msg include/*.tbl
-	insinto /usr/share/stk/src
-	doins src/*.cpp
-	insinto /usr/share/stk/rawwaves
-	doins rawwaves/*.raw
-	dolib src/libstk.a
-	# this one actually sucks, but..
-	mv projects "${D}"/usr/share/stk
-}
-

Modified: trunk/overlays/proaudio/media-libs/stk/stk-4.3.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/stk/stk-4.3.1.ebuild	2008-08-07 16:10:28 UTC (rev 1278)
+++ trunk/overlays/proaudio/media-libs/stk/stk-4.3.1.ebuild	2008-08-08 11:05:50 UTC (rev 1280)
@@ -11,14 +11,21 @@
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="alsa jack midi oss"
+IUSE="alsa examples jack midi oss"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
-		jack? ( media-sound/jack-audio-connection-kit )
-		midi? ( media-libs/alsa-lib )"
+	jack? ( media-sound/jack-audio-connection-kit )
+	midi? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}
-		dev-lang/perl"
+	dev-lang/perl"
 
+pkg_setup() {
+	if use midi && ! built_with_use media-libs/alsa-lib midi; then
+		eerror "You need to compile media-libs/alsa-lib with USE=\"midi\""
+		eerror "in order to get midi suppport in STK"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -37,43 +44,43 @@
 		RAWWAVE_PATH=/usr/share/stk/rawwaves/ \
 		|| die "configure failed!"
 
-	# build the whole bunch
+	# compile libstk
 	cd src
 	emake || die "make in src failed!"
 
-	cd ../projects
-	for i in demo effects examples ragamatic; do
-		cd $i
-		emake || die
-		rm -f Release/*.o
-		cd ..
-	done
-
-	# reconfigure to correct paths, hell knows
-	cd "${S}"
-	econf \
-		`use_with alsa` \
-		`use_with jack` \
-		`use_with oss` \
-		RAWWAVE_PATH=/usr/share/stk/rawwaves \
-		INCLUDE_PATH=/usr/include/stk \
-		|| die "re-configure failed!"
-
+	# compile examples and projects
+	if use examples; then
+		cd ../projects
+		for i in demo effects examples ragamatic; do
+			einfo "Compiling $i ..."
+			cd $i
+			emake || die
+			rm -f Release/*.o
+			cd ..
+		done
+	fi
 	# fix include paths
 	find . -type f -name Makefile\* -exec \
 		perl -p -i -e "s|../../src|/usr/share/stk/src|g" {} \;
 }
 
 src_install() {
-	dodoc README STK_TODO.txt
+	dodoc README
+	# install the lib
+	dolib src/libstk.so*
+	# install headers
 	insinto /usr/include/stk
 	doins include/*.h include/*.msg include/*.tbl
-	insinto /usr/share/stk/src
-	doins src/*.cpp
+	# install rawwaves
 	insinto /usr/share/stk/rawwaves
 	doins rawwaves/*.raw
-	dolib src/libstk.*
-	# this one actually sucks, but..
-	mv projects "${D}"/usr/share/stk
+	if use examples; then
+		# this one actually sucks, but..
+		for i in *.bat *.cpp *.h Makefile*; do
+			find projects/ -name $i -exec rm -f {} \;
+		done
+		dodir /usr/share/"${PN}"
+		doins -r projects
+	fi
 }
 

Modified: trunk/overlays/proaudio/media-sound/lmms/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/Manifest	2008-08-08 10:00:14 UTC (rev 1279)
+++ trunk/overlays/proaudio/media-sound/lmms/Manifest	2008-08-08 11:05:50 UTC (rev 1280)
@@ -5,7 +5,7 @@
 DIST lmms-0.4.0-beta1.tar.bz2 11393116 RMD160 9c0c6bf2793685064624f570a505fe18f27eff79 SHA1 cb9c1a3a2c801904b25a35872089ecfaf6e15d93 SHA256 7191773c89ebe0ff6734445b957d8e92915e0a95dfea5b67ecdf3637b51fffb4
 EBUILD lmms-0.3.1.ebuild 2017 RMD160 6cbe9c5b0d4dcdaa0035e287f6f3aabf29c77dd1 SHA1 d709f4b42187c61e344bd59d7c9d29949482fb8b SHA256 09ce3d64313f9c20c17156d378c1b3215cc7768125de498a47abfdc1acce8f54
 EBUILD lmms-0.3.2.ebuild 1815 RMD160 1497f2d07e768e56388829e5fa199980f0f2742d SHA1 d05ff6b6a52dbd3f3661b66c508b14e2968ab53e SHA256 123a027310b4c66016471f8211bc4dbcb5fc81243751da4b22e1f3c3e30c7fe2
-EBUILD lmms-0.4.0_beta1.ebuild 1610 RMD160 1c2498248342267153d453641ddd7585aa075e3a SHA1 8e1144a7939e1d0083f8012872dc98fca43a526c SHA256 fad5fea151640db16ece397e953839289f03a7827bc87093d2bc8ce110a2aef2
-EBUILD lmms-9999-r1.ebuild 1636 RMD160 4d0f2336dab9b32be96f7372c7136c2e4683f9f2 SHA1 33555ac49b0401bc14f3491a438d31e60bed9faf SHA256 5ccaf9ba9bd02a6874b1b58e69b6c7761e1717900fffd15151a0fc5dfb91c95c
+EBUILD lmms-0.4.0_beta1.ebuild 1609 RMD160 81948953f3f0f88773950a11f23194bc56d9c03d SHA1 8c9587a0b433e0f1ac1ba578575c5e6b9ea4a4b6 SHA256 24edc1fcb320fab4b466cfbfeb79d276f758fb693db6b65e8da36ca75b51426c
+EBUILD lmms-9999-r1.ebuild 1635 RMD160 95907bf2872661e58a84650757281a84a2d3a9eb SHA1 e83d2835075e462206e0d36c335544a395f03d2c SHA256 c71879224172e17742feff4db1b33fb18fab9a6080d260467bc56c2f3e60445f
 MISC ChangeLog 775 RMD160 7e143784d1fd1d4832bc5e248ae5adfb3bac77b3 SHA1 9f87a6d2345cc7ce35566985e69eb050e962836b SHA256 a12f1e47cbf5b45872ecebc2a1e16be4a73c4ef17648a53e166b95dde71c915a
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild	2008-08-08 10:00:14 UTC (rev 1279)
+++ trunk/overlays/proaudio/media-sound/lmms/lmms-0.4.0_beta1.ebuild	2008-08-08 11:05:50 UTC (rev 1280)
@@ -32,7 +32,7 @@
 	samplerate? ( media-libs/libsamplerate )
 	sdl? ( media-libs/libsdl
 		>=media-libs/sdl-sound-1.0.1 )
-	stk? ( media-sound/stk )
+	stk? ( media-libs/stk )
 	vst? ( app-emulation/wine )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.5"

Modified: trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild	2008-08-08 10:00:14 UTC (rev 1279)
+++ trunk/overlays/proaudio/media-sound/lmms/lmms-9999-r1.ebuild	2008-08-08 11:05:50 UTC (rev 1280)
@@ -33,7 +33,7 @@
 	samplerate? ( media-libs/libsamplerate )
 	sdl? ( media-libs/libsdl
 		>=media-libs/sdl-sound-1.0.1 )
-	stk? ( media-sound/stk )
+	stk? ( media-libs/stk )
 	vst? ( app-emulation/wine )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.5"

Messages sorted by: [ date | thread ]
Prev by Date: LMMS 0.4.0-beta (was: Re: [proaudio] ProAudio current state)
Next by Date: Re: [proaudio] ProAudio current state
Previous by thread: [proaudio] [1279] Bump lmms-0.4.0_beta1, switched to cmake
Next by thread: [proaudio] [1281] omins dep on liblo-0.25

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/