| [proaudio] [1150] ardour: rename 2.0.9992/2.1.9999 to 2.9999 to avoid weird unmasking |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 1150
Author: gimpel
Date: 2008-02-07 14:48:32 +0000 (Thu, 07 Feb 2008)
Log Message:
-----------
ardour: rename 2.0.9992/2.1.9999 to 2.9999 to avoid weird unmasking
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/ardour/ChangeLog
trunk/overlays/proaudio/media-sound/ardour/Manifest
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild
trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild
trunk/overlays/proaudio/media-sound/ardour/files/ardour-syslib_mod2.patch
Modified: trunk/overlays/proaudio/media-sound/ardour/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ChangeLog 2008-02-05 21:42:14 UTC (rev 1149)
+++ trunk/overlays/proaudio/media-sound/ardour/ChangeLog 2008-02-07 14:48:32 UTC (rev 1150)
@@ -2,6 +2,11 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Feb 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+ -files/ardour-syslib_mod2.patch, -ardour-2.0.99992.ebuild,
+ -ardour-2.1.9999.ebuild, +ardour-2.9999.ebuild:
+ rename 2.1.9999 to 2.9999 to avoid weird unmasking
+
12 Jan 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx> +ardour-2.2.ebuild:
version bump
Modified: trunk/overlays/proaudio/media-sound/ardour/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/Manifest 2008-02-05 21:42:14 UTC (rev 1149)
+++ trunk/overlays/proaudio/media-sound/ardour/Manifest 2008-02-07 14:48:32 UTC (rev 1150)
@@ -1,14 +1,12 @@
AUX ardour-2.0.3-cflags.patch 1205 RMD160 e7b3c10835fb4228603f3c9455809bfab5847a3e SHA1 22260d62a9ff67baeed07f5fdc6f4dcf95656ddd SHA256 892180ba5e622219def261a647e80f7214bb3f6ce829804a11a25ae57d2ea4be
AUX ardour-2.0.3-sndfile-external.patch 1409 RMD160 cbc6381f17a7978caa56aff0d5e0ce8b64f7161d SHA1 6559d30abdc3a89121097ed2649872806ce4a736 SHA256 71542baed4deeae9505107973361a5aab06f49ceaeb3bf7d2e7c5ffd73cc604d
-AUX ardour-syslib_mod2.patch 5359 RMD160 fde311ad4653c4e053fede1e63cf274d20009680 SHA1 7fbb68b522101c942b26c1c16055a7aed54743e5 SHA256 20326ecf95d15df46ca79d5645975138ec528e5490e5d3e4ecf92ff79dae783f
DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
DIST ardour-2.1.tar.bz2 2788128 RMD160 70796eb07911c5301049fb2d2749cbaa7a04ba4d SHA1 fcfb1230b9e7ec42c0044be89a6e25aa31a75658 SHA256 160482d87d8eb2188481fc42d7f6442efe6bff38544a321a79e2e23a7aa9501b
DIST ardour-2.2.tar.bz2 4296980 RMD160 ec1e00a546b51e3f8fd8afb0b6d661df66862cd1 SHA1 195ba17570102dcb7fb09d40457b4afefbd3e16a SHA256 fc0d405e1e1d31b3e353095db67b7dc874c201ff43954751b72f57ae836799ee
EBUILD ardour-2.0.5.ebuild 3900 RMD160 fbc3280df4a258eb8d5096895d9900fe904ba3dd SHA1 443378b09402874398717f7fa52c1eb01e5f2aad SHA256 8a9746117c71f4b26b500ebd178875e3d8536a125706f6e9a8461b69c4bc8b86
-EBUILD ardour-2.0.99992.ebuild 3644 RMD160 6481af679131df72afa2304fee5de178f8ad1e19 SHA1 871c551a9ef2321a8b991bf40a3f186c3c2a39d8 SHA256 6fd8aae21f956bba91809bf26bf1b9d2cdb60fe9a62c2a81180fbb62af28b2d2
-EBUILD ardour-2.1.9999.ebuild 3655 RMD160 13ccdddb3f4744b7d5aeb4614bab36ae91d91ab7 SHA1 275e8a4a78a7958cf936bc0fab5ed5df3c74cd15 SHA256 f8261fe82754dd8ca5b4cfee417a943e06196eb51e0d653297da2fa03c66b379
EBUILD ardour-2.1.ebuild 4205 RMD160 c1009642cb3ab16b14663fd9903b7f2be417445d SHA1 d51e9d56bd8dfba515ab83bf186225473ba031cc SHA256 8022e867006cf705163b6928c705a010e3dbb75f50f73f271a1191dc34aeca6a
EBUILD ardour-2.2.ebuild 4205 RMD160 74950f3ef10f5330949d7ccb0d13ed287db965aa SHA1 d0fd6eb6b4e4587f11bece468895922e8f270de8 SHA256 906c66c2efb70f1163c84170d530ef8091f8b4cba97a83cf28b32b82243c1aa7
+EBUILD ardour-2.9999.ebuild 3655 RMD160 e196a6e98bebe8d3631b817293e9facbe8e90e8e SHA1 99efefa79210d78500a9f617d3f40a83ac9bbbf0 SHA256 9ff4fb649a1576278b8b89f125a0c3a2270c63b3b0c028293f0d6f86ef645262
EBUILD ardour-99992.ebuild 5122 RMD160 199a759ac74262b96780cf61867b85d13c77b4b3 SHA1 fe87ad7d60b96b85eddf884e7d0d425434e9a8b3 SHA256 594cbd4e091f1c86d50188f5242787a7de6ee198724fd2d3a637c21ba6079365
-MISC ChangeLog 893 RMD160 918cde1f0c083a900f5b2ba4ffd56cf9242d79ef SHA1 c9f6027fd52d81c2c2a0dede62894a138bab7d06 SHA256 2fd493ee6cd1de1eb8f687a5996cc10913f3ce55741e6afe39f030b1fd8e0195
+MISC ChangeLog 1113 RMD160 507827c74710ada50865864f485ae6a67a93ef1d SHA1 ac0f1d5239e07ba1aa34722605445e022b11280a SHA256 f3c57ef25fbfca3ca3af5094b25eddd8c9a152368b29495df0b4066d7a5c9280
MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
Deleted: trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild 2008-02-05 21:42:14 UTC (rev 1149)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.0.99992.ebuild 2008-02-07 14:48:32 UTC (rev 1150)
@@ -1,128 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils fetch-tools scons-ccache subversion vst
-
-ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/branches/2.0-ongoing";
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.org/";
-SRC_URI=""
-URL="http://ardour.org/files/releases/${PN}.tar.bz2";
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls debug sse altivec vst sys-libs"
-
-RDEPEND=">=media-libs/liblrdf-0.4.0
- >=media-libs/raptor-1.2.0
- >=media-libs/libart_lgpl-2.3.16
- >=media-libs/ladspa-sdk-1.12
- >=media-libs/libsamplerate-0.0.14
- media-libs/liblo
- >=dev-libs/libxml2-2.5.7
- dev-libs/libxslt
- >=dev-libs/glib-2.10
- >=x11-libs/gtk+-2.6
- >=media-sound/jack-audio-connection-kit-0.100.0
- >=gnome-base/libgnomecanvas-2.0
- media-libs/vamp-plugin-sdk
- =sci-libs/fftw-3*
- sys-libs? ( >=dev-libs/libsigc++-2.0
- >=dev-cpp/glibmm-2.4
- >=dev-cpp/cairomm-1.0
- >=dev-cpp/gtkmm-2.8
- >=dev-libs/atk-1.6
- >=x11-libs/pango-1.4
- >=dev-cpp/libgnomecanvasmm-2.12.0
- >=media-libs/libsndfile-1.0.16
- >=media-libs/libsoundtouch-1.0 )"
- # currently internal rubberband is used
- # that needs fftw3 and vamp-sdk, but it rocks, so enable by default
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.33.1
- sys-devel/bison
- sys-devel/autoconf
- sys-devel/automake
- >=dev-util/pkgconfig-0.8.0
- >=dev-util/scons-0.96.1
- nls? ( >=sys-devel/gettext-0.12.1 )"
-
-S="${WORKDIR}/ardour2"
-
-pkg_setup(){
- einfo "this ebuild fetches from the svn maintaince"
- einfo "ardour-2.0.XXX branch"
- # issue with ACLOCAL_FLAGS if set to a wrong value
- if use sys-libs;then
- ewarn "You are trying to use the system libraries"
- ewarn "instead the ones provided by ardour"
- ewarn "No upstream support for doing so. Use at your own risk!!!"
- ewarn "To use the ardour provided libs remerge with:"
- ewarn "USE=\"-sys-libs\" emerge =${P}"
-
- if ! built_with_use dev-cpp/gtkmm accessibility;then
- eerror "To be able to use the USE flag 'sys-libs'"
- eerror "you need to have dev-cpp/gtkmm"
- eerror "emerged with the USE flag 'accessibility'"
- die "dev-cpp/gtkmm is not built with the 'accessibility' USE flag"
- fi
- epause 3s
- fi
-
- if use amd64 && use vst; then
- eerror "${P} currently does not compile with VST support on amd64!"
- eerror "Please unset VST useflag."
- die
- fi
-}
-
-src_unpack(){
- # abort if user answers no to distribution of vst enabled binaries
- if use vst; then
- agree_vst || die "you can not distribute ardour with vst support"
- fi
- subversion_src_unpack
- cd ${S}
-
- # hack to use the sys-lib for sndlib also
- use sys-libs && epatch "${FILESDIR}/ardour-syslib_mod2.patch"
-
- add_ccache_to_scons
-
- ardour_vst_prepare
-}
-
-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=$?"
- # static settings
- myconf="${myconf} PREFIX=/usr KSI=0" # NLS=0"
- einfo "${myconf}"
-
- cd ${S}
- scons ${myconf} ${MAKEOPTS} || die "compilation failed"
-}
-
-src_install() {
- scons DESTDIR="${D}" install || die "make install failed"
- if use vst;then
- mv "${D}"/usr/bin/ardourvst "${D}"/usr/bin/ardour2
- fi
-
- dodoc DOCUMENTATION/*
-
- doicon "${S}/icons/icon/ardour_icon_mac.png"
- make_desktop_entry ardour Ardour ardour_icon_mac.png "AudioVideo;Audio"
-}
Deleted: trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild 2008-02-05 21:42:14 UTC (rev 1149)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.1.9999.ebuild 2008-02-07 14:48:32 UTC (rev 1150)
@@ -1,128 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils fetch-tools scons-ccache subversion vst
-
-ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/branches/2.0-ongoing";
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.org/";
-SRC_URI=""
-URL="http://ardour.org/files/releases/${PN}.tar.bz2";
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls debug sse altivec vst sys-libs"
-
-RDEPEND=">=media-libs/liblrdf-0.4.0
- >=media-libs/raptor-1.2.0
- >=media-libs/libart_lgpl-2.3.16
- >=media-libs/ladspa-sdk-1.12
- >=media-libs/libsamplerate-0.0.14
- media-libs/liblo
- >=dev-libs/libxml2-2.5.7
- dev-libs/libxslt
- >=dev-libs/glib-2.10
- >=x11-libs/gtk+-2.6
- >=media-sound/jack-audio-connection-kit-0.100.0
- >=gnome-base/libgnomecanvas-2.0
- media-libs/vamp-plugin-sdk
- =sci-libs/fftw-3*
- sys-libs? ( >=dev-libs/libsigc++-2.0
- >=dev-cpp/glibmm-2.4
- >=dev-cpp/cairomm-1.0
- >=dev-cpp/gtkmm-2.8
- >=dev-libs/atk-1.6
- >=x11-libs/pango-1.4
- >=dev-cpp/libgnomecanvasmm-2.12.0
- >=media-libs/libsndfile-1.0.16
- >=media-libs/libsoundtouch-1.0 )"
- # currently internal rubberband is used
- # that needs fftw3 and vamp-sdk, but it rocks, so enable by default
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.33.1
- sys-devel/bison
- sys-devel/autoconf
- sys-devel/automake
- >=dev-util/pkgconfig-0.8.0
- >=dev-util/scons-0.96.1
- nls? ( >=sys-devel/gettext-0.12.1 )"
-
-S="${WORKDIR}/ardour2"
-
-pkg_setup(){
- einfo "this ebuild fetches from the svn maintaince"
- einfo "ardour-2.0.XXX branch"
- # issue with ACLOCAL_FLAGS if set to a wrong value
- if use sys-libs;then
- ewarn "You are trying to use the system libraries"
- ewarn "instead the ones provided by ardour"
- ewarn "No upstream support for doing so. Use at your own risk!!!"
- ewarn "To use the ardour provided libs remerge with:"
- ewarn "USE=\"-sys-libs\" emerge =${P}"
-
- if ! built_with_use dev-cpp/gtkmm accessibility;then
- eerror "To be able to use the USE flag 'sys-libs'"
- eerror "you need to have dev-cpp/gtkmm"
- eerror "emerged with the USE flag 'accessibility'"
- die "dev-cpp/gtkmm is not built with the 'accessibility' USE flag"
- fi
- epause 3s
- fi
-
- if use amd64 && use vst; then
- eerror "${P} currently does not compile with VST support on amd64!"
- eerror "Please unset VST useflag."
- die
- fi
-}
-
-src_unpack(){
- # abort if user answers no to distribution of vst enabled binaries
- if use vst; then
- agree_vst || die "you can not distribute ardour with vst support"
- fi
- subversion_src_unpack
- cd ${S}
-
- # hack to use the sys-lib for sndlib also
- use sys-libs && epatch "${FILESDIR}/ardour-2.0.3-sndfile-external.patch"
-
- add_ccache_to_scons
-
- ardour_vst_prepare
-}
-
-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=$?"
- # static settings
- myconf="${myconf} PREFIX=/usr KSI=0" # NLS=0"
- einfo "${myconf}"
-
- cd ${S}
- scons ${myconf} ${MAKEOPTS} || die "compilation failed"
-}
-
-src_install() {
- scons DESTDIR="${D}" install || die "make install failed"
- if use vst;then
- mv "${D}"/usr/bin/ardourvst "${D}"/usr/bin/ardour2
- fi
-
- dodoc DOCUMENTATION/*
-
- doicon "${S}/icons/icon/ardour_icon_mac.png"
- make_desktop_entry ardour Ardour ardour_icon_mac.png "AudioVideo;Audio"
-}
Added: trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/ardour/ardour-2.9999.ebuild 2008-02-07 14:48:32 UTC (rev 1150)
@@ -0,0 +1,128 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils fetch-tools scons-ccache subversion vst
+
+ESVN_REPO_URI="http://subversion.ardour.org/svn/ardour2/branches/2.0-ongoing";
+DESCRIPTION="multi-track hard disk recording software"
+HOMEPAGE="http://ardour.org/";
+SRC_URI=""
+URL="http://ardour.org/files/releases/${PN}.tar.bz2";
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="nls debug sse altivec vst sys-libs"
+
+RDEPEND=">=media-libs/liblrdf-0.4.0
+ >=media-libs/raptor-1.2.0
+ >=media-libs/libart_lgpl-2.3.16
+ >=media-libs/ladspa-sdk-1.12
+ >=media-libs/libsamplerate-0.0.14
+ media-libs/liblo
+ >=dev-libs/libxml2-2.5.7
+ dev-libs/libxslt
+ >=dev-libs/glib-2.10
+ >=x11-libs/gtk+-2.6
+ >=media-sound/jack-audio-connection-kit-0.100.0
+ >=gnome-base/libgnomecanvas-2.0
+ media-libs/vamp-plugin-sdk
+ =sci-libs/fftw-3*
+ sys-libs? ( >=dev-libs/libsigc++-2.0
+ >=dev-cpp/glibmm-2.4
+ >=dev-cpp/cairomm-1.0
+ >=dev-cpp/gtkmm-2.8
+ >=dev-libs/atk-1.6
+ >=x11-libs/pango-1.4
+ >=dev-cpp/libgnomecanvasmm-2.12.0
+ >=media-libs/libsndfile-1.0.16
+ >=media-libs/libsoundtouch-1.0 )"
+ # currently internal rubberband is used
+ # that needs fftw3 and vamp-sdk, but it rocks, so enable by default
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.33.1
+ sys-devel/bison
+ sys-devel/autoconf
+ sys-devel/automake
+ >=dev-util/pkgconfig-0.8.0
+ >=dev-util/scons-0.96.1
+ nls? ( >=sys-devel/gettext-0.12.1 )"
+
+S="${WORKDIR}/ardour2"
+
+pkg_setup(){
+ einfo "this ebuild fetches from the svn maintaince"
+ einfo "ardour-2.0.XXX branch"
+ # issue with ACLOCAL_FLAGS if set to a wrong value
+ if use sys-libs;then
+ ewarn "You are trying to use the system libraries"
+ ewarn "instead the ones provided by ardour"
+ ewarn "No upstream support for doing so. Use at your own risk!!!"
+ ewarn "To use the ardour provided libs remerge with:"
+ ewarn "USE=\"-sys-libs\" emerge =${P}"
+
+ if ! built_with_use dev-cpp/gtkmm accessibility;then
+ eerror "To be able to use the USE flag 'sys-libs'"
+ eerror "you need to have dev-cpp/gtkmm"
+ eerror "emerged with the USE flag 'accessibility'"
+ die "dev-cpp/gtkmm is not built with the 'accessibility' USE flag"
+ fi
+ epause 3s
+ fi
+
+ if use amd64 && use vst; then
+ eerror "${P} currently does not compile with VST support on amd64!"
+ eerror "Please unset VST useflag."
+ die
+ fi
+}
+
+src_unpack(){
+ # abort if user answers no to distribution of vst enabled binaries
+ if use vst; then
+ agree_vst || die "you can not distribute ardour with vst support"
+ fi
+ subversion_src_unpack
+ cd ${S}
+
+ # hack to use the sys-lib for sndlib also
+ use sys-libs && epatch "${FILESDIR}/ardour-2.0.3-sndfile-external.patch"
+
+ add_ccache_to_scons
+
+ ardour_vst_prepare
+}
+
+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=$?"
+ # static settings
+ myconf="${myconf} PREFIX=/usr KSI=0" # NLS=0"
+ einfo "${myconf}"
+
+ cd ${S}
+ scons ${myconf} ${MAKEOPTS} || die "compilation failed"
+}
+
+src_install() {
+ scons DESTDIR="${D}" install || die "make install failed"
+ if use vst;then
+ mv "${D}"/usr/bin/ardourvst "${D}"/usr/bin/ardour2
+ fi
+
+ dodoc DOCUMENTATION/*
+
+ doicon "${S}/icons/icon/ardour_icon_mac.png"
+ make_desktop_entry ardour Ardour ardour_icon_mac.png "AudioVideo;Audio"
+}
Deleted: trunk/overlays/proaudio/media-sound/ardour/files/ardour-syslib_mod2.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ardour/files/ardour-syslib_mod2.patch 2008-02-05 21:42:14 UTC (rev 1149)
+++ trunk/overlays/proaudio/media-sound/ardour/files/ardour-syslib_mod2.patch 2008-02-07 14:48:32 UTC (rev 1150)
@@ -1,136 +0,0 @@
---- a/ardour-2.0.2/gtk2_ardour/SConscript 2007-05-07 06:38:55.000000000 +0200
-+++ b/ardour-2.0.2/gtk2_ardour/SConscript 2007-06-10 16:50:04.000000000 +0200
-@@ -35,7 +35,7 @@
- libraries['libgnomecanvas2'],
- libraries['libgnomecanvasmm'],
- libraries['sysmidi'],
-- libraries['sndfile-ardour'],
-+ libraries['sndfile'],
- libraries['flac'],
- libraries['lrdf'],
- libraries['glibmm2'],
---- a/ardour-2.0.2/libs/ardour/SConscript 2007-05-07 06:39:05.000000000 +0200
-+++ b/ardour-2.0.2/libs/ardour/SConscript 2007-06-10 16:50:17.000000000 +0200
-@@ -254,7 +254,7 @@
- ardour.Merge ([
- libraries['core'],
- libraries['xml'],
-- libraries['sndfile-ardour'],
-+ libraries['sndfile'],
- libraries['raptor'],
- libraries['lrdf'],
- libraries['samplerate'],
---- a/ardour-2.0.2/libs/surfaces/control_protocol/SConscript 2007-05-07 06:39:24.000000000 +0200
-+++ b/ardour-2.0.2/libs/surfaces/control_protocol/SConscript 2007-06-10 16:50:40.000000000 +0200
-@@ -33,7 +33,7 @@
-
- cp.Merge ([
- libraries['ardour'],
-- libraries['sndfile-ardour'],
-+ libraries['sndfile'],
- libraries['sigc2'],
- libraries['pbd'],
- libraries['midi++2'],
---- a/ardour-2.0.2/libs/surfaces/generic_midi/SConscript 2007-05-07 06:39:25.000000000 +0200
-+++ b/ardour-2.0.2/libs/surfaces/generic_midi/SConscript 2007-06-10 16:50:40.000000000 +0200
-@@ -34,7 +34,7 @@
- genericmidi.Merge ([
- libraries['ardour'],
- libraries['ardour_cp'],
-- libraries['sndfile-ardour'],
-+ libraries['sndfile'],
- libraries['midi++2'],
- libraries['pbd'],
- libraries['sigc2'],
---- a/ardour-2.0.2/libs/surfaces/mackie/SConscript 2007-05-07 06:39:25.000000000 +0200
-+++ b/ardour-2.0.2/libs/surfaces/mackie/SConscript 2007-06-10 16:50:40.000000000 +0200
-@@ -51,7 +51,7 @@
- libraries['xml'],
- libraries['glib2'],
- libraries['glibmm2'],
-- libraries['sndfile-ardour']
-+ libraries['sndfile']
- ])
-
- libardour_mackie = mackie.SharedLibrary('ardour_mackie', mackie_files)
---- a/ardour-2.0.2/libs/surfaces/tranzport/SConscript 2007-05-07 06:39:24.000000000 +0200
-+++ b/ardour-2.0.2/libs/surfaces/tranzport/SConscript 2007-06-10 16:50:40.000000000 +0200
-@@ -63,7 +63,7 @@
- libraries['glib2'],
- libraries['glibmm2'],
- libraries['usb'],
-- libraries['sndfile-ardour']
-+ libraries['sndfile']
- ])
-
- libardour_tranzport = tranzport.SharedLibrary('ardour_tranzport', tranzport_files)
---- a/ardour-2.0.2/SConstruct 2007-06-10 17:17:03.000000000 +0200
-+++ b/ardour-2.0.2/SConstruct 2007-06-10 17:06:03.000000000 +0200
-@@ -819,6 +819,7 @@
-
- syslibdeps = \
- {
-+ 'sndfile' : '1.0.16',
- 'sigc++-2.0' : '2.0',
- 'gtkmm-2.4' : '2.8',
- 'libgnomecanvasmm-2.6' : '2.12.0'
-@@ -851,14 +852,16 @@
- libraries['pangomm'].ParseConfig ('pkg-config --cflags --libs pangomm-1.4')
- libraries['libgnomecanvasmm'] = LibraryInfo()
- libraries['libgnomecanvasmm'].ParseConfig ('pkg-config --cflags --libs libgnomecanvasmm-2.6')
-+ libraries['sndfile'] = LibraryInfo()
-+ libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
-
- #
- # cannot use system one for the time being
- #
-
-- libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-- LIBPATH='#libs/libsndfile',
-- CPPPATH=['#libs/libsndfile/src'])
-+# libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-+# LIBPATH='#libs/libsndfile',
-+# CPPPATH=['#libs/libsndfile/src'])
-
- # libraries['libglademm'] = LibraryInfo()
- # libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
-@@ -878,7 +881,6 @@
- ]
-
- subdirs = [
-- 'libs/libsndfile',
- 'libs/pbd',
- 'libs/midi++2',
- 'libs/ardour',
-@@ -926,9 +928,9 @@
- libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
- LIBPATH='#libs/soundtouch',
- CPPPATH=['#libs', '#libs/soundtouch'])
-- libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-- LIBPATH='#libs/libsndfile',
-- CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
-+# libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-+# LIBPATH='#libs/libsndfile',
-+# CPPPATH=['#libs/libsndfile', '#libs/libsndfile/src'])
- # libraries['libglademm'] = LibraryInfo(LIBS='libglademm',
- # LIBPATH='#libs/libglademm',
- # CPPPATH='#libs/libglademm')
-@@ -943,7 +945,6 @@
-
- subdirs = [
- 'libs/sigc++2',
-- 'libs/libsndfile',
- 'libs/pbd',
- 'libs/midi++2',
- 'libs/ardour',
---- a/ardour-2.0.2/vst/SConscript 2007-05-07 06:39:37.000000000 +0200
-+++ b/ardour-2.0.2/vst/SConscript 2007-06-10 16:50:40.000000000 +0200
-@@ -35,7 +35,7 @@
- libraries['libgnomecanvas2'],
- libraries['libgnomecanvasmm'],
- libraries['sysmidi'],
-- libraries['sndfile-ardour'],
-+ libraries['sndfile'],
- libraries['flac'],
- libraries['lrdf'],
- libraries['glibmm2'],