Version bump.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 206 insertions, 6 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index c8f43231bcaa..017523829eb0 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.97 2011/09/11 19:35:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.98 2011/09/28 19:21:13 ssuominen Exp $
+
+*ardour-2.8.12 (28 Sep 2011)
+
+  28 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> +ardour-2.8.12.ebuild,
+  +files/ardour-2.8.12-syslibs.patch:
+  Version bump.
 
   11 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -ardour-2.8.11-r1.ebuild:
   [This is a placeholder. Please ignore.]
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 96f7361bb54f..0a594c13e718 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX ardour-2.8.11-flags.patch 926 RMD160 34041cec7cfc8129a9ac2317b4503012597b3c32 SHA1 abf40321d624e54b19f0b1c3ade462470d9167b1 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304
 AUX ardour-2.8.11-gcc46.patch 733 RMD160 5cd27f140f4472dbb4075f879e0d625741ec45cc SHA1 1020199bd01e1569d93ac7dac9b98cc2e4bf4b84 SHA256 dcb04ef9b313f78b5bd08b585c22c429967d54e0fb776381e823a53568d12c9e
@@ -8,14 +8,21 @@ AUX ardour-2.8.11-raptor2.patch 1907 RMD160 2eaf98541027f4d8959d56029f58df984b32
 AUX ardour-2.8.11-soundtouch.patch 710 RMD160 af40c5ef37ebef6f924fd4560f54f43cf31ecfc8 SHA1 ae729d0332d7fd486b13bd2dacfe95e9f9f0d7a5 SHA256 4e62791188a3435b69ef0b679a80de880b4156f690f59acb2ee9b23053e0752e
 AUX ardour-2.8.11-syslibs.patch 3855 RMD160 38cc2928697d2d3b55a1fa725d401571fc78a0ff SHA1 0eface5e152ecc4913b0e1d28fb22f0804c2919c SHA256 2d528d26fec29288ccb130eadda8816c781b921d922b7d948791b407623154ef
 AUX ardour-2.8.11-type.patch 311 RMD160 a9305313e02f26be3433396b10c9f58d92bb9133 SHA1 8d23326758377229df2194a3e1cb8ea84477c2c9 SHA256 53dc7f5066cfe51c3a390e0c902d6d4590b07d49a20630be105e20c10fece24d
+AUX ardour-2.8.12-syslibs.patch 3800 RMD160 0b95f55ddb3c071ff96cde430d0e27c431e7026e SHA1 71325836029b1ba99cb453f50aadb20f52771ce4 SHA256 badff28ce208ad42caf5b0dd1abb66705048d463974f3cb3eebf8d6225b5c07d
 DIST ardour-2.8.11.tar.bz2 3322518 RMD160 e3567d1f5b8d0eb230b86951b7b8653b4344bff8 SHA1 e04f0d9aacd929565386f8027807d881bdf8fca6 SHA256 6a743f42b795bb66179dd467c9b8e417e99d38fa915159155dd582709b563b73
+DIST ardour-2.8.12.tar.bz2 3397775 RMD160 7e26f4c953ec5b6f9a243f79bc5f8b5294c426b9 SHA1 bca81cac38f5c603472c9bd33f5d4d4094e5ca14 SHA256 f51514910f7734823a13b35823bbdc9d709252bad65c65b34c17efe1d3975be4
 EBUILD ardour-2.8.11-r20.ebuild 2213 RMD160 73470dc36b2ba8f00256687dca10c24ccd92a706 SHA1 b7d2b76a6a8e30ccd9d2ca8c2195d380dc0fbba1 SHA256 4a6865985b0c7654514db74165ba85b37b96731fdb721f26117f52ec3b912a7d
-MISC ChangeLog 15523 RMD160 99250c1ee12b35b9f2b2584d325178c74fd0da2e SHA1 438a6817572bb15694cb4f9fc1c3096f8ec41a6e SHA256 6a5868291c44af197cdaf01e4aff39a77904be8b4158b7eebeed4cc80857ca62
+EBUILD ardour-2.8.12.ebuild 1979 RMD160 4c9c0de3ca41c4809af3c5b07fb7d96b39ea759c SHA1 2ba3936bc1504a5c319cc8b3811655d2bc6d003a SHA256 81fd9047ecbdd8927660c61fdfd20bf23ff76af8cd98e8dea70bbef64c3b2515
+MISC ChangeLog 15685 RMD160 7b7881418b9f719f68623f909a03d3c1e174def8 SHA1 99e7fe12b0159ccd0de0ee0e67c7c6cf621a27f0 SHA256 0539ef01d325a40d539d17caabcf3ce03196f4adade0fa514a8ff7a5261d8742
 MISC metadata.xml 234 RMD160 afe6939b1787409c4946aa2fad554d1eb9edfc66 SHA1 91fd230154e1eb9712e8345f24cf3595a247b3a0 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5tDacACgkQXkR9YqOcLPHcOQD8CZac1Ea1Ftxqk+DWbMPcZWSV
-k1IE4Q3jFhGc5QAcq5EA/0ZsHywMsawBQn0fpCxC/A8on1f/t9xmJNXTKMtwnMLt
-=/OOa
+iQEcBAEBAgAGBQJOg3PUAAoJEEdUh39IaPFNmoIH/jdnViFd9/tRpsn28LFX7J8b
+qbk8N/h4QAbz7Oxs3+9zpBaiuWPtpAzwvGfgf5ARb5BiiR+MS/jlJDlqZExRHAJQ
+DUuSpElX3qaDPHuAxypFGLav+F6xbYNue5Ra1v25ac3hq/gx6GAGz6EgebjNKyF9
+M4OFPONRvvWt/1xEGBuHjz48uXjgA5vXWWxmBlqNMpwgCNGjaAcEgwEr6QQJTqO/
+RkHRyLgIuJxjRoBEYgK9waGFTBZJY1S8gbYigPd+fOxpVbJ7aA0w64iamgkoTo3q
+9UOdy1EGDwwuDsbZFyxwycKWi7ZLQeXzZEkGx4agiRiqycM9uZ7duqvSzhngriU=
+=11qB
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.8.12.ebuild b/media-sound/ardour/ardour-2.8.12.ebuild
new file mode 100644
index 000000000000..3d94d33dbc79
--- /dev/null
+++ b/media-sound/ardour/ardour-2.8.12.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.12.ebuild,v 1.1 2011/09/28 19:21:13 ssuominen Exp $
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs scons-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="ftp://ftp.archlinux.org/other/${PN}/${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
+	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.8.11-flags.patch \
+		"${FILESDIR}"/${P}-syslibs.patch \
+		"${FILESDIR}"/${PN}-2.8.11-soundtouch.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.12-syslibs.patch b/media-sound/ardour/files/ardour-2.8.12-syslibs.patch
new file mode 100644
index 000000000000..46292a8dcb42
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.12-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 = ['libs/soundtouch']
+-if env['RUBBERBAND']:
+-    timefx_subdirs += ['libs/rubberband']
++#timefx_subdirs = ['libs/soundtouch']
++#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')
+