commit:     4d6221c436747e6dfd39db9c91bb168b1f6d7f36
Author:     Marc Joliet <marcec <AT> gmx <DOT> de>
AuthorDate: Mon Oct 26 10:17:31 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 13:55:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d6221c4

media-sound/audacity: fix libsamplerate/libsox dep

Starting with audacity 2.0.3, only *one* resampling library can be enabled at a
time.  Due to this, the way the USE flags are currently handled make it
impossible to use the libsoxr library.  This commit does two things to remedy
this:

- never enable libresample (which isn't recommended anymore), and
- drop the libsoxr USE flag so that the libsamplerate/libsoxr choice is
  controlled only through the libsamplerate USE flag, thus allowing only one
  choice, which reflects the way the build system works.

These two minimal changes make it possible to properly select between the two
recommended resampling libraries.

Gentoo-bug: 536208
Signed-off-by: Marc Joliet <marcec <AT> gmx.de>

 media-sound/audacity/audacity-2.0.5-r1.ebuild | 101 ++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/media-sound/audacity/audacity-2.0.5-r1.ebuild 
b/media-sound/audacity/audacity-2.0.5-r1.ebuild
new file mode 100644
index 0000000..50f9262
--- /dev/null
+++ b/media-sound/audacity/audacity-2.0.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils wxwidgets autotools versionator
+
+MY_PV=$(replace_version_separator 3 -)
+MY_P="${PN}-src-${MY_PV}"
+MY_T="${PN}-minsrc-${MY_PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="http://web.audacityteam.org/";
+SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms 
soundtouch twolame vamp vorbis"
+RESTRICT="test"
+
+COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
+       >=app-arch/zip-2.3
+       >=media-libs/libsndfile-1.0.0
+       dev-libs/expat
+       libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
+       !libsamplerate? ( media-libs/soxr )
+       vorbis? ( >=media-libs/libvorbis-1.0 )
+       mp3? ( >=media-libs/libmad-0.14.2b )
+       flac? ( >=media-libs/flac-1.2.0[cxx] )
+       id3tag? ( media-libs/libid3tag )
+       sbsms? ( media-libs/libsbsms )
+       soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+       vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+       twolame? ( media-sound/twolame )
+       ffmpeg? ( virtual/ffmpeg )
+       alsa? ( media-libs/alsa-lib )
+       jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
+# Crashes at  startup here...
+#      lv2? ( >=media-libs/slv2-0.6.0 )
+# Disabled upstream ATM
+#  ladspa? ( >=media-libs/liblrdf-0.4.0 )
+
+RDEPEND="${COMMON_DEPEND}
+       mp3? ( >=media-sound/lame-3.70 )"
+DEPEND="${COMMON_DEPEND}
+       app-arch/xz-utils
+       virtual/pkgconfig"
+
+REQUIRED_USE="soundtouch? ( midi )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
+
+       AT_M4DIR="${S}/m4" eautoreconf
+}
+
+src_configure() {
+       WX_GTK_VER="2.8"
+       need-wxwidgets unicode
+
+       # * always use system libraries if possible
+       # * options listed in the order that configure --help lists them
+       # * use libsoxr if libsamplerate is not requested
+       econf \
+               --enable-unicode \
+               --enable-nyquist \
+               --disable-dynamic-loading \
+               $(use_enable ladspa) \
+               --with-libsndfile=system \
+               --with-expat=system \
+               $(use_with libsamplerate) \
+               $(use_with !libsamplerate libsoxr) \
+               $(use_with vorbis libvorbis) \
+               $(use_with mp3 libmad) \
+               $(use_with flac libflac) \
+               $(use_with id3tag libid3tag) \
+               $(use_with sbsms) \
+               $(use_with soundtouch) \
+               $(use_with vamp libvamp) \
+               $(use_with twolame libtwolame) \
+               $(use_with ffmpeg) \
+               $(use_with midi) \
+               $(use_with alsa) \
+               $(use_with jack)
+}
+
+# $(use_with lv2 slv2) \
+# $(use_with ladspa liblrdf) \
+
+src_install() {
+       emake DESTDIR="${D}" install
+
+       # Remove bad doc install
+       rm -rf "${D}"/usr/share/doc
+
+       # Install our docs
+       dodoc README.txt
+}

Reply via email to