If MOZ_ALSA is to be used in Makefiles it must have a AC_SUBST and be defined

when needed.

3 files changed, 43 insertions, 15 deletions

diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo
index bebebb12a6a..aaf33a20a92 100644
--- a/mail/thunderbird/distinfo
+++ b/mail/thunderbird/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.118 2013/04/09 20:23:05 ryoon Exp $
+$NetBSD: distinfo,v 1.119 2013/05/08 09:14:29 sbd Exp $
 
 SHA1 (enigmail-1.4.5.tar.gz) = 16d0450a9f5fb4de0e9cc5b9f8091dce4b070aaf
 RMD160 (enigmail-1.4.5.tar.gz) = 860a1ca813fd2ccae69ac0afe07affd39611e56a
@@ -9,8 +9,8 @@ Size (lightning-1.9.source.tar.bz2) = 113944316 bytes
 SHA1 (thunderbird-17.0.5esr.source.tar.bz2) = e70c42608b2e98c5037d2f28f098870cb58650c2
 RMD160 (thunderbird-17.0.5esr.source.tar.bz2) = 63ba845953c311d13f9fa5868cda1fdf75169bff
 Size (thunderbird-17.0.5esr.source.tar.bz2) = 113259410 bytes
-SHA1 (patch-aa) = e381d55c1514b77f6d0fe769363f49abfa50f05a
-SHA1 (patch-aa-toplevel) = b18a348a10efbf0caad1e3e58de2ecb1120ddaf3
+SHA1 (patch-aa) = c73e3fa16dea308a0cf6ca684529958336c788f3
+SHA1 (patch-aa-toplevel) = 1207a234377bab854f59b13ce51efe810913f1e0
 SHA1 (patch-ab) = 7432f73e9771260849d99e14008164bd3d564bf8
 SHA1 (patch-ac) = 3d54eef3657bf39b73e2851a33b8ee1aa9408131
 SHA1 (patch-ad) = 5f225b1db28a7217d9225ffc03fe3a40b453d7f7
diff --git a/mail/thunderbird/patches/patch-aa b/mail/thunderbird/patches/patch-aa
index 08aaa5bbbcd..67a23f15ce2 100644
--- a/mail/thunderbird/patches/patch-aa
+++ b/mail/thunderbird/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
+$NetBSD: patch-aa,v 1.15 2013/05/08 09:14:30 sbd Exp $
 
---- mozilla/configure.in.orig	Fri Mar  8 07:13:08 2013
-+++ mozilla/configure.in	Sat Mar 30 22:29:06 2013
-@@ -2080,6 +2080,9 @@
+--- mozilla/configure.in.orig	2013-03-28 18:08:16.000000000 +0000
++++ mozilla/configure.in
+@@ -2080,6 +2080,9 @@ ia64*-hpux*)
      if test -z "$MC"; then
          MC=mc.exe
      fi
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
      ;;
  *-mingw*)
      DSO_CFLAGS=
-@@ -2979,6 +2982,9 @@
+@@ -2979,6 +2982,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -3279,6 +3285,9 @@
+@@ -3279,6 +3285,9 @@ AC_CACHE_CHECK(
          #ifdef linux
          #define _BSD_SOURCE 1
          #endif
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
          #include <resolv.h>
          ],
          [int foo = res_ninit(&_res);],
-@@ -3937,7 +3946,7 @@
+@@ -3937,7 +3946,7 @@ AC_CHECK_PROGS(YASM, yasm, "")
  if test -n "$YASM"; then
    dnl Pull out yasm's version string
    changequote(,)
@@ -41,7 +41,7 @@ $NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
    changequote([,])
  
    YASM_VERSION=`yasm --version | sed -ne "$_YASM_VER_FILTER"`
-@@ -3947,6 +3956,14 @@
+@@ -3947,6 +3956,14 @@ if test -n "$YASM"; then
    _YASM_BUILD=`        echo ${YASM_VERSION} | $AWK -F\. '{ print $4 }'`
  fi
  
@@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
  if test -z "$SKIP_LIBRARY_CHECKS"; then
  dnl system JPEG support
  dnl ========================================================
-@@ -5158,8 +5175,8 @@
+@@ -5158,8 +5175,8 @@ fi
  
  AC_SUBST(MOZ_WEBRTC)
  
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
      MOZ_SAMPLE_TYPE_S16LE=1
      AC_DEFINE(MOZ_SAMPLE_TYPE_S16LE)
      AC_SUBST(MOZ_SAMPLE_TYPE_S16LE)
-@@ -5356,11 +5373,11 @@
+@@ -5356,11 +5373,11 @@ if test -n "$MOZ_VP8" -a -z "$MOZ_NATIVE
  
      dnl See if we have assembly on this platform.
      case "$OS_ARCH:$CPU_ARCH" in
@@ -81,3 +81,16 @@ $NetBSD: patch-aa,v 1.14 2013/03/30 23:31:36 tron Exp $
        VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
        VPX_X86_ASM=1
      ;;
+@@ -5516,10 +5533,11 @@ dnl ====================================
+ 
+ dnl If using sydneyaudio with Linux, ensure that the alsa library is available
+ if test -n "$MOZ_SYDNEYAUDIO" -a "$OS_TARGET" = "Linux"; then
+-    PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
++    PKG_CHECK_MODULES(MOZ_ALSA, alsa, MOZ_ALSA=1,
+          [echo "$MOZ_ALSA_PKG_ERRORS"
+           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
+ fi
++AC_SUBST(MOZ_ALSA)
+ 
+ dnl ========================================================
+ dnl = Enable PulseAudio
diff --git a/mail/thunderbird/patches/patch-aa-toplevel b/mail/thunderbird/patches/patch-aa-toplevel
index 191658c2901..7f21eaf82c2 100644
--- a/mail/thunderbird/patches/patch-aa-toplevel
+++ b/mail/thunderbird/patches/patch-aa-toplevel
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa-toplevel,v 1.10 2013/01/07 21:12:15 ryoon Exp $
+$NetBSD: patch-aa-toplevel,v 1.11 2013/05/08 09:14:30 sbd Exp $
 
---- configure.in.orig	2012-11-19 22:35:28.000000000 +0000
+--- configure.in.orig	2013-03-28 18:07:18.000000000 +0000
 +++ configure.in
 @@ -1797,7 +1797,7 @@ ld.])
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
@@ -41,3 +41,18 @@ $NetBSD: patch-aa-toplevel,v 1.10 2013/01/07 21:12:15 ryoon Exp $
          #include <resolv.h>
          ],
          [int foo = res_ninit(&_res);],
+@@ -4990,12 +4999,13 @@ dnl If using sydneyaudio with Linux, ens
+ if test -n "$MOZ_SYDNEYAUDIO"; then
+    case "$target_os" in
+ linux*)
+-      PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
++      PKG_CHECK_MODULES(MOZ_ALSA, alsa, MOZ_ALSA=1,
+          [echo "$MOZ_ALSA_PKG_ERRORS"
+           AC_MSG_ERROR([Need alsa for Ogg or Wave decoding on Linux.  Disable with --disable-ogg --disable-wave.])])
+       ;;
+    esac
+ fi
++AC_SUBST(MOZ_ALSA)
+ AC_SUBST(MOZ_ALSA_LIBS)
+ 
+ dnl ========================================================