Update portaudio snapshot to have alsa working again, thanks to Alex Rostovtsev <tetromino@gmail.com> in bug #209494. Fix automagics on alsa and jack, more or less bug #210415

Package-Manager: portage-2.1.4.4

4 files changed, 203 insertions, 2 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index a6be8989e6bf..5d10768c888a 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.87 2008/02/27 18:35:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.88 2008/03/01 16:58:33 aballier Exp $
+
+*audacity-1.3.4-r2 (01 Mar 2008)
+
+  01 Mar 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/audacity-1.3.4-automagic.patch, +audacity-1.3.4-r2.ebuild:
+  Update portaudio snapshot to have alsa working again, thanks to Alex
+  Rostovtsev <tetromino@gmail.com> in bug #209494. Fix automagics on alsa and
+  jack, more or less bug #210415
 
   27 Feb 2008; Jeroen Roovers <jer@gentoo.org> audacity-1.3.4-r1.ebuild:
   Marked ~hppa.
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 4f7ec549d843..8e506d5f6ecd 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CVE-2007-6061.patch 990 RMD160 65c960ffbad4ed21b56064fc44672da15a3a9a84 SHA1 4519a1b819feb77d6d49e22db1699dbad14a73f3 SHA256 45ef372a604d900ff9f40e7070525506fe63073cc4dd4edaf0fe7078d37df24d
+AUX audacity-1.3.4-automagic.patch 2625 RMD160 63f28b895aa94c2458cc3f16ed52f3a44f95c08b SHA1 908aba3830560e16678a35d9350e2f681c452bf9 SHA256 a992234a9219c266a4318ba0cfd23404d11dd0b1ebce587512996cdbc8fd4946
 AUX audacity-1.3.4-nolibfailure.patch 1565 RMD160 7d09b05176eee4ac0bee6f6832e472728ba890dd SHA1 18ebf966afa3569f34da8af53605fc4cf51d833f SHA256 25fce83269210c1ce446b01969fd65e980ddcfd3b489218a3e9e3d16d4025e62
+DIST audacity-1.3.4-portaudio-cvs-rev1.7.patch.bz2 6235 RMD160 38e74622e7af4cf3662e87256ec38373eeb00595 SHA1 0a19a1e38d7ee552d75583a6e99e892b3cf4ab50 SHA256 ad78193aee772eb78e5a315d721b0f35242eb6f9b5e8f7d9e718d8a11e70b8a1
 DIST audacity-src-1.3.4.tar.bz2 4349381 RMD160 754d81fb0e660d697e7c315c41f28584917e0a9e SHA1 50ab6cf19545f8cb38226b96252dbd958e7d88c4 SHA256 102d60e48e1928f3fd995a214ed9ba872929c6365cf5f784f107f351b42499f9
+DIST pa_stable_v19_20071207.tar.gz 1113282 RMD160 5185bd85bd4bc75dddb3fa56f172a346bdeea0c7 SHA1 3841453bb7be672a15b6b632ade6f225eb0a4efc SHA256 06a17727d56d382a69036de2ed9aee9a15cac0329b995b8cfcd69b357f47bf2b
 EBUILD audacity-1.3.4-r1.ebuild 2482 RMD160 0d9a297949ff3da02746327413462d7965be526d SHA1 17b958bb32b65cdd6bbe3ca6b634f1d4f698d071 SHA256 bd3f405c55bdf42f0864539872f88531daaf8760ea07de74ebc8e8e374b7222a
-MISC ChangeLog 15623 RMD160 fc0d657e045c519b6ca0e9c04bb6b94057358403 SHA1 7ca2264c5ad4b0e375ca768f6e72307bd0542610 SHA256 81413a58db30387fe9d5b79091ac46d6bfc7c3692e7f7cb79acd69cc278a42c2
+EBUILD audacity-1.3.4-r2.ebuild 3033 RMD160 ae2fc09dcb0b5146c18fc12cb3709577daa2e3af SHA1 61797c618b58ede36b7ec624c22546364ad577cc SHA256 70dd11bfa75fa7df456c2d2184397fba76eb76dbf293cb6b9fd5536158549658
+MISC ChangeLog 15965 RMD160 7e8ce66a2b571305c1c1d1e8e7553cadcfe27602 SHA1 b4aedf21f9a03d8a4d6c7f0eea41d464f7b811e2 SHA256 6a0fc5bdb28bc16989af73a22ac112155b31a88443dbdfb3d4f57add8d55e09e
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHyYtDvFcC4BYPU0oRAvStAJ93jMUoJXW/up8FQvw6RjvurLY6ywCfUHHI
+9tMrqrBRNW14xNelkkdtuIQ=
+=Xj48
+-----END PGP SIGNATURE-----
diff --git a/media-sound/audacity/audacity-1.3.4-r2.ebuild b/media-sound/audacity/audacity-1.3.4-r2.ebuild
new file mode 100644
index 000000000000..8668baf87812
--- /dev/null
+++ b/media-sound/audacity/audacity-1.3.4-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.4-r2.ebuild,v 1.1 2008/03/01 16:58:33 aballier Exp $
+
+inherit eutils wxwidgets autotools
+
+IUSE="alsa flac id3tag jack ladspa libsamplerate mp3 soundtouch twolame unicode vamp vorbis"
+
+MY_P="${PN}-src-${PV}"
+MY_PA_P="pa_stable_v19_20071207"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://audacity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+	http://www.portaudio.com/archives/${MY_PA_P}.tar.gz
+	mirror://gentoo/${P}-portaudio-cvs-rev1.7.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="test"
+
+COMMON_DEPEND="=x11-libs/wxGTK-2.6*
+	>=app-arch/zip-2.3
+	dev-libs/expat
+	>=media-libs/libsndfile-1.0.0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
+	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	mp3? ( >=media-libs/libmad-0.14.2b )
+	id3tag? ( media-libs/libid3tag )
+	flac? ( media-libs/flac )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	twolame? ( media-sound/twolame )"
+RDEPEND="${COMMON_DEPEND}
+	mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}-beta"
+
+pkg_setup() {
+	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
+		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
+		eerror "Please enable the cxx USE flag for media-libs/flac"
+		die "Missing FLAC C++ bindings."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	einfo "Updating portaudio-v19 snapshot to ${MY_PA_P}"
+	rm -r "${S}/lib-src/portaudio-v19" || die
+	mv "${WORKDIR}/portaudio" "${S}/lib-src/portaudio-v19" || die
+
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-nolibfailure.patch"
+	epatch "${FILESDIR}/CVE-2007-6061.patch"
+
+	cd lib-src/portaudio-v19
+	epatch "${WORKDIR}/${P}-portaudio-cvs-rev1.7.patch"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-automagic.patch"
+	eautoreconf
+}
+
+src_compile() {
+	WX_GTK_VER="2.6"
+
+	if use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
+
+	econf \
+		--with-libexpat=system \
+		$(use_enable unicode) \
+		$(use_with ladspa) \
+		$(use_with vorbis) \
+		$(use_with mp3 libmad) \
+		$(use_with id3tag) \
+		$(use_with flac libflac) \
+		$(use_enable vamp) \
+		$(use_with twolame libtwolame) \
+		$(use_with soundtouch) \
+		$(use_with libsamplerate) \
+		$(use_with alsa) \
+		$(use_with jack)
+
+	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
+}
+
+pkg_postinst() {
+	ewarn "For security reasons, audacity temporary directory"
+	ewarn "has been moved to your home directory."
+	ewarn "This version will not allow you to set it in /tmp"
+	ewarn "and will discard your preferences if it is there."
+	ewarn "See bug #199751 for more information."
+}
diff --git a/media-sound/audacity/files/audacity-1.3.4-automagic.patch b/media-sound/audacity/files/audacity-1.3.4-automagic.patch
new file mode 100644
index 000000000000..feb9867bebe0
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.4-automagic.patch
@@ -0,0 +1,65 @@
+Index: audacity-src-1.3.4-beta/configure.in
+===================================================================
+--- audacity-src-1.3.4-beta.orig/configure.in
++++ audacity-src-1.3.4-beta/configure.in
+@@ -420,6 +420,8 @@ case "${host_os}" in
+ esac
+ 
+ dnl PortAudio configuration
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
+ 
+ if [[ "$use_portaudio" = "v19" ]] ; then
+    dnl PortAudio v19
+@@ -441,14 +443,22 @@ if [[ "$use_portaudio" = "v19" ]] ; then
+          ;;
+       *)
+          dnl Unix
+-         AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
+-         if [[ $have_alsa = "yes" ]] ; then
+-            LIBS="$LIBS -lasound"
+-         fi
+-         PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
+-         if [[ $have_jack = "yes" ]] ; then
+-            LIBS="$LIBS $JACK_LIBS"
+-         fi
++	 if test "x$with_alsa" != "xno"; then
++           AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
++           if [[ $have_alsa = "yes" ]] ; then
++                LIBS="$LIBS -lasound"
++	    else
++                AC_MSG_WARN([Support for alsa not available])
++           fi
++	 fi
++	 if test "x$with_jack" != "xno"; then
++           PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
++	    if [[ $have_jack = "yes" ]] ; then
++        	LIBS="$LIBS $JACK_LIBS"
++	    else
++		AC_MSG_WARN([Support for jack not available])
++           fi
++	 fi	
+          AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
+          if [[ $have_asihpi = "yes" ]] ; then
+             LIBS="$LIBS -lhpi"
+Index: audacity-src-1.3.4-beta/lib-src/portmixer/configure.ac
+===================================================================
+--- audacity-src-1.3.4-beta.orig/lib-src/portmixer/configure.ac
++++ audacity-src-1.3.4-beta/lib-src/portmixer/configure.ac
+@@ -94,6 +94,7 @@ AC_CHECK_HEADER(linux/soundcard.h, have_
+ AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
+ AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
+ 
++AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
+ #
+ # Set up to use the identified ones
+ #
+@@ -104,7 +105,7 @@ if [[ $have_oss = "yes" ]] ; then
+    objects="$objects px_unix_oss.o"
+ fi
+ 
+-if [[ $have_alsa = "yes" ]] ; then
++if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
+    AC_MSG_NOTICE(Including support for ALSA);
+    AC_DEFINE(PX_USE_LINUX_ALSA)
+    objects="$objects px_linux_alsa.o"