Revision: 1517
Author:   evermind
Date:     2009-09-10 11:43:55 +0200 (Thu, 10 Sep 2009)
Log Message:
-----------
updated ardour-3.9999 svn ebuild to use waf (not tested)

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ardour/ChangeLog
    trunk/overlays/proaudio/media-sound/ardour/Manifest
    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        2009-09-07 
18:41:50 UTC (rev 1516)
+++ trunk/overlays/proaudio/media-sound/ardour/ChangeLog        2009-09-10 
09:43:55 UTC (rev 1517)
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Sep 2009; Frieder Buerzele <[email protected]
+  ardour-3.9999.ebuild:
+  using waf buildsystem
+
   04 Aug 2009; Dominique Michel <[email protected]>;
   * Removed midi USE check from alsa-lib depend into all the ebuilds
   * Commented out sndfile patch into ardour-2.9999

Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest 2009-09-07 18:41:50 UTC 
(rev 1516)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest 2009-09-10 09:43:55 UTC 
(rev 1517)
@@ -5,6 +5,6 @@
 EBUILD ardour-2.7.1.ebuild 3160 RMD160 
3ee46ddcf79ac51d327b6ef1d88dbeab5071e78b SHA1 
0b5b01922183285272d962572dfdf60698398470 SHA256 
4bf137925aa7b4952e0cf39573dfa32b7f41c5880a8e3f270c9b83131dd53691
 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 3182 RMD160 
73d72733d3447eae60aac78c9c2d087c468065fe SHA1 
f4cdeb781335805dda0890c278620917ff771884 SHA256 
e7ad404b8a45803680e02526cb075ac043cefab87ad192166c1c4a8a5cce2b85
-MISC ChangeLog 3298 RMD160 c62fc95e9ecf0ceaa921f79cbeb395d6f4401d2c SHA1 
c2aa10b6aae95169354b6ae0a9b8de71fdf3e41d SHA256 
35d705c7e4f69f2cbafa7badd185538a1676bf6db1cba628037820a82bbd71c8
+EBUILD ardour-3.9999.ebuild 3329 RMD160 
65d423d2a16cccc7868c17e271798c150328c91f SHA1 
9c999278fe9edb105142c5ee29c3e9be820f9d3c SHA256 
842c96dad9f82ce8437cd4ac4aa66d01b815e04bde6d1e92343fcd1d5126fa9e
+MISC ChangeLog 3403 RMD160 8ef5afc8a0796b8995819f27eb22a51d8e4909a1 SHA1 
9f9316dc63dd435f72614454313863976de10694 SHA256 
1f8632c6b4867909785417f7edf90d16c5c56c2b3b00bbcdc8409d42db258df7
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/ardour/ardour-3.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-3.9999.ebuild     
2009-09-07 18:41:50 UTC (rev 1516)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-3.9999.ebuild     
2009-09-10 09:43:55 UTC (rev 1517)
@@ -15,7 +15,7 @@
 LICENSE="GPL-2"
 SLOT="3"
 KEYWORDS=""
-IUSE="altivec debug freesound nls sse lv2 vst sys-libs"
+IUSE="altivec debug freesound nls sse lv2 vst sys-libs tranzport wiimote"
 
 RDEPEND="media-libs/liblo
        >=media-libs/taglib-1.5
@@ -23,7 +23,7 @@
        >=media-libs/liblrdf-0.4.0
        >=media-libs/raptor-1.4.2
        >=media-sound/jack-audio-connection-kit-0.116.2
-       >=dev-libs/glib-2.10.3
+       >=dev-libs/glib-2.2
        x11-libs/pango
        >=x11-libs/gtk+-2.8.8
        media-libs/flac
@@ -55,54 +55,56 @@
 src_unpack() {
        subversion_src_unpack
        cd "${S}"
+       # get the svn revision
+       subversion_wc_info
+       echo $ESVN_WC_REVISION > libs/ardour/svn_revision.cc
 
-       # some temporary slotting fixes
-       sed -i -e 's:ardour2:ardour3:' \
-               libs/rubberband/SConscript \
-               libs/clearlooks-older/SConscript \
-               || die
-               # now it gets dirty... the locale files...
-       sed -e "s:share/locale:share/ardour3/locale:" \
-               -i SConstruct gtk2_ardour/SConscript || die
-       sed -e "s:'share', 'locale':'share', 'ardour3', 'locale':" \
-               -i libs/ardour/SConscript
+
+##     # some temporary slotting fixes
+##     sed -i -e 's:ardour2:ardour3:' \
+##             libs/rubberband/SConscript \
+##             libs/clearlooks-older/SConscript \
+##             || die
+##             # now it gets dirty... the locale files...
+##     sed -e "s:share/locale:share/ardour3/locale:" \
+##             -i SConstruct gtk2_ardour/SConscript || die
+##     sed -e "s:'share', 'locale':'share', 'ardour3', 'locale':" \
+##             -i libs/ardour/SConscript
 }
        
 src_compile() {
-       # Required for scons to "see" intermediate install location
-       mkdir -p ${D}
 
-       local myconf=""
-       (use sse || use altivec) && myconf="FPU_OPTIMIZATION=1"
-       ! use altivec; myconf="${myconf} ALTIVEC=$?"
-       ! use debug; myconf="${myconf} ARDOUR_DEBUG=$?"
-       ! use nls; myconf="${myconf} NLS=$?"
-       ! use vst; myconf="${myconf} VST=$?"
-       ! use sys-libs; myconf="${myconf} SYSLIBS=$?"
-       ! use sse; myconf="${myconf} USE_SSE_EVERYWHERE=$? 
BUILD_SSE_OPTIMIZATIONS=$?"
-       ! use lv2; myconf="${myconf} LV2=$?"
+       local myconf="--freedesktop --prefix=/usr --aubio"
+               use debug     && myconf="$myconf --debug"
+               use nls       && myconf="$myconf --nls"
+               use lv2       && myconf="$myconf --lv2"
+               use sys-libs  && myconf="$myconf --syslibs"
+               use tranzport && myconf="$myconf --tranzport"
+               use freesound && myconf="$myconf --freesound"
+               use wiimote   && myconf="$myconf --wiimote"
+               use vst       && myconf="$myconf --vst"
+       if use sse || use altivec ;then
+               myconf="$myconf --fpu-optimization"
+       fi
 
-       # static settings
-       myconf="${myconf} DESTDIR=${D} PREFIX=/usr KSI=0"
-       einfo "${myconf}"
-
-       cd ${S}
-       scons ${myconf} ${MAKEOPTS} || die "compilation failed"
+       einfo "./waf $myconf" # show configure options
+       ./waf configure $myconf || die "failed to configure"
+       ./waf build ${MAKEOPTS} || die "failed to build"
 }
 
 src_install() {
-       scons install || die "make install failed"
-       if use vst;then
-               mv "${D}"/usr/bin/ardourvst "${D}"/usr/bin/ardour2
-       fi
+       ./waf --destdir="${D}" install || die "install failed"
+       #if use vst;then
+       #       mv "${D}"/usr/bin/ardourvst "${D}"/usr/bin/ardour2
+       #fi
 
        dodoc DOCUMENTATION/*
 
-       newicon "icons/icon/ardour_icon_tango_48px_blue.png" "ardour3.png"
-       make_desktop_entry "ardour3" "Ardour3" "ardour3" "AudioVideo;Audio"
+       #newicon "icons/icon/ardour_icon_tango_48px_blue.png" "ardour3.png"
+       #make_desktop_entry "ardour3" "Ardour3" "ardour3" "AudioVideo;Audio"
 
        # fix wrapper
-       sed -i -e 's:ardour2:ardour3:g' ${D}/usr/bin/ardour3 || die
+       #sed -i -e 's:ardour2:ardour3:g' ${D}/usr/bin/ardour3 || die
 }
 
 pkg_postinst() {

Reply via email to