Revision: 1594
Author: gentoid
Date: 2010-03-30 23:41:13 +0200 (Tue, 30 Mar 2010)
Log Message:
-----------
ardour cleanup; ardour-3.9999 compile fix
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/ardour/ChangeLog
trunk/overlays/proaudio/media-sound/ardour/Manifest
trunk/overlays/proaudio/media-sound/ardour/ardour-2.7.1.ebuild
trunk/overlays/proaudio/media-sound/ardour/ardour-2.8.ebuild
trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild
trunk/overlays/proaudio/media-sound/ardour/ardour-3.9999.ebuild
Modified: trunk/overlays/proaudio/media-sound/ardour/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ChangeLog 2010-03-30
21:38:11 UTC (rev 1593)
+++ trunk/overlays/proaudio/media-sound/ardour/ChangeLog 2010-03-30
21:41:13 UTC (rev 1594)
@@ -1,7 +1,11 @@
# ChangeLog for media-sound/ardour
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 30 Mar 2010; Viktor Lazarev <[email protected]> ardour-3.9999.ebuild:
+ added creating libs/ardour/svn_revision.cc file;
+ cleanup
+
10 Sep 2009; Frieder Buerzele <[email protected]
ardour-3.9999.ebuild:
using waf buildsystem
Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest 2010-03-30 21:38:11 UTC
(rev 1593)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest 2010-03-30 21:41:13 UTC
(rev 1594)
@@ -3,9 +3,9 @@
AUX ardour-2.7.1-gcc44.patch 1418 RMD160
e8388a8787f7c0465f6a2c4a99fc2ae4f2cf0974 SHA1
9d603ad7106b41fb0455dd874a83ed1dcb351df9 SHA256
4473008fcec6d619301202ff6d12024eb08653e54986c42dbeba57e581e88944
DIST ardour-2.7.1.tar.bz2 3313029 RMD160
7488169a28610550a93b700dd7949b8ffad2431e SHA1
3e8a6425bcfe5efbba0cfba44f0f63799e735cdb SHA256
102b99716ea99bbe66ad57abd1a1bf39d904068e76cb222d68f7acb78c63c864
DIST ardour-2.8.tar.bz2 3382438 RMD160
1d3f8e0ad79f0945bb52ae1760cbf2d78d38cffc SHA1
8cdd68e4dc3b7fcabb9b1ea1f59791932ca6281c SHA256
1d12b41c2b07119f4df8e1deda03990f74d2972ee23ba7a87abcb9c5818bb868
-EBUILD ardour-2.7.1.ebuild 3206 RMD160
1df9aacd1eda1bd1266210701a69c5f3eac60c42 SHA1
eb7a7c33bad5ce557bb81e31995d3a895ff740a1 SHA256
416bba9a3b5b6033a418af0f9c30d8bd9965062cb3c4e7c85bb4c967ceb613af
-EBUILD ardour-2.8.ebuild 3830 RMD160 4e87d3de3bff7dd6c8b4652817a9580c34101381
SHA1 9d0c675362dabb9b0bce072931d6af6666966d75 SHA256
bf7c1bbcf4a5fdd7024882d18f4eced45128e8ad63b41ead4bdbc56ee40718e4
-EBUILD ardour-2.9999.ebuild 3931 RMD160
a53e1dca55bde27464ca800df020640fcbbabd69 SHA1
aa9450d83ef2a8c09a48099631e98d482c3f20c8 SHA256
93ae78a88fd5b6071c14c5964e8cbeb0bc896237a7053f5955c34eb21bc28869
-EBUILD ardour-3.9999.ebuild 3329 RMD160
65d423d2a16cccc7868c17e271798c150328c91f SHA1
9c999278fe9edb105142c5ee29c3e9be820f9d3c SHA256
842c96dad9f82ce8437cd4ac4aa66d01b815e04bde6d1e92343fcd1d5126fa9e
-MISC ChangeLog 3403 RMD160 8ef5afc8a0796b8995819f27eb22a51d8e4909a1 SHA1
9f9316dc63dd435f72614454313863976de10694 SHA256
1f8632c6b4867909785417f7edf90d16c5c56c2b3b00bbcdc8409d42db258df7
+EBUILD ardour-2.7.1.ebuild 3206 RMD160
0309cd32170fd31e4af776fa2655587ac6064f89 SHA1
508dba6005e2f7d340a19ed1afa2046d5cacb9c4 SHA256
fcab5bcc6db5ebe334714393ab05127e142dcdf520851d7c431cb6a14731efd3
+EBUILD ardour-2.8.ebuild 3831 RMD160 6e13907b11c843516da1b7480656e28d477740cb
SHA1 e237163521f9347a0560411b3e860a6cb2d7c463 SHA256
8ccdab877de5afe88d8858c06db525c8d63c49007eaa5435acba400493d89d12
+EBUILD ardour-2.9999.ebuild 3935 RMD160
63fd77a7e0658baa3027a87b2f3a7596fc56020a SHA1
4253bd34357ebad20d77cefac97d56f4805e767c SHA256
6452484e2176917f1de6c97838d3df6e44fb1b877f05ec59f13a58b8436543a4
+EBUILD ardour-3.9999.ebuild 3483 RMD160
d25128f34596f813d20cd8a0f0d9b1e9ae4f5764 SHA1
2c993d1b5ae6701d48397fe79c5f51acf54863af SHA256
8f44311ec4b0472bed3ade0c054d06723a1f1aa2f41ff56ed7328532e16095ca
+MISC ChangeLog 3541 RMD160 aec70f2a8997be667d6aeddbc64ecda16ea0751e SHA1
c6026c7010a050545762a353d0315f5110257c13 SHA256
35cba2542973a9402e0093e5affa9f1de59808291112d2364062056ada869568
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.7.1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.7.1.ebuild
2010-03-30 21:38:11 UTC (rev 1593)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.7.1.ebuild
2010-03-30 21:41:13 UTC (rev 1594)
@@ -1,4 +1,4 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.7.1.ebuild,v
1.1 2008/12/08 09:15:40 aballier Exp $
Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.8.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.8.ebuild
2010-03-30 21:38:11 UTC (rev 1593)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.8.ebuild
2010-03-30 21:41:13 UTC (rev 1594)
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -11,7 +11,6 @@
SRC_URI="http://ardour.org/files/releases/${P/_p/-}.tar.bz2";
-
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
@@ -54,7 +53,6 @@
S=${WORKDIR}/${P%_p*}
-
pkg_setup(){
einfo "this ebuild fetches from the svn maintaince"
einfo "ardour-2.X branch"
@@ -88,7 +86,7 @@
src_compile() {
# Required for scons to "see" intermediate install location
- mkdir -p ${D}
+ mkdir -p "${D}"
local myconf=""
(use sse || use altivec) && myconf="FPU_OPTIMIZATION=1"
@@ -104,7 +102,7 @@
myconf="${myconf} DESTDIR=${D} PREFIX=/usr KSI=0"
einfo "scons configure options : \"${myconf}\""
- cd ${S}
+ cd "${S}"
scons ${myconf} ${MAKEOPTS} || die "compilation failed"
}
@@ -123,7 +121,7 @@
pkg_postinst() {
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
-
+
ewarn "---------------- WARNING -------------------"
ewarn ""
ewarn "MAKE BACKUPS OF THE SESSION FILES BEFORE TRYING THIS VERSION."
Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild
2010-03-30 21:38:11 UTC (rev 1593)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild
2010-03-30 21:41:13 UTC (rev 1594)
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -77,7 +77,7 @@
src_unpack(){
# abort if user answers no to distribution of vst enabled binaries
- if use vst; then
+ if use vst; then
agree_vst || die "you can not distribute ardour with vst
support"
fi
subversion_src_unpack
@@ -86,7 +86,7 @@
mkdir -p "${S}"
cp -R "${ESVN_WC_PATH}"/* "${S}"
cp -R "${ESVN_WC_PATH}"/.* "${S}"
- cd ${S}
+ cd "${S}"
# hack to use the sys-lib for sndlib also
# use sys-libs && epatch "${FILESDIR}/ardour-2.0.3-sndfile-external.patch"
@@ -98,7 +98,7 @@
src_compile() {
# Required for scons to "see" intermediate install location
- mkdir -p ${D}
+ mkdir -p "${D}"
local myconf=""
(use sse || use altivec) && myconf="FPU_OPTIMIZATION=1"
@@ -114,7 +114,7 @@
myconf="${myconf} DESTDIR=${D} PREFIX=/usr KSI=0"
einfo "${myconf}"
- cd ${S}
+ cd "${S}"
scons ${myconf} ${MAKEOPTS} || die "compilation failed"
}
@@ -133,7 +133,7 @@
pkg_postinst() {
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
-
+
ewarn "---------------- WARNING -------------------"
ewarn ""
ewarn "MAKE BACKUPS OF THE SESSION FILES BEFORE TRYING THIS VERSION."
Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-3.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-3.9999.ebuild
2010-03-30 21:38:11 UTC (rev 1593)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-3.9999.ebuild
2010-03-30 21:41:13 UTC (rev 1594)
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -11,7 +11,6 @@
ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/branches/3.0";
-
LICENSE="GPL-2"
SLOT="3"
KEYWORDS=""
@@ -57,9 +56,10 @@
cd "${S}"
# get the svn revision
subversion_wc_info
- echo $ESVN_WC_REVISION > libs/ardour/svn_revision.cc
+ echo '#include "ardour/svn_revision.h"' > libs/ardour/svn_revision.cc
+ echo "namespace ARDOUR { const char*
svn_revision=\"$ESVN_WC_REVISION\"; }" >> libs/ardour/svn_revision.cc
+ echo >> libs/ardour/svn_revision.cc
-
## # some temporary slotting fixes
## sed -i -e 's:ardour2:ardour3:' \
## libs/rubberband/SConscript \
@@ -71,10 +71,10 @@
## sed -e "s:'share', 'locale':'share', 'ardour3', 'locale':" \
## -i libs/ardour/SConscript
}
-
+
src_compile() {
- local myconf="--freedesktop --prefix=/usr --aubio"
+ local myconf="--freedesktop --prefix=/usr"
use debug && myconf="$myconf --debug"
use nls && myconf="$myconf --nls"
use lv2 && myconf="$myconf --lv2"
@@ -89,7 +89,7 @@
einfo "./waf $myconf" # show configure options
./waf configure $myconf || die "failed to configure"
- ./waf build ${MAKEOPTS} || die "failed to build"
+ ./waf build ${MAKEOPTS/-s/} || die "failed to build"
}
src_install() {
@@ -110,7 +110,7 @@
pkg_postinst() {
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
-
+
ewarn "---------------- WARNING -------------------"
ewarn ""
ewarn "MAKE BACKUPS OF THE SESSION FILES BEFORE TRYING THIS VERSION."
