commit: 2756b165ad00e4e78bfe5b02a3c0f5bd6f6be82c Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Wed Feb 21 11:08:36 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed Feb 21 11:08:51 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2756b165
media-sound/audacity: Fixed compilation with USE="-portmixer" Closes: https://bugs.gentoo.org/624264 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-sound/audacity/audacity-2.2.2.ebuild | 9 +++- .../audacity/files/audacity-2.2.1-portmixer.patch | 36 ++++++++++++++++ .../audacity/files/audacity-2.2.2-automake.patch | 48 ++++++++++++++++++++++ 3 files changed, 91 insertions(+), 2 deletions(-) diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild index cb2b8ea861f..5c71e713a5d 100644 --- a/media-sound/audacity/audacity-2.2.2.ebuild +++ b/media-sound/audacity/audacity-2.2.2.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=5 -inherit eutils gnome2-utils wxwidgets xdg-utils +inherit autotools eutils gnome2-utils wxwidgets xdg-utils MY_P="${PN}-minsrc-${PV}" DOC_PV="${PV}" @@ -50,11 +50,16 @@ REQUIRED_USE="soundtouch? ( midi )" S="${WORKDIR}/${MY_P}-rc1" PATCHES=( - "${FILESDIR}/${PN}-2.2.2-midi.patch" + "${FILESDIR}/${PN}-2.2.1-portmixer.patch" #624264 + "${FILESDIR}/${PN}-2.2.2-automake.patch" # or else eautoreconf breaks + "${FILESDIR}/${PN}-2.2.2-midi.patch" #637110 ) src_prepare() { epatch "${PATCHES[@]}" + + # needed because of portmixer patch + eautoreconf } src_configure() { diff --git a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch new file mode 100644 index 00000000000..0df43f5c07a --- /dev/null +++ b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/624264 + +Patch by Vladimir + +--- audacity-minsrc-2.2.1-rc3/configure.ac ++++ audacity-minsrc-2.2.1-rc3/configure.ac +@@ -540,7 +540,7 @@ + [compile with PortMixer [default=yes]])], + use_portmixer=$withval, + use_portmixer="yes") +- ++AM_CONDITIONAL([USE_PORTMIXER], [test "$use_portmixer" = yes]) + + AC_CANONICAL_HOST + +--- audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am ++++ audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am +@@ -92,7 +92,6 @@ + libsoxr \ + lib-widget-extra \ + lv2 \ +- portmixer \ + portsmf \ + sbsms \ + $(NULL) +@@ -156,8 +155,10 @@ + SUBDIRS += portaudio-v19 + endif + ++if USE_PORTMIXER + # Note: portmixer needs to be linked against (the local or system) portaudio. + SUBDIRS += portmixer ++endif + + if USE_LOCAL_PORTSMF + SUBDIRS += portsmf diff --git a/media-sound/audacity/files/audacity-2.2.2-automake.patch b/media-sound/audacity/files/audacity-2.2.2-automake.patch new file mode 100644 index 00000000000..56343e3ede2 --- /dev/null +++ b/media-sound/audacity/files/audacity-2.2.2-automake.patch @@ -0,0 +1,48 @@ +Remove subdirs that are non-exisitng in the tarball +or else autoreconf breaks. + +--- audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am ++++ audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am +@@ -107,18 +107,6 @@ + SUBDIRS = FileDialog + OPTIONAL_SUBDIRS = + +-if USE_LOCAL_EXPAT +-OPTIONAL_SUBDIRS += expat +-endif +- +-if USE_LOCAL_LIBID3TAG +-OPTIONAL_SUBDIRS += libid3tag +-endif +- +-if USE_LOCAL_LIBMAD +-OPTIONAL_SUBDIRS += libmad +-endif +- + if USE_LOCAL_LIBNYQUIST + SUBDIRS += libnyquist + endif +@@ -131,23 +119,10 @@ + OPTIONAL_SUBDIRS += libsoxr + endif + +-if USE_LOCAL_LIBSOUNDTOUCH +-OPTIONAL_SUBDIRS += soundtouch +-endif +- + if USE_LOCAL_LIBTWOLAME + OPTIONAL_SUBDIRS += twolame + endif + +-if USE_LOCAL_LIBVORBIS +-OPTIONAL_SUBDIRS += libogg libvorbis +-endif +- +-if USE_LOCAL_LIBFLAC +-# Note: libflac needs to be linked against (the local or system) libogg. +-OPTIONAL_SUBDIRS += libflac +-endif +- + if USE_LOCAL_LV2 + SUBDIRS += lv2 + endif
