| [proaudio] [932] add jack SVN patch for audacity. |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 932
Author: gimpel
Date: 2007-10-25 21:51:46 +0000 (Thu, 25 Oct 2007)
Log Message:
-----------
add jack SVN patch for audacity. Untested though, I'm not going to install that old wxGTK 2.6 here.
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/audacity/Manifest
trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/audacity/audacity-1.3.2-r1.ebuild
trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-desktopentry.patch
trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch
trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-gentoo.patch
trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-jack-lock.patch
trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch
trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-no-msse.patch
trunk/overlays/proaudio/media-sound/audacity/files/digest-audacity-1.3.2-r1
Modified: trunk/overlays/proaudio/media-sound/audacity/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/Manifest 2007-10-17 20:05:27 UTC (rev 931)
+++ trunk/overlays/proaudio/media-sound/audacity/Manifest 2007-10-25 21:51:46 UTC (rev 932)
@@ -2,14 +2,50 @@
MD5 9a8818667ff40745e903ead0821b6d68 files/audacity-1.3.2+flac-1.1.3.patch 4143
RMD160 5e154be7cee78c206716509d71a8ed883066a114 files/audacity-1.3.2+flac-1.1.3.patch 4143
SHA256 efce32ae9bc0085e2c058ddb4a2436547901bb22f5b2c9a4804dc5b088392eac files/audacity-1.3.2+flac-1.1.3.patch 4143
+AUX audacity-1.3.2-desktopentry.patch 322 RMD160 008a167edbaefdfb400b7b7c443fda51952e3b43 SHA1 7dca6289652dd70aca3534304525dc059502e130 SHA256 2418e374875a9c9f8297d13ec1bb0fbd45e8bf16f2415a7ea45dab3acf6c3b5f
+MD5 82e2af0f2cd1005a237ecfd3095dd070 files/audacity-1.3.2-desktopentry.patch 322
+RMD160 008a167edbaefdfb400b7b7c443fda51952e3b43 files/audacity-1.3.2-desktopentry.patch 322
+SHA256 2418e374875a9c9f8297d13ec1bb0fbd45e8bf16f2415a7ea45dab3acf6c3b5f files/audacity-1.3.2-desktopentry.patch 322
+AUX audacity-1.3.2-disable-optimization.patch 728 RMD160 263c163c26b26851e7ebb6967c8ee20f3346744a SHA1 e127caf717baab7ff184bae78d646bb93dcf8c43 SHA256 312feb7a326bbfb167673976122ddc3d1283e6fde7cd93ae248a6b9a93401246
+MD5 94db7bade2576db7f3154d3f3a0326e5 files/audacity-1.3.2-disable-optimization.patch 728
+RMD160 263c163c26b26851e7ebb6967c8ee20f3346744a files/audacity-1.3.2-disable-optimization.patch 728
+SHA256 312feb7a326bbfb167673976122ddc3d1283e6fde7cd93ae248a6b9a93401246 files/audacity-1.3.2-disable-optimization.patch 728
+AUX audacity-1.3.2-gentoo.patch 2622 RMD160 a20d0f882f74f60a8ef7b684baa3df07f1ffab11 SHA1 4a3f3aa0da30cb295a4551d72622975ec34f7367 SHA256 f70e26e8210d45eb0be48fbe5f683beec03bfda4620792c49ceff630d8ac8259
+MD5 42377fd09f1b0b5ed3886549bbb4f088 files/audacity-1.3.2-gentoo.patch 2622
+RMD160 a20d0f882f74f60a8ef7b684baa3df07f1ffab11 files/audacity-1.3.2-gentoo.patch 2622
+SHA256 f70e26e8210d45eb0be48fbe5f683beec03bfda4620792c49ceff630d8ac8259 files/audacity-1.3.2-gentoo.patch 2622
+AUX audacity-1.3.2-jack-lock.patch 1707 RMD160 f982d46af53b2afded2f9319c68bb217dcb4ab9d SHA1 fd08422041a437c25ad77baceb0fb5165b5cf907 SHA256 faa6c999e6f6c60b7bf9f94989db68021a379b2a66ca42452a1bf5ffe46b0ee1
+MD5 ad5428031303399345a1870adb5382e8 files/audacity-1.3.2-jack-lock.patch 1707
+RMD160 f982d46af53b2afded2f9319c68bb217dcb4ab9d files/audacity-1.3.2-jack-lock.patch 1707
+SHA256 faa6c999e6f6c60b7bf9f94989db68021a379b2a66ca42452a1bf5ffe46b0ee1 files/audacity-1.3.2-jack-lock.patch 1707
+AUX audacity-1.3.2-libnyquistp.patch 1606 RMD160 4a85891d1f6578332e75c2b9e1fe62fd3cff1269 SHA1 0a156f5ec7fe85453e6789aa33eece49ce56fd73 SHA256 dc09a0e2ea10f93d9b561843f4b90ea5809ad2bfe4cf51177d980add96e167e3
+MD5 77f59711ba16bde8252993f438cb82fc files/audacity-1.3.2-libnyquistp.patch 1606
+RMD160 4a85891d1f6578332e75c2b9e1fe62fd3cff1269 files/audacity-1.3.2-libnyquistp.patch 1606
+SHA256 dc09a0e2ea10f93d9b561843f4b90ea5809ad2bfe4cf51177d980add96e167e3 files/audacity-1.3.2-libnyquistp.patch 1606
+AUX audacity-1.3.2-no-msse.patch 436 RMD160 1115be038ed96c9cbac0f33d248c6794dd982268 SHA1 cca61374754e9153b4d123e1693737fd5d56f690 SHA256 ffa5c3d0514d933f613804dcc0e8eb6d3510d1f3ed7cf450306327fedcd4e561
+MD5 02554130e92dcceb574954c71fcc7be9 files/audacity-1.3.2-no-msse.patch 436
+RMD160 1115be038ed96c9cbac0f33d248c6794dd982268 files/audacity-1.3.2-no-msse.patch 436
+SHA256 ffa5c3d0514d933f613804dcc0e8eb6d3510d1f3ed7cf450306327fedcd4e561 files/audacity-1.3.2-no-msse.patch 436
AUX audacity-9999-gentoo.patch 18178 RMD160 7f1d68a4222fd55bf8e0f52025725e6d5bbb3213 SHA1 872a8d48bbd68ab64d09c064763340aa8a44db1e SHA256 2f54013d5b72acf66da55300c91a458237b2a58befde0ee65624552f84d69655
MD5 94694bfad9670ec1d71672b5e7bbbf2b files/audacity-9999-gentoo.patch 18178
RMD160 7f1d68a4222fd55bf8e0f52025725e6d5bbb3213 files/audacity-9999-gentoo.patch 18178
SHA256 2f54013d5b72acf66da55300c91a458237b2a58befde0ee65624552f84d69655 files/audacity-9999-gentoo.patch 18178
-EBUILD audacity-9999.ebuild 2063 RMD160 49aa03ccaf05a9f2df446be6877501a1ffdf8ba2 SHA1 5dc0a29afa097c1abc109bc98fa1f8d80c600725 SHA256 50c1bb9fbc39d7fd7b274f7146b4c32719f3d315344bf6c50a5ceb1e30792248
-MD5 cdd3ba84893365c01735b7de86238320 audacity-9999.ebuild 2063
-RMD160 49aa03ccaf05a9f2df446be6877501a1ffdf8ba2 audacity-9999.ebuild 2063
-SHA256 50c1bb9fbc39d7fd7b274f7146b4c32719f3d315344bf6c50a5ceb1e30792248 audacity-9999.ebuild 2063
+DIST audacity-src-1.3.2.tar.gz 6683449 RMD160 b61747103675881bdf32762deea7635a2827b0de SHA1 87690806763b7de26a8e2df1f0d4c3a7e6d1a404 SHA256 aa37c00014ee79516fb5dce4c56e1038a7eaf5ad22a10743f0609ed186baf621
+EBUILD audacity-1.3.2-r1.ebuild 2222 RMD160 d7a12b4d584bb8d5449cb6a519ea673aadbaa245 SHA1 4b71150c953555ec4ae04d7993cc1d3d83c76260 SHA256 9916188e52c6291accbaa365ef4ebaac2ef23fbc7a42cadcaf08ffed81b85010
+MD5 323a0480e7bea7fdd34f370f70f630cb audacity-1.3.2-r1.ebuild 2222
+RMD160 d7a12b4d584bb8d5449cb6a519ea673aadbaa245 audacity-1.3.2-r1.ebuild 2222
+SHA256 9916188e52c6291accbaa365ef4ebaac2ef23fbc7a42cadcaf08ffed81b85010 audacity-1.3.2-r1.ebuild 2222
+EBUILD audacity-9999.ebuild 2572 RMD160 9bebabf6d810729e0ec2abcd67eacd5edfe419eb SHA1 e7c56637b4ddf81ec6109a674f7f44ef00bb83d5 SHA256 b95f8ec3e2e96dbfc30ae0c0c4df0cd1c60750cbf485458779fd19dbd510263d
+MD5 2f3fe55bc3dd8f3794622a9320890a41 audacity-9999.ebuild 2572
+RMD160 9bebabf6d810729e0ec2abcd67eacd5edfe419eb audacity-9999.ebuild 2572
+SHA256 b95f8ec3e2e96dbfc30ae0c0c4df0cd1c60750cbf485458779fd19dbd510263d audacity-9999.ebuild 2572
+MISC .audacity-9999.ebuild.swp 12288 RMD160 9bd69b14705fe765c57c4fc908b9f67643d2ff17 SHA1 262e0e0e6756ec16b7e1ede3411b14bb9a892553 SHA256 e43d4f5cf5045f24a6b01aba067fb138e1acf51f532b649b42cf0258bfc7ede5
+MD5 30e19185d9ca10f1649fbd124c64005b .audacity-9999.ebuild.swp 12288
+RMD160 9bd69b14705fe765c57c4fc908b9f67643d2ff17 .audacity-9999.ebuild.swp 12288
+SHA256 e43d4f5cf5045f24a6b01aba067fb138e1acf51f532b649b42cf0258bfc7ede5 .audacity-9999.ebuild.swp 12288
+MD5 e4cb0c698f065ef88bab1eba174707aa files/digest-audacity-1.3.2-r1 259
+RMD160 8c96101c6f992bb514996875537ada9adde0edab files/digest-audacity-1.3.2-r1 259
+SHA256 707a1fdb467f1d843eb4978eac90c42d2a428918549578c186d6c568808aaaa5 files/digest-audacity-1.3.2-r1 259
MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-audacity-9999 0
RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-audacity-9999 0
SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-audacity-9999 0
Added: trunk/overlays/proaudio/media-sound/audacity/audacity-1.3.2-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/audacity-1.3.2-r1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/audacity-1.3.2-r1.ebuild 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,99 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils autotools wxwidgets
+
+IUSE="flac ladspa libsamplerate mp3 sse unicode vorbis"
+
+MY_P="${PN}-src-${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/";
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+RESTRICT="test"
+
+DEPEND="=x11-libs/wxGTK-2.6*
+ >=app-arch/zip-2.3
+ dev-libs/expat
+ vorbis? ( >=media-libs/libvorbis-1.0 )
+ mp3? ( >=media-libs/libmad-0.14.2b
+ media-libs/libid3tag )
+ flac? ( media-libs/flac )
+ >=media-libs/libsndfile-1.0.0
+ libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )"
+RDEPEND="${DEPEND}
+ mp3? ( >=media-sound/lame-3.70 )"
+
+S="${WORKDIR}/${MY_P}-beta"
+
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+
+ if has_version ">media-sound/jack-audio-connection-kit-0.103.0"; then
+ epatch "${FILESDIR}"/${P}-jack-lock.patch
+ fi
+
+ if ! use sse ; then
+ epatch "${FILESDIR}"/${P}-no-msse.patch
+ epatch "${FILESDIR}"/${P}-disable-optimization.patch
+ fi
+ epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
+ epatch "${FILESDIR}/${P}-libnyquistp.patch"
+ epatch "${FILESDIR}/${P}-desktopentry.patch"
+
+ eautoreconf || die
+ pushd "${S}"/lib-src/soundtouch
+ eautoreconf
+ popd
+}
+
+src_compile() {
+ local myconf
+ WX_GTK_VER="2.6"
+
+ if use unicode; then
+ need-wxwidgets unicode
+ else
+ need-wxwidgets gtk2
+ fi
+
+ myconf="${myconf} --with-libsndfile=system"
+ myconf="${myconf} --with-libexpat=system"
+
+ if use libsamplerate ; then
+ myconf="${myconf} --with-libsamplerate=system --without-libresample"
+ else
+ myconf="${myconf} --without-libsamplerate" # --with-libresample=local
+ fi
+
+ econf \
+ $(use_enable unicode) \
+ $(use_with ladspa) \
+ $(use_with vorbis vorbis system) \
+ $(use_with mp3 libmad system) \
+ $(use_with mp3 id3tag system) \
+ $(use_with flac flac system) \
+ ${myconf} || die
+
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ # Remove bad doc install
+ rm -rf "${D}"/usr/share/doc
+
+ # Install our docs
+ dodoc README.txt
+
+ insinto /usr/share/audacity/
+ newins images/AudacityLogo48x48.xpm audacity.xpm
+}
Modified: trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild 2007-10-17 20:05:27 UTC (rev 931)
+++ trunk/overlays/proaudio/media-sound/audacity/audacity-9999.ebuild 2007-10-25 21:51:46 UTC (rev 932)
@@ -5,9 +5,9 @@
WANT_AUTOCONF=latest
WANT_AUTOMAKE=latest
-inherit eutils autotools wxwidgets cvs
+inherit eutils autotools wxwidgets cvs subversion
-IUSE="flac ladspa libsamplerate mp3 unicode vamp vorbis"
+IUSE="flac ladspa libsamplerate mp3 unicode vamp vorbis pa-devel"
MY_P="${PN}-src-${PV}"
DESCRIPTION="Free crossplatform audio editor"
@@ -16,6 +16,8 @@
ECVS_SERVER="audacity.cvs.sourceforge.net:/cvsroot/audacity"
ECVS_MODULE="${PN}"
+ESVN_REPO_URI="https://www.portaudio.com/repos/portaudio/branches/v19-devel";
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
@@ -37,14 +39,29 @@
S="${WORKDIR}/${ECVS_MODULE}"
+pkg_setup() {
+ if use pa-devel; then
+ ewarn "You enabled the pa-devel useflag. This will fetch the portaudio"
+ ewarn "v19-devel from SVN and replace the one shipped with ${PN} SVN"
+ ewarn "Note: this might lead to horrible compile and/or runtime errors!"
+ fi
+}
+
src_unpack() {
cvs_src_unpack
-
+
cd "${S}"
#epatch "${FILESDIR}/${P}-gentoo.patch"
#epatch "${FILESDIR}/${P}+flac-1.1.3.patch"
#eautoreconf || die
+
+ if use pa-devel; then
+ subversion_src_unpack
+ cd lib-src
+ rm -r portaudio-v19
+ cp -R "${ESVN_STORE_DIR}/${PN}/v19-devel" portaudio-v19
+ fi
}
src_compile() {
Added: trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-desktopentry.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-desktopentry.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-desktopentry.patch 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,10 @@
+Index: audacity-src-1.3.2-beta/src/audacity.desktop
+===================================================================
+--- audacity-src-1.3.2-beta.orig/src/audacity.desktop
++++ audacity-src-1.3.2-beta/src/audacity.desktop
+@@ -1,4 +1,4 @@
+-[Desktop Entry]
++[Desktop Entry]
+ Encoding=UTF-8
+
+ Name=Audacity Sound Editor
Added: trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-disable-optimization.patch 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,11 @@
+diff -Naur audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h
+--- audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h 2006-10-29 08:06:01.000000000 +0900
++++ audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h 2006-11-17 01:27:15.000000000 +0900
+@@ -92,7 +92,6 @@
+ /// However, if you're having difficulties getting the optimized routines
+ /// compiled with your compler (e.g. some gcc compiler versions may be picky),
+ /// you may wish to disable the optimizations to make the library compile.
+- #define ALLOW_OPTIMIZATIONS 1
+
+
+ // If defined, allows the SIMD-optimized routines to take minor shortcuts
Added: trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-gentoo.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-gentoo.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-gentoo.patch 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,54 @@
+diff -Naur audacity-src-1.3.2-beta.orig/configure audacity-src-1.3.2-beta/configure
+--- audacity-src-1.3.2-beta.orig/configure 2006-10-29 08:05:36.000000000 +0900
++++ audacity-src-1.3.2-beta/configure 2006-10-31 16:12:48.000000000 +0900
+@@ -7027,8 +7027,8 @@
+ fi
+
+
+-# Extract the first word of "wx-config", so it can be a program name with args.
+-set dummy wx-config; ac_word=$2
++# Extract the first word of "wx-config-2.6", so it can be a program name with args.
++set dummy wx-config-2.6; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_WX_CONFIG+set}" = set; then
+@@ -7070,8 +7070,8 @@
+
+
+ if [ "$WX_CONFIG" = "no" ] ; then
+- { { echo "$as_me:$LINENO: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&5
+-echo "$as_me: error: \"Could not find wx-config: is wxWindows installed? is wx-config in your path?\"" >&2;}
++ { { echo "$as_me:$LINENO: error: \"Could not find wx-config-2.6: is wxWindows installed? is wx-config-2.6 in your path?\"" >&5
++echo "$as_me: error: \"Could not find wx-config-2.6: is wxWindows installed? is wx-config-2.6 in your path?\"" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+diff -Naur audacity-src-1.3.2-beta.orig/configure.in audacity-src-1.3.2-beta/configure.in
+--- audacity-src-1.3.2-beta.orig/configure.in 2006-10-29 08:06:01.000000000 +0900
++++ audacity-src-1.3.2-beta/configure.in 2006-10-31 16:12:21.000000000 +0900
+@@ -310,10 +310,10 @@
+
+ dnl --- check for required libraries ---
+
+-dnl wxWindows -- we assume that if wx-config is found, wxWindows is successfully installed.
+-AC_PATH_PROG(WX_CONFIG, wx-config, no, $PATH:/usr/local/bin )
++dnl wxWindows -- we assume that if wx-config-2.6 is found, wxWindows is successfully installed.
++AC_PATH_PROG(WX_CONFIG, wx-config-2.6, no, $PATH:/usr/local/bin )
+ if [[ "$WX_CONFIG" = "no" ]] ; then
+- AC_MSG_ERROR("Could not find wx-config: is wxWindows installed? is wx-config in your path?")
++ AC_MSG_ERROR("Could not find wx-config-2.6: is wxWindows installed? is wx-config-2.6 in your path?")
+ fi
+
+ dnl Check that the wx version is 2.6.x
+diff -Naur audacity-src-1.3.2-beta.orig/locale/Makefile.in audacity-src-1.3.2-beta/locale/Makefile.in
+--- audacity-src-1.3.2-beta.orig/locale/Makefile.in 2006-10-29 08:06:04.000000000 +0900
++++ audacity-src-1.3.2-beta/locale/Makefile.in 2006-11-01 00:06:00.000000000 +0900
+@@ -17,7 +17,7 @@
+ INSTALL=@INSTALL@
+ AUDACITY_NAME=@AUDACITY_NAME@
+ ifdef DESTDIR
+- INSTALL_PATH=$(top_srcdir)/$(DESTDIR)
++ INSTALL_PATH=$(DESTDIR)
+ else
+ INSTALL_PATH=
+ endif
Added: trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-jack-lock.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-jack-lock.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-jack-lock.patch 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,31 @@
+diff -Naur audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c audacity-src-1.3.2-beta-jack_lock_patch/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c
+--- audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c 2006-10-29 00:05:49.000000000 +0100
++++ audacity-src-1.3.2-beta-jack_lock_patch/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c 2007-10-25 19:47:49.000000000 +0100
+@@ -1669,27 +1669,19 @@
+ {
+ for( i = 0; i < stream->num_incoming_connections; i++ )
+ {
+- UNLESS( !jack_port_lock( stream->jack_client, stream->local_input_ports[i] ),
+- paUnanticipatedHostError );
+ if( jack_port_connected( stream->local_input_ports[i] ) )
+ {
+ UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_input_ports[i] ),
+ paUnanticipatedHostError );
+ }
+- UNLESS( !jack_port_unlock( stream->jack_client, stream->local_input_ports[i] ),
+- paUnanticipatedHostError );
+ }
+ for( i = 0; i < stream->num_outgoing_connections; i++ )
+ {
+- UNLESS( !jack_port_lock( stream->jack_client, stream->local_output_ports[i] ),
+- paUnanticipatedHostError );
+ if( jack_port_connected( stream->local_output_ports[i] ) )
+ {
+ UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_output_ports[i] ),
+ paUnanticipatedHostError );
+ }
+- UNLESS( !jack_port_unlock( stream->jack_client, stream->local_output_ports[i] ),
+- paUnanticipatedHostError );
+ }
+ }
+
Added: trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-libnyquistp.patch 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,40 @@
+diff -urd /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in
+--- /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in 2006-10-29 01:05:50.000000000 +0200
++++ audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in 2006-11-17 19:14:04.430148792 +0100
+@@ -338,16 +338,16 @@
+ $(CC) -c tran/pluck.c -o tran/pluck.o $(CFLAGS)
+
+ tran/abs.o: tran/abs.c tran/abs.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+- cc -c tran/abs.c -o tran/abs.o $(CFLAGS)
++ $(CC) -c tran/abs.c -o tran/abs.o $(CFLAGS)
+
+ tran/sqrt.o: tran/sqrt.c tran/sqrt.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+- cc -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
++ $(CC) -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
+
+ tran/alpasscv.o: tran/alpasscv.c tran/alpasscv.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+- cc -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
++ $(CC) -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
+
+ tran/alpassvc.o: tran/alpassvc.c tran/alpassvc.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
+- cc -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
++ $(CC) -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
+
+ nyqsrc/sndfnint.o: nyqsrc/sndfnint.c
+ $(CC) -c nyqsrc/sndfnint.c -o nyqsrc/sndfnint.o $(CFLAGS)
+@@ -493,6 +493,14 @@
+ nyqsrc/seqfnintptrs.h: $(CMTHDRS) misc/intgen
+ $(INTGEN) nyqsrc/seqfnint $(CMTHDRS)
+
++nyqsrc/sndfnintdefs.h : nyqsrc/sndfnintptrs.h
++
++nyqsrc/seqfnintdefs.h : nyqsrc/seqfnintptrs.h
++
++nyqsrc/sndfnint.c : nyqsrc/sndfnintptrs.h
++
++nyqsrc/seqfnint.c : nyqsrc/seqfnintptrs.h
++
+ clean:
+ rm -f libnyquist.a
+ cd misc; $(MAKE) clean
+
Added: trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-no-msse.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-no-msse.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/files/audacity-1.3.2-no-msse.patch 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,11 @@
+--- lib-src/soundtouch/source/SoundTouch/Makefile.am.old 2006-11-02 13:30:00.000000000 +0900
++++ lib-src/soundtouch/source/SoundTouch/Makefile.am 2006-11-02 13:30:12.000000000 +0900
+@@ -35,7 +35,7 @@
+
+ # ??? test for -fcheck-new in configure.ac
+ # other compiler flags to add
+-AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include
++AM_CXXFLAGS=-fcheck-new -I../../include
+
+ # other linking flags to add
+ #libSoundTouch_la_LIBADD=
Added: trunk/overlays/proaudio/media-sound/audacity/files/digest-audacity-1.3.2-r1
===================================================================
--- trunk/overlays/proaudio/media-sound/audacity/files/digest-audacity-1.3.2-r1 (rev 0)
+++ trunk/overlays/proaudio/media-sound/audacity/files/digest-audacity-1.3.2-r1 2007-10-25 21:51:46 UTC (rev 932)
@@ -0,0 +1,3 @@
+MD5 bf63673140254f1283dfd55b61ff2422 audacity-src-1.3.2.tar.gz 6683449
+RMD160 b61747103675881bdf32762deea7635a2827b0de audacity-src-1.3.2.tar.gz 6683449
+SHA256 aa37c00014ee79516fb5dce4c56e1038a7eaf5ad22a10743f0609ed186baf621 audacity-src-1.3.2.tar.gz 6683449