| 1 |
aballier 08/03/01 16:58:34 |
| 2 |
|
| 3 |
Added: audacity-1.3.4-automagic.patch |
| 4 |
Log: |
| 5 |
Update portaudio snapshot to have alsa working again, thanks to Alex Rostovtsev <tetromino@×××××.com> in bug #209494. Fix automagics on alsa and jack, more or less bug #210415 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-sound/audacity/files/audacity-1.3.4-automagic.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/audacity/files/audacity-1.3.4-automagic.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/audacity/files/audacity-1.3.4-automagic.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: audacity-1.3.4-automagic.patch |
| 15 |
=================================================================== |
| 16 |
Index: audacity-src-1.3.4-beta/configure.in |
| 17 |
=================================================================== |
| 18 |
--- audacity-src-1.3.4-beta.orig/configure.in |
| 19 |
+++ audacity-src-1.3.4-beta/configure.in |
| 20 |
@@ -420,6 +420,8 @@ case "${host_os}" in |
| 21 |
esac |
| 22 |
|
| 23 |
dnl PortAudio configuration |
| 24 |
+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)])) |
| 25 |
+AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)])) |
| 26 |
|
| 27 |
if [[ "$use_portaudio" = "v19" ]] ; then |
| 28 |
dnl PortAudio v19 |
| 29 |
@@ -441,14 +443,22 @@ if [[ "$use_portaudio" = "v19" ]] ; then |
| 30 |
;; |
| 31 |
*) |
| 32 |
dnl Unix |
| 33 |
- AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) |
| 34 |
- if [[ $have_alsa = "yes" ]] ; then |
| 35 |
- LIBS="$LIBS -lasound" |
| 36 |
- fi |
| 37 |
- PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no) |
| 38 |
- if [[ $have_jack = "yes" ]] ; then |
| 39 |
- LIBS="$LIBS $JACK_LIBS" |
| 40 |
- fi |
| 41 |
+ if test "x$with_alsa" != "xno"; then |
| 42 |
+ AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no) |
| 43 |
+ if [[ $have_alsa = "yes" ]] ; then |
| 44 |
+ LIBS="$LIBS -lasound" |
| 45 |
+ else |
| 46 |
+ AC_MSG_WARN([Support for alsa not available]) |
| 47 |
+ fi |
| 48 |
+ fi |
| 49 |
+ if test "x$with_jack" != "xno"; then |
| 50 |
+ PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no) |
| 51 |
+ if [[ $have_jack = "yes" ]] ; then |
| 52 |
+ LIBS="$LIBS $JACK_LIBS" |
| 53 |
+ else |
| 54 |
+ AC_MSG_WARN([Support for jack not available]) |
| 55 |
+ fi |
| 56 |
+ fi |
| 57 |
AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm) |
| 58 |
if [[ $have_asihpi = "yes" ]] ; then |
| 59 |
LIBS="$LIBS -lhpi" |
| 60 |
Index: audacity-src-1.3.4-beta/lib-src/portmixer/configure.ac |
| 61 |
=================================================================== |
| 62 |
--- audacity-src-1.3.4-beta.orig/lib-src/portmixer/configure.ac |
| 63 |
+++ audacity-src-1.3.4-beta/lib-src/portmixer/configure.ac |
| 64 |
@@ -94,6 +94,7 @@ AC_CHECK_HEADER(linux/soundcard.h, have_ |
| 65 |
AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no) |
| 66 |
AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no) |
| 67 |
|
| 68 |
+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)])) |
| 69 |
# |
| 70 |
# Set up to use the identified ones |
| 71 |
# |
| 72 |
@@ -104,7 +105,7 @@ if [[ $have_oss = "yes" ]] ; then |
| 73 |
objects="$objects px_unix_oss.o" |
| 74 |
fi |
| 75 |
|
| 76 |
-if [[ $have_alsa = "yes" ]] ; then |
| 77 |
+if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then |
| 78 |
AC_MSG_NOTICE(Including support for ALSA); |
| 79 |
AC_DEFINE(PX_USE_LINUX_ALSA) |
| 80 |
objects="$objects px_linux_alsa.o" |
| 81 |
|
| 82 |
|
| 83 |
|
| 84 |
-- |
| 85 |
gentoo-commits@l.g.o mailing list |
Archives