From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1004828-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A57551382C5
for <garchives@archives.gentoo.org>; Wed, 21 Feb 2018 11:09:03 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BBA37E088A;
Wed, 21 Feb 2018 11:09:02 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8A589E088A
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Feb 2018 11:09:02 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1BD4B335C4B
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Feb 2018 11:09:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BE4C231
for <gentoo-commits@lists.gentoo.org>; Wed, 21 Feb 2018 11:08:59 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1519211331.2756b165ad00e4e78bfe5b02a3c0f5bd6f6be82c.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/audacity/audacity-2.2.2.ebuild media-sound/audacity/files/audacity-2.2.1-portmixer.patch media-sound/audacity/files/audacity-2.2.2-automake.patch
X-VCS-Directories: media-sound/audacity/ media-sound/audacity/files/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: 2756b165ad00e4e78bfe5b02a3c0f5bd6f6be82c
X-VCS-Branch: master
Date: Wed, 21 Feb 2018 11:08:59 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2c42df18-7162-4af2-8a25-be5c269a66a4
X-Archives-Hash: 71e5134d610294b462979ee5398fb490
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