ebuild bumped to 2.8.14 and syslibs.patch slightly adjusted. See bug 437408.

Package-Manager: portage-2.1.11.9/cvs/Linux i686

4 files changed, 208 insertions, 17 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index e58d26757aca..bca4b34c0ce4 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.102 2012/05/31 15:13:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.103 2012/11/20 20:30:19 nativemad Exp $
+
+*ardour-2.8.14 (21 Nov 2012)
+
+  21 Nov 2012; Andreas Schuerch <nativemad@gentoo.org> +ardour-2.8.14.ebuild,
+  +files/ardour-2.8.14-syslibs.patch:
+  Ebuild Bumped to 2.8.14 and syslibs.patch slightly adjusted. See bug 437408
 
   31 May 2012; Tim Harder <radhermit@gentoo.org> ardour-2.8.12.ebuild,
   +files/ardour-2.8.12-gcc47.patch:
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 7339dcf44e8e..0e3d62e4dc7f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX ardour-2.8.11-flags.patch 926 RMD160 34041cec7cfc8129a9ac2317b4503012597b3c32 SHA1 abf40321d624e54b19f0b1c3ade462470d9167b1 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304
-AUX ardour-2.8.11-soundtouch.patch 710 RMD160 af40c5ef37ebef6f924fd4560f54f43cf31ecfc8 SHA1 ae729d0332d7fd486b13bd2dacfe95e9f9f0d7a5 SHA256 4e62791188a3435b69ef0b679a80de880b4156f690f59acb2ee9b23053e0752e
-AUX ardour-2.8.12-gcc47.patch 181 RMD160 d6e810376346447a962cd039ee4a7117e5a8607e SHA1 f309ea7fa5d7aea77cca2a4464424f1e84f0f44c SHA256 bc854c1e6efb100c3a21346fa0bb1f9dbf6cf50bd62010fd903c61bd42d67bee
-AUX ardour-2.8.12-syslibs.patch 3800 RMD160 0b95f55ddb3c071ff96cde430d0e27c431e7026e SHA1 71325836029b1ba99cb453f50aadb20f52771ce4 SHA256 badff28ce208ad42caf5b0dd1abb66705048d463974f3cb3eebf8d6225b5c07d
-DIST ardour-2.8.12.tar.bz2 3397775 RMD160 7e26f4c953ec5b6f9a243f79bc5f8b5294c426b9 SHA1 bca81cac38f5c603472c9bd33f5d4d4094e5ca14 SHA256 f51514910f7734823a13b35823bbdc9d709252bad65c65b34c17efe1d3975be4
-EBUILD ardour-2.8.12.ebuild 1993 RMD160 75b1f05086cd4c48fad595825c99493c64f7253e SHA1 273ed3238943edcabf364075e175ebec9afd591d SHA256 088515b2eedc9b708cbc90cf9eff3b1597e6514ab0fc1d6c412518c170949051
-MISC ChangeLog 16332 RMD160 e6f0c4a06777ecbc839fbe82b3e7ae3b76d52b97 SHA1 aae1f9b6e500af1d09fe1c071f33839ecb2b3e40 SHA256 3f44053a4c24fffe9ffa0839b8afe9e26ce355ddd991647ad0c56e6131d659ea
-MISC metadata.xml 234 RMD160 afe6939b1787409c4946aa2fad554d1eb9edfc66 SHA1 91fd230154e1eb9712e8345f24cf3595a247b3a0 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799
+AUX ardour-2.8.11-flags.patch 926 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304 SHA512 fbce5a750aad9eb2ffb1546a61b247bd39ffd37f757cdd545c319bbe427a2077a7334ff9171bc40d32ed0c0c25ac4ff170da159f0628ab4af6976127dcf70499 WHIRLPOOL e887017f5c64d60cba6eb88122ad8e5ef12c177973a0991e66249a3a880a838788398f35f9c35c6ee77277bb5fa4dcc39508dcb5b67f68bc45b480955d72f0ca
+AUX ardour-2.8.11-soundtouch.patch 710 SHA256 4e62791188a3435b69ef0b679a80de880b4156f690f59acb2ee9b23053e0752e SHA512 1cb007d87b5f0c4439a3ec70ec4b8b9f3b5b672cd3651308d55d29aebe22569869b6ba6499c18f0d6446443f5dbeb713a9b3d4668f246b6febe2fb86e9c7cf08 WHIRLPOOL 7de68a204db648469c2cf1dcfff10f7d2800c0b02157bafda0c9e5aa83c250bd6b2c065a51d2db887b9f6fe4a3b47c460066e75ac9815644fba9cef168475bee
+AUX ardour-2.8.12-gcc47.patch 181 SHA256 bc854c1e6efb100c3a21346fa0bb1f9dbf6cf50bd62010fd903c61bd42d67bee SHA512 53d6d2a125db9c8ea39bc32f714c17023dbf5d31a12e5418f0db0af7d2f04100101007557257e1a6651039d0dcbe89abc371ee1eb4a14d284dc017a82f0eb245 WHIRLPOOL e4170428eae93caabbc1d005cd5b722d77b95ac3e855cf2a62a1342f29cf6065af502198c882d6eed6fc4460df9662ce189fa0aff789208d4543483395af03e3
+AUX ardour-2.8.12-syslibs.patch 3800 SHA256 badff28ce208ad42caf5b0dd1abb66705048d463974f3cb3eebf8d6225b5c07d SHA512 d747a100086babf9f663b85ffc0525bb6b13168e69215a2b9faa9e243e1308046722748c96da4b3ce348bef233688243b1ec8aba80c0710b67ac1c1aadc6b328 WHIRLPOOL 5c348e0776cdc278358f47334920829fa3cf238593ac37c98e48e13d6a0f64368114ac386a13d61706652e9fa381f83771c89980f8103651a3e6b4363ee116b8
+AUX ardour-2.8.14-syslibs.patch 3766 SHA256 44ad92ade9e0e06bf557b52ade3e20a9bb2631846efb08a84b40a92a81b3dcdc SHA512 16d1d37ea3474d0d393839d0e815096094fb3d5a914ccd041154cee11a627f7c236f070aff2379b1b4098b4da3909f0434aaa3ab52c9ac3be1ff7c8e6d3468eb WHIRLPOOL 28ded8c29de811b4dbcd6f3659d8787ec81d29718194d9877aebd9d25c06aae7dedf9530028cc410e03dc49b0fe4c1424d6e08a4064874e199263093bd76e23d
+DIST ardour-2.8.12.tar.bz2 3397775 SHA256 f51514910f7734823a13b35823bbdc9d709252bad65c65b34c17efe1d3975be4
+DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe SHA512 0d861cfe99645ff5f7847b5e3296a1dfb6d8f15e8686ac79819b114843988b669b117bcfce89a77435d7af252b50bbfa790eb206f69dfff39f7c97126cf26540 WHIRLPOOL 75382e17152d7eea18820f7e72fff2f29553edfd4e15609f73842411edf5605d1ca2a2a8497e08747f5c210393822dc32a1b90e72cdff9774ab4c2a060de6073
+EBUILD ardour-2.8.12.ebuild 1993 SHA256 088515b2eedc9b708cbc90cf9eff3b1597e6514ab0fc1d6c412518c170949051 SHA512 23e9c2e61efd73715e9db44d572f48d8a6eb95ff56be1d4276277ec3dc82247e628f675bcf84a9bc6c6eb8b35740ac4923624f86a4a6226770147f538d2d747a WHIRLPOOL 8fca9d6885ba7a6fcc4118eda065ebb92983f87b7f2592cf0e6d208fc105b2b607f7647c0c3c01802e51ef3cb1008d54922c1c2e78036678da0ddec659c21b83
+EBUILD ardour-2.8.14.ebuild 1910 SHA256 9e1223e4c42ac1b9d6d7ec93b13b4c8f3a36f3a3f468862e3391423e6c6febdf SHA512 0a3570d91464b602e387f7131741a2f5501eb9f506ff8711f7f99e4949b3f54d551bef201edd27af89eb7853262421e6bda249f446e0838ea132905b0116a054 WHIRLPOOL da8af66033b66133a9c03b2bc2942163331c19db1c8adf2af96c61fd2c1239b44d1b8cdf88721c602efbf3cdad4b3db43ca4adc62e4f1f3953f451340f536199
+MISC ChangeLog 16557 SHA256 237deaf3209c7e08ce63d0426a0106c7f30e175d93741200d1a4d4d2688b2afc SHA512 192e1e9d1db455d265490c7a075bf083257ecfc271885ad6f364c88e005816fefee1572de769826be7cdf07f9f53a84298ad2ea9627d9669cf6546f319c7d7f0 WHIRLPOOL dd77c3a7b8cc63803f06277e5d384b788d68a4893ddf96e7039b2bf20c0749ab7be1639364141a836fa1b0fd53fbbb9175d4c9c57bc1893a23968443e8c2536c
+MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPx4qyAAoJEEqz6FtPBkyjQYQIALqkWtV/d/qZM8rd1xjSyMYr
-WK066RCXIj9mnK+e5ulE+j/pOIHZ7UqypL5E1uLhwEZv9JFlah31lNahnTZIJiDH
-OZOjTYV8Z0497jppl9SMTulvdawe85MoNihJ06rIWq4VIwV0zNDSADuMZhbr5XGG
-eeLnqAS/uicBzUBEG27y4vVl94p/WWgqWNIXGuqyHsrlWLYAVd7MUoDJ321jEg9B
-1u0Z3pHF5XYPQFbvnYF+n9iYBLQntuZCGVzPQJ+wOa/Czi5CAWQKGwWYqWkr+yhD
-HbNlXmhFhzEL6aMxiddlC/mgyBoHp2A80pZdlkTLz+gse5ycQByEXynrrviuHlg=
-=KmR2
+iEYEAREIAAYFAlCsV0EACgkQakKUmsHeVLISgACfdEAxE+aN4qjMfkiReDMgpxB/
+93MAn0b3FPrWFFgHzZmqmiMDkDVnlNx1
+=TIKr
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.8.14.ebuild b/media-sound/ardour/ardour-2.8.14.ebuild
new file mode 100644
index 000000000000..4e184278da74
--- /dev/null
+++ b/media-sound/ardour/ardour-2.8.14.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.14.ebuild,v 1.1 2012/11/20 20:30:19 nativemad Exp $
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs scons-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="altivec curl debug nls lv2 sse"
+
+RDEPEND="media-libs/aubio
+	media-libs/liblo
+	lv2? ( >=media-libs/slv2-0.6.1 )
+	sci-libs/fftw:3.0
+	media-libs/freetype:2
+	>=dev-libs/glib-2.10.1:2
+	dev-cpp/glibmm:2
+	>=x11-libs/gtk+-2.8.1:2
+	>=dev-libs/libxml2-2.6:2
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/flac
+	media-libs/raptor:2
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-sound/jack-audio-connection-kit-0.120
+	>=gnome-base/libgnomecanvas-2
+	media-libs/vamp-plugin-sdk
+	dev-libs/libxslt
+	dev-libs/libsigc++:2
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	media-libs/alsa-lib
+	x11-libs/pango
+	x11-libs/cairo
+	media-libs/libart_lgpl
+	virtual/libusb:0
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.8.11-flags.patch \
+		"${FILESDIR}"/${P}-syslibs.patch
+}
+
+src_compile() {
+	local FPU_OPTIMIZATION=$($(use altivec || use sse) && echo 1 || echo 0)
+	tc-export CC CXX
+	mkdir -p "${D}"
+
+	escons \
+		DESTDIR="${D}" \
+		FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
+		PREFIX=/usr \
+		SYSLIBS=1 \
+		$(use_scons curl FREESOUND) \
+		$(use_scons debug DEBUG) \
+		$(use_scons nls NLS) \
+		$(use_scons lv2 LV2)
+}
+
+src_install() {
+	escons install
+	doman ${PN}.1
+	newicon icons/icon/ardour_icon_mac.png ${PN}.png
+	make_desktop_entry ardour2 ardour AudioVideo
+}
diff --git a/media-sound/ardour/files/ardour-2.8.14-syslibs.patch b/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
new file mode 100644
index 000000000000..a06c3b04e276
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
@@ -0,0 +1,108 @@
+--- SConstruct
++++ SConstruct
+@@ -891,39 +891,6 @@
+ 
+ 
+ #
+-# these are part of the Ardour source tree because they are C++
+-# 
+-
+-libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
+-                                 LIBPATH='#libs/vamp-sdk',
+-                                 CPPPATH='#libs/vamp-sdk')
+-libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
+-                                 LIBPATH='#libs/vamp-sdk',
+-                                 CPPPATH='#libs/vamp-sdk')
+-
+-env['RUBBERBAND'] = False
+-
+-conf = Configure (env)
+-
+-if conf.CheckHeader ('fftw3.h'):
+-    env['RUBBERBAND'] = True
+-    libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
+-                                           LIBPATH='#libs/rubberband',
+-                                           CPPPATH='#libs/rubberband',
+-                                           CCFLAGS='-DUSE_RUBBERBAND')
+-else:
+-    print ""
+-    print "-------------------------------------------------------------------------"
+-    print "You do not have the FFTW single-precision development package installed."
+-    print "This prevents Ardour from using the Rubberband library for timestretching"
+-    print "and pitchshifting. It will fall back on SoundTouch for timestretch, and "
+-    print "pitchshifting will not be available."
+-    print "-------------------------------------------------------------------------"
+-    print ""
+-
+-conf.Finish()
+-
+-#
+ # Check for libusb
+ 
+ libraries['usb'] = LibraryInfo ()
+@@ -1109,10 +1076,22 @@
+     # Comment the previous line and uncomment this for old versions of Debian:
+     #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+ 
+-    libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
+-                                            LIBPATH='#libs/appleutility',
+-                                            CPPPATH='#libs/appleutility')
++    #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
++    #                                        LIBPATH='#libs/appleutility',
++    #                                        CPPPATH='#libs/appleutility')
+     
++    env['RUBBERBAND'] = True
++    env.Append (CXXFLAGS="-DUSE_RUBBERBAND")
++    libraries['rubberband'] = LibraryInfo()
++    libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband')
++
++    libraries['vamp-sdk'] = LibraryInfo()
++    libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
++    libraries['vamp'] = LibraryInfo()
++    libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
++    libraries['vamphost'] = LibraryInfo()
++    libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk')
++
+     coredirs = [
+         'templates',
+         'manual'
+@@ -1122,7 +1101,6 @@
+         'libs/pbd',
+         'libs/midi++2',
+         'libs/ardour',
+-        'libs/vamp-sdk',
+         'libs/vamp-plugins/',
+     # these are unconditionally included but have
+     # tests internally to avoid compilation etc
+@@ -1138,8 +1116,7 @@
+     gtk_subdirs = [
+ #        'libs/flowcanvas',
+         'libs/gtkmm2ext',
+-        'gtk2_ardour',
+-        clearlooks_version
++        'gtk2_ardour'
+         ]
+ 
+ else:
+@@ -1251,9 +1228,9 @@
+ # timestretch libraries
+ #
+ 
+-timefx_subdirs = []
+-if env['RUBBERBAND']:
+-    timefx_subdirs += ['libs/rubberband']
++#timefx_subdirs = []
++#if env['RUBBERBAND']:
++#    timefx_subdirs += ['libs/rubberband']
+ 
+ #
+ # Tools
+@@ -1441,7 +1418,7 @@
+ for subdir in coredirs:
+     SConscript (subdir + '/SConscript')
+ 
+-for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
++for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
+     for subdir in sublistdir:
+         SConscript (subdir + '/SConscript')
+