[proaudio] [958] VST is broken for time being in trunk, depend on jack -9999

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


Revision: 958
Author:   gimpel
Date:     2007-11-18 17:48:28 +0000 (Sun, 18 Nov 2007)

Log Message:
-----------
VST is broken for time being in trunk, depend on jack -9999

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ardour/Manifest
    trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild


Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest	2007-11-18 15:56:23 UTC (rev 957)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest	2007-11-18 17:48:28 UTC (rev 958)
@@ -53,10 +53,10 @@
 MD5 8443e654f02c448c72791bdce638109b ardour-99991.ebuild 3868
 RMD160 30b795f7702a6b87fb2c13124cba53e70852abe4 ardour-99991.ebuild 3868
 SHA256 47b48894349388f345f95ff40b74c0f37e520e15d8e184589b8949e7727cabbc ardour-99991.ebuild 3868
-EBUILD ardour-99992.ebuild 4259 RMD160 fa05193e383d6a5639af48b64892abbdb9f25005 SHA1 57ebe2253479125b44d5cae969d05cb2f4d9a736 SHA256 d217c8346647465132cbf7760dcf7890a68b1074c1eb02edfb718b0cee1b4196
-MD5 9492200299f8b61320004c5acc363ab8 ardour-99992.ebuild 4259
-RMD160 fa05193e383d6a5639af48b64892abbdb9f25005 ardour-99992.ebuild 4259
-SHA256 d217c8346647465132cbf7760dcf7890a68b1074c1eb02edfb718b0cee1b4196 ardour-99992.ebuild 4259
+EBUILD ardour-99992.ebuild 4061 RMD160 f43d04b9d71c6b678327d5fb45050717bd2f7071 SHA1 6becb6218ed74e230f2fb2ab092754f69aecd6fb SHA256 cf0032d648e68952033cc011ca288c7c8f362b63800df11846d874d298074e52
+MD5 cc7e2823197769275092c3ab154c100e ardour-99992.ebuild 4061
+RMD160 f43d04b9d71c6b678327d5fb45050717bd2f7071 ardour-99992.ebuild 4061
+SHA256 cf0032d648e68952033cc011ca288c7c8f362b63800df11846d874d298074e52 ardour-99992.ebuild 4061
 MD5 7f35f34f809b48f1cd8d1eaf4682c839 files/digest-ardour-0.99.2 247
 RMD160 06d0bfe32c7759efd86b7caf310b2918cdb74b38 files/digest-ardour-0.99.2 247
 SHA256 aa54b7842628aaa700f3a84666317bdee6097c8c34cb6ea376106530bcbc5446 files/digest-ardour-0.99.2 247

Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild	2007-11-18 15:56:23 UTC (rev 957)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-99992.ebuild	2007-11-18 17:48:28 UTC (rev 958)
@@ -14,7 +14,7 @@
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS=""
-IUSE="nls debug sse altivec vst"
+IUSE="nls debug sse altivec" #vst"
 
 RDEPEND=">=media-libs/liblrdf-0.4.0
 	>=media-libs/raptor-1.2.0
@@ -28,9 +28,9 @@
 	>=dev-libs/glib-2.10
 	>=x11-libs/gtk+-2.6
 	>=gnome-base/libgnomecanvas-2.12.0
-	>=media-sound/jack-audio-connection-kit-0.100.0
-	!=media-sound/ardour2-9*
-	vst? ( >=app-emulation/wine-0.9.5 )"
+	=media-sound/jack-audio-connection-kit-9999
+	!=media-sound/ardour2-9*"
+	#vst? ( >=app-emulation/wine-0.9.5 )"
 
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.33.1
@@ -39,9 +39,9 @@
 	sys-devel/automake
 	>=dev-util/pkgconfig-0.8.0
 	>=dev-util/scons-0.96.1
-	nls? ( >=sys-devel/gettext-0.12.1 )
-	vst? ( app-arch/zip 
-		=media-libs/vst-sdk-2.3* )"
+	nls? ( >=sys-devel/gettext-0.12.1 )"
+	#vst? ( app-arch/zip 
+	#	=media-libs/vst-sdk-2.3* )"
 
 S="${WORKDIR}/ardour2"
 
@@ -57,31 +57,32 @@
 
 src_unpack(){
 	# abort if user answers no to distribution of vst enabled binaries
-	if use vst;then agree_vst || die "you can not distribute ardour with vst support" ;fi
+	#if use vst;then agree_vst || die "you can not distribute ardour with vst support" ;fi
+	
 	subversion_src_unpack
-	#fetch_tarball_cmp "${URL}"
-	#unpack "${URL##*/}"
 	cd ${S}
+	
 	# change template dir to not overwrite ardour1 stuff
-	sed -i -e 's:\(share\)/ardour/\(templates\):\1/ardour2/\2:g' templates/SConscript || die "changing template names failed"
+	sed -i -e 's:\(share\)/ardour/\(templates\):\1/ardour2/\2:g' \
+		templates/SConscript || die "changing template names failed"
 	add_ccache_to_scons
 	
 	# ################
 	# adjust files for vst support
-	if use vst;then
+	#if use vst;then
 		# delete vst question
-		touch ${S}/.personal_use_only
+	#	touch ${S}/.personal_use_only
 
 		# fix vst header
-		sed -ie 's@vstsdk2.3/source/common/aeffectx.h@/usr/include/vst/aeffectx.h@g' libs/fst/SConscript || die "change vst-header location"
+	#	sed -ie 's@vstsdk2.3/source/common/aeffectx.h@/usr/include/vst/aeffectx.h@g' libs/fst/SConscript || die "change vst-header location"
 		#symlink the include vst include files
-		vst_tmp_dir="vstsdk2.3/source/common"
-		mkdir -p ${vst_tmp_dir}
-		cp -r  /usr/include/vst/./ ${vst_tmp_dir}
-		zip -0r  libs/fst/vstsdk2.3.zip vstsdk2.3 &>/dev/null
+	#	vst_tmp_dir="vstsdk2.3/source/common"
+	#	mkdir -p ${vst_tmp_dir}
+	#	cp -r  /usr/include/vst/./ ${vst_tmp_dir}
+	#	zip -0r  libs/fst/vstsdk2.3.zip vstsdk2.3 &>/dev/null
 		#/usr/include/vst/ libs/fst
 		#ln -s ${DISTDIR}/vstsdk2.3.zip /libs/fst/
-	fi
+	#fi
 	# ###############
 }
 
@@ -93,7 +94,7 @@
 	! use altivec; myconf="${myconf} ALTIVEC=$?"
 	! use debug; myconf="${myconf} ARDOUR_DEBUG=$?"
 	! use nls; myconf="${myconf} NLS=$?" 
-	! use vst; myconf="${myconf} VST=$?" 
+	#! use vst; myconf="${myconf} VST=$?" 
 	! use sse; myconf="${myconf} USE_SSE_EVERYWHERE=$? BUILD_SSE_OPTIMIZATIONS=$?"
 	# static settings
 	myconf="${myconf} PREFIX=/usr KSI=0" # NLS=0"
@@ -105,18 +106,18 @@
 
 src_install() {
 	scons DESTDIR="${D}" install || die "make install failed"
-	if use vst;then
-		newbin vst/ardour_vst.exe.so ardour2.exe.so
-		newbin vst/ardour_vst ardour2
-		fperms 644 /usr/bin/ardour2.exe.so
-		sed -i -e'/^appname/'i"export\ LD_LIBRARY_PATH=\"/usr/lib/ardour2/:\$LD_LIBRARY_PATH\"" ${D}/usr/bin/ardour2
+	#if use vst;then
+	#	newbin vst/ardour_vst.exe.so ardour2.exe.so
+	#	newbin vst/ardour_vst ardour2
+	#	fperms 644 /usr/bin/ardour2.exe.so
+	#	sed -i -e'/^appname/'i"export\ LD_LIBRARY_PATH=\"/usr/lib/ardour2/:\$LD_LIBRARY_PATH\"" ${D}/usr/bin/ardour2
 
 		# fix ardour file_name
-		sed -i -e 's@ardour_vst@ardour2@' ${D}/usr/bin/ardour2
-	else
+	#	sed -i -e 's@ardour_vst@ardour2@' ${D}/usr/bin/ardour2
+	#else
 		# fix ardour path
 		sed -i -e 's:'${D}'::g' ${D}/usr/bin/ardour2
-	fi
+	#fi
 
 	cd DOCUMENTATION/
 	for i in `find -iname 'CVS'`;do rm -rf ${i};done
@@ -130,8 +131,6 @@
 	read ANSWER
 	if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "yes" ];then
 		einfo "OK, VST support will be enabled"
-		# delete question from SConscript
-		#sed -i -e '/Make\ sure\ they/,/print\ \"OK,\ VST\ support\ will\ be\ enabled\"/d' "${S}"/SConstruct || die " failed to del vst question"
 	else
 		eerror "You cannot build Ardour with VST support for distribution to others"
 		eerror "It is a violation of several different licenses"


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/