Use raptor2 instead of raptor wrt #375027

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

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index dffa98b797c5b4feac09216eb44232d2cdd9e4f6..f67da903837acb1cf332df806d6c9f73a522e7c3 100644 (file)
--- 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.94 2011/05/01 12:04:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.95 2011/07/29 07:23:17 ssuominen Exp $
+
+*ardour-2.8.11-r20 (29 Jul 2011)
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +ardour-2.8.11-r20.ebuild, +files/ardour-2.8.11-raptor2.patch:
+  Use raptor2 instead of raptor wrt #375027
 
   01 May 2011; Tim Harder <radhermit@gentoo.org> ardour-2.8.11-r1.ebuild:
   Conditionally apply the gcc-4.6 patch (bug #365437).

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 34953494dbce1208d210640b4df9a5e9855f3eee..c2c0cbdf16301cea8ad733cd875d68115f821aec 100644 (file)
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,23 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
 AUX ardour-2.8.11-ldpath.patch 1374 RMD160 8fd64a2b9ada4199c4a54725010160a371d60f56 SHA1 bf588f6c5c74e84f704bccbe6d91e4a93e970ff1 SHA256 b39b71d9f9466632a320c3ad5d85ad2577f2507878bf7f6df564a8d43f66486b
+AUX ardour-2.8.11-raptor2.patch 1907 RMD160 2eaf98541027f4d8959d56029f58df984b327ac6 SHA1 51036e73280cc2cef3d90bbac72b54090f5788fa SHA256 e94b0364680d5fc3b2b960412fc8af3241806a9369fc86fd147438fc836cf23c
 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
 DIST ardour-2.8.11.tar.bz2 3322518 RMD160 e3567d1f5b8d0eb230b86951b7b8653b4344bff8 SHA1 e04f0d9aacd929565386f8027807d881bdf8fca6 SHA256 6a743f42b795bb66179dd467c9b8e417e99d38fa915159155dd582709b563b73
 EBUILD ardour-2.8.11-r1.ebuild 2127 RMD160 00ac467793bffa1ac520e500e4de92bde6d97c41 SHA1 80f76ce509c52ffa53dd3f77d600aa772fb25d4d SHA256 733ae402de100f396095288f2f4634bc378e6300298bb92b57b0565da4e7c715
-MISC ChangeLog 15044 RMD160 85d128b4f22440e0671b64cb273756cdf6fae62e SHA1 08ba6ae4d5040780c84cad11cc065ee3d2b146ea SHA256 7bc013050fc32968f462c229734a4b5a4462bbe06753e54af0a97baba9cda8f7
+EBUILD ardour-2.8.11-r20.ebuild 2166 RMD160 4e853d2e1c052472ac3c0b52ceef860647db5ea0 SHA1 39df2e0c57ff54966e15c5a74f1e80972e61f7f2 SHA256 752909b68fb214e5d2fd3859e48255d7afb74fff89381fbbb2cba152015415a1
+MISC ChangeLog 15242 RMD160 0142ba195487ee451b037a1192b6a8702c8d822f SHA1 0d332cb36dbbe55cb65e023fc4ae2e147659327c SHA256 1793171e54a281ad0a2c41da561fe79b13f3d91672b450bfa51195511b0cfcc1
 MISC metadata.xml 234 RMD160 afe6939b1787409c4946aa2fad554d1eb9edfc66 SHA1 91fd230154e1eb9712e8345f24cf3595a247b3a0 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNvUxFAAoJEEqz6FtPBkyjcQMH/RMJpoZ4nPzLqmTArfG3CLly
-lIp7268Bz9Q7yqlPlOC2+Iy2FW+UGyFvPJEawkEI62U0GTnjSIefsPclVGG1PAy+
-iHrjnrDNxUqL+iL9ePInZUQMeaSVn428au/kjoIZXDnkkiFdrct6B/WkO/Jks3jq
-mJHQgSNsnM2tPhXn1rZVR/UZiylK9cC9NtANqUhyIrePcH/zP4KHJG2pGQkb/TjF
-8FAex72PtIEv6Ot88N5BjgdIQqGqft/FuburZzf/xy/sgmrlHHjGHAxZVKAjX/7j
-8U5uR7DPHDpIm6z1kDesg9AAt/LOqIAS6Pb7xB1IGumJbsupAFLDmA4pzzVqjZI=
-=ZqMh
+iF4EAREIAAYFAk4yX2cACgkQXkR9YqOcLPFM9wD+OGqKRkG1mVz1Y51W/xBg6XBb
+jEYT4vdcqQozvBgUx3MA/iy03NlfHGJe4djBJZTWCTn2jirtK5qKL2XERIzcpKWo
+=ZoMQ
 -----END PGP SIGNATURE-----

diff --git a/media-sound/ardour/ardour-2.8.11-r20.ebuild b/media-sound/ardour/ardour-2.8.11-r20.ebuild
new file mode 100644 (file)
index 0000000..2b9a407
--- /dev/null
+++ b/media-sound/ardour/ardour-2.8.11-r20.ebuild
@@ -0,0 +1,86 @@
+# 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.11-r20.ebuild,v 1.1 2011/07/29 07:23:17 ssuominen 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
+       media-libs/flac
+       media-libs/raptor:2
+       >=media-libs/liblrdf-0.4.0-r20
+       >=media-sound/jack-audio-connection-kit-0.109
+       >=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}"/${P}-flags.patch \
+               "${FILESDIR}"/${P}-syslibs.patch \
+               "${FILESDIR}"/${P}-type.patch \
+               "${FILESDIR}"/${P}-ldpath.patch \
+               "${FILESDIR}"/${P}-raptor2.patch
+
+       if [[ ($(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6) ]]; then
+               epatch "${FILESDIR}"/${P}-gcc46.patch
+       fi
+}
+
+src_compile() {
+       local FPU_OPTIMIZATION=$($(use altivec || use sse) && echo 1 || echo 0)
+       tc-export CC CXX
+       append-cxxflags -D__STDC_FORMAT_MACROS
+       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.11-raptor2.patch b/media-sound/ardour/files/ardour-2.8.11-raptor2.patch
new file mode 100644 (file)
index 0000000..405e1a8
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-raptor2.patch
@@ -0,0 +1,57 @@
+http://projects.archlinux.org/svntogit/packages.git/plain/ardour/trunk/raptor2.patch
+
+--- SConstruct
++++ SConstruct
+@@ -431,7 +431,6 @@
+       'gtk+-2.0'             : '2.8.1',
+       'libxml-2.0'           : '2.6.0',
+       'samplerate'           : '0.1.0',
+-      'raptor'               : '1.4.2',
+       'lrdf'                 : '0.4.0',
+       'jack'                 : '0.109.0',
+       'libgnomecanvas-2.0'   : '2.0',
+@@ -487,7 +486,10 @@
+ 
+ libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
+ 
+-conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } )
++conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists,
++                                       'CheckPKGVersion' : CheckPKGVersion }
++                      )
++                      
+ 
+ if conf.CheckPKGExists ('fftw3f'):
+     libraries['fftw3f'] = LibraryInfo()
+@@ -501,6 +503,22 @@
+     libraries['aubio'] = LibraryInfo()
+     libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio')
+ 
++raptorOK = 0
++
++if conf.CheckPKGExists ('raptor2'):
++    libraries['raptor'] = LibraryInfo()
++    libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2')
++    raptorOK = 1
++else:
++    if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'):
++        libraries['raptor'] = LibraryInfo()
++        libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
++        raptorOK = 1
++            
++if raptorOK == 0:
++    print "Ardour requires either raptor or raptor2 to be available at build time"
++    Exit (1)
++
+ env = conf.Finish ()
+ 
+ if env['FFT_ANALYSIS']:
+@@ -570,9 +588,6 @@
+ libraries['lrdf'] = LibraryInfo()
+ libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
+ 
+-libraries['raptor'] = LibraryInfo()
+-libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor')
+-
+ libraries['sndfile'] = LibraryInfo()
+ libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile')
+