rpms/audacity-freeworld/F-14 audacity-1.3.12-portmixer-configure-from-trunk.patch, NONE, 1.1 audacity-freeworld.spec, 1.16, 1.17

[David Timms]

Author: dtimms

Update of /cvs/free/rpms/audacity-freeworld/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20616

Modified Files:
	audacity-freeworld.spec 
Added Files:
	audacity-1.3.12-portmixer-configure-from-trunk.patch 
Log Message:
fix build failure due to portmixer configure problems


audacity-1.3.12-portmixer-configure-from-trunk.patch:
 configure.ac |   63 +++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 38 insertions(+), 25 deletions(-)

--- NEW FILE audacity-1.3.12-portmixer-configure-from-trunk.patch ---
diff -ur audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac audacity-src-1.3.12-beta/lib-src/portmixer/configure.ac
--- audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac	2010-03-30 22:29:47.000000000 +1100
+++ audacity-src-1.3.12-beta/lib-src/portmixer/configure.ac	2010-10-31 22:52:50.000000000 +1100
@@ -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
 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
-
 if [[ $have_support = "no" ]] ; then
    AC_MSG_ERROR("Your version of portaudio does not include required functions"); 
 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(---------------------------------------);


Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-14/audacity-freeworld.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- audacity-freeworld.spec	31 Oct 2010 02:24:52 -0000	1.16
+++ audacity-freeworld.spec	31 Oct 2010 12:30:51 -0000	1.17
@@ -1,7 +1,7 @@
 Name: audacity-freeworld
 
 Version: 1.3.12
-Release: 0.8.beta%{?dist}
+Release: 0.9.beta%{?dist}
 Summary: Multitrack audio editor
 Group:   Applications/Multimedia
 License: GPLv2
@@ -25,6 +25,7 @@
 # ffmpeg-0.6: utils.c changed match_ext() to av_match_ext(). 
 Patch4: audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch
 Patch7: audacity-1.3.12-fix-minimum-playspeed.patch
+Patch8: audacity-1.3.12-portmixer-configure-from-trunk.patch
 
 Provides: audacity-nonfree = %{version}-%{release}
 Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -83,6 +84,7 @@
 %patch4 -p1 -b .ffmpeg-0.6-apichange-av_match_ext
 
 %patch7 -p1 -b .fix-minimum-playspeed
+%patch8 -p1 -b .portmixer-configure-from-trunk
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -159,6 +161,9 @@
 
 
 %changelog
+* Mon Oct 31 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.9.beta
+- fix build failure due to portmixer configure problems
+
 * Mon Oct 31 2010 David Timms <iinet.net.au at dtimms> - 1.3.12-0.8.beta
 - fix hang when play at speed with ratio less than 0.09 is used (#637347)