diff options
Diffstat (limited to 'www/firefox/files/patch-alsapulse')
| -rw-r--r-- | www/firefox/files/patch-alsapulse | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/www/firefox/files/patch-alsapulse b/www/firefox/files/patch-alsapulse index f0c38d347bea..6a8bad77fc17 100644 --- a/www/firefox/files/patch-alsapulse +++ b/www/firefox/files/patch-alsapulse @@ -2,21 +2,18 @@ diff --git configure.in configure.in index 5980b76..11f5f77 100644 --- configure.in +++ configure.in -@@ -5600,13 +5600,25 @@ dnl ======================================================== - dnl = Check alsa availability on Linux if using sydneyaudio - dnl ======================================================== +@@ -5618,11 +5618,25 @@ dnl ======================================================== -+MOZ_ARG_ENABLE_BOOL(alsa, -+[ --enable-alsa Enable Alsa support (default on Linux)], -+MOZ_ALSA=1, -+MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) -+ dnl If using sydneyaudio with Linux, ensure that the alsa library is available --if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then -+if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux" -a "$MOZ_ALSA_FORCE" != "no"; then + if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then + MOZ_ALSA=1 +fi + ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support (default on Linux)], ++MOZ_ALSA=1, ++MOZ_ALSA=) ++ +if test -n "$MOZ_ALSA"; then + AC_DEFINE(MOZ_CUBEB) PKG_CHECK_MODULES(MOZ_ALSA, alsa, , @@ -25,10 +22,21 @@ index 5980b76..11f5f77 100644 fi +AC_SUBST(MOZ_ALSA) ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA_LIBS) + dnl ======================================================== dnl = Enable PulseAudio dnl ======================================================== +@@ -8633,8 +8647,6 @@ AC_SUBST(MOZ_VP8_ERROR_CONCEALMENT) + AC_SUBST(MOZ_VP8_ENCODER) + AC_SUBST(MOZ_VP8) + AC_SUBST(MOZ_OGG) +-AC_SUBST(MOZ_ALSA_LIBS) +-AC_SUBST(MOZ_ALSA_CFLAGS) + AC_SUBST(VPX_AS) + AC_SUBST(VPX_ASFLAGS) + AC_SUBST(VPX_DASH_C_FLAG) diff --git media/libcubeb/src/Makefile.in media/libcubeb/src/Makefile.in index 5ab4dd8..c8df26f 100644 --- media/libcubeb/src/Makefile.in |