forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-sound/audacity: Fixed compilation with USE="-portmixer"
Closes: https://bugs.gentoo.org/624264 Package-Manager: Portage-2.3.24, Repoman-2.3.6
- Loading branch information
Lars Wendler
committed
Feb 21, 2018
1 parent
18dbd4f
commit 2756b16
Showing
3 changed files
with
91 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |