From 869dbdc0f332d1b9e189505773cdcf1e6624e0ab Mon Sep 17 00:00:00 2001
From: Manuel F Martinez <manuel@bronze.bashlinux.com>
Date: Dec 07 2010 10:25:11 +0000
Subject: Updated portmixer-patch


---

diff --git a/audacity-1.3.12-beta-portmixer.patch b/audacity-1.3.12-beta-portmixer.patch
index 47a5b61..61fbebf 100644
--- a/audacity-1.3.12-beta-portmixer.patch
+++ b/audacity-1.3.12-beta-portmixer.patch
@@ -1,92 +1,29 @@
---- audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac	2010-03-30 04:29:47.000000000 -0700
-+++ audacity-src-1.3.12-beta/lib-src/portmixer/configure.ac	2010-12-07 01:36:29.000000000 -0800
-@@ -49,34 +49,57 @@
- fi
- 
- #
-+# Check which APIs are available
-+#
-+
-+have_oss=no
-+AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
-+
-+AC_CHECK_HEADER(alsa/asoundlib.h, have_alsa=yes, have_alsa=no)
-+AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
-+AC_CHECK_HEADER(windows.h, have_windows=yes, have_windows=no)
-+
-+#
- # Make sure the support is there
- #
- have_support=yes
--AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
--		AC_MSG_WARN("Missing support in pa_win_ds.h");
--fi
--AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
-+
-+if [[ $have_alsa = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaAlsa_GetStreamInputCard], [pa_linux_alsa.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in pa_linux_alsa.h");
-+	fi
+diff -urp audacity-src-1.3.12-beta.org/lib-src/portmixer/configure.ac audacity-src-1.3.12-beta/lib-src/portmixer/configure.ac
+--- audacity-src-1.3.12-beta.org/lib-src/portmixer/configure.ac	2010-09-30 16:19:28.000000000 +0200
++++ audacity-src-1.3.12-beta/lib-src/portmixer/configure.ac	2010-09-30 16:21:49.000000000 +0200
+@@ -64,10 +64,6 @@ AC_EGREP_HEADER([PaWinMME_GetStreamInput
+ if [[ $have_support = "no" ]] ; then
+ 		AC_MSG_WARN("Missing support in pa_win_wmme.h");
  fi
--AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
--		AC_MSG_WARN("Missing support in pa_win_wmme.h");
--fi
 -AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
 -if [[ $have_support = "no" ]] ; then
-+
-+if [[ $have_coreaudio = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in pa_mac_core.h");
-+	fi
- fi
--AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
--if [[ $have_support = "no" ]] ; then
-+
-+if [[ $have_oss = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in pa_unix_oss.h");
-+	fi
-+fi
-+
-+if [[ $have_windows = "yes" ]] ; then
-+	AC_EGREP_HEADER([PaWinDS_GetStreamInputGUID], [pa_win_ds.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
-+		AC_MSG_WARN("Missing support in pa_win_ds.h");
-+	fi
-+	AC_EGREP_HEADER([PaWinMME_GetStreamInputHandle], [pa_win_wmme.h], , [have_support=no])
-+	if [[ $have_support = "no" ]] ; then
-+		AC_MSG_WARN("Missing support in pa_win_wmme.h");
-+	fi
- fi
-+
- AC_EGREP_HEADER([Pa_GetStreamHostApiType], [portaudio.h], , [have_support=no])
- if [[ $have_support = "no" ]] ; then
- 		AC_MSG_WARN("Missing support in portaudio.h");
- fi
--
+-		AC_MSG_WARN("Missing support in pa_mac_core.h");
+-fi
+ AC_EGREP_HEADER([PaOSS_GetStreamInputDevice], [pa_unix_oss.h], , [have_support=no])
  if [[ $have_support = "no" ]] ; then
-    AC_MSG_ERROR("Your version of portaudio does not include required functions"); 
+ 		AC_MSG_WARN("Missing support in pa_unix_oss.h");
+@@ -115,6 +111,14 @@ if [[ $have_alsa = "yes" -a "x$with_alsa
  fi
-@@ -88,16 +111,6 @@
- AC_SUBST( objects, [px_mixer.o] )
  
- #
--# Check which APIs are available
--#
--
--have_oss=no
--AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h machine/soundcard.h], have_oss=yes)
--
--AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
--AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
--
--#
- # Set up to use the identified ones
- #
- AC_MSG_NOTICE(---------------------------------------);
+ if [[ $have_coreaudio = "yes" ]] ; then
++   have_support=yes
++   AC_EGREP_HEADER([PaMacCore_GetStreamInputDevice], [pa_mac_core.h], , [have_support=no])
++   if [[ $have_support = "no" ]] ; then
++		AC_MSG_WARN("Missing support in pa_mac_core.h");
++   fi
++   if [[ $have_support = "no" ]] ; then
++		 AC_MSG_ERROR("Your version of portaudio does not include required functions"); 
++   fi
+    AC_MSG_NOTICE(Including support for Coreaudio);
+    AC_DEFINE(PX_USE_MAC_COREAUDIO)
+    objects="$objects px_mac_coreaudio.o"