[gentoo-commits] gentoo-x86 commit in media-sound/audacity/files: audacity-1.3.12-automagic.patch audacity-1.3.12-gcc45.patch

[Ryan Hill (dirtyepic)]

dirtyepic    10/10/04 08:52:58

  Modified:             audacity-1.3.12-automagic.patch
  Added:                audacity-1.3.12-gcc45.patch
  Log:
  Add patch from upstream to fix configure error w/ GCC 4.5 (bug #322145 by
  Bartosz Brachaczek/Thomas Pfaff). Tweak automagic patch to avoid
  collision. Fix wxGTK DEPEND (bug #327801 by Arttu Valo).
  
  (Portage version: 2.2_rc88/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  media-sound/audacity/files/audacity-1.3.12-automagic.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/audacity/files/audacity-1.3.12-automagic.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/audacity/files/audacity-1.3.12-automagic.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/audacity/files/audacity-1.3.12-automagic.patch?r1=1.1&r2=1.2

Index: audacity-1.3.12-automagic.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/audacity/files/audacity-1.3.12-automagic.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacity-1.3.12-automagic.patch	12 Apr 2010 08:38:53 -0000	1.1
+++ audacity-1.3.12-automagic.patch	4 Oct 2010 08:52:58 -0000	1.2
@@ -1,7 +1,6 @@
-diff -ur ../audacity-src-1.3.12-beta.orig/configure.in ./configure.in
---- ../audacity-src-1.3.12-beta.orig/configure.in	2010-03-30 12:32:42.000000000 +0100
-+++ ./configure.in	2010-04-02 17:03:07.154028262 +0100
-@@ -559,6 +559,8 @@
+--- a/configure.in
++++ b/configure.in
+@@ -559,6 +559,8 @@ case "${host_os}" in
  esac
  
  dnl PortAudio configuration
@@ -10,7 +9,7 @@
  
  LOCAL_LIBS="$LOCAL_LIBS portaudio-v19/lib/libportaudio.a"
  EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio-v19/lib/libportaudio.a"
-@@ -575,13 +577,21 @@
+@@ -575,13 +577,21 @@ case "${host_os}" in
        ;;
     *)
        dnl Unix
@@ -39,19 +38,18 @@
        fi
        AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
        if [[ $have_asihpi = "yes" ]] ; then
-Only in .: configure.in.orig
-diff -ur ../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac ./lib-src/portmixer/configure.ac
---- ../audacity-src-1.3.12-beta.orig/lib-src/portmixer/configure.ac	2010-03-30 12:29:47.000000000 +0100
-+++ ./lib-src/portmixer/configure.ac	2010-04-02 17:03:07.154028262 +0100
-@@ -97,6 +97,7 @@
- AC_CHECK_HEADER(alsa/asoundlib.h,  have_alsa=yes, have_alsa=no)
- AC_CHECK_HEADER(CoreAudio/CoreAudio.h, have_coreaudio=yes, have_coreaudio=no)
+--- a/lib-src/portmixer/configure.ac
++++ b/lib-src/portmixer/configure.ac
+@@ -31,6 +31,8 @@ AC_ARG_ENABLE([debug],
+   [AC_SUBST( cflags, ["$cflags -g"] )  AC_MSG_RESULT(yes)],
+   [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
  
 +AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
++
  #
- # Set up to use the identified ones
+ # Check for portaudio path
  #
-@@ -107,7 +108,7 @@
+@@ -107,7 +109,7 @@ if [[ $have_oss = "yes" ]] ; then
     objects="$objects px_unix_oss.o"
  fi
  
@@ -60,4 +58,3 @@
     AC_MSG_NOTICE(Including support for ALSA);
     AC_DEFINE(PX_USE_LINUX_ALSA)
     objects="$objects px_linux_alsa.o"
-Only in ./lib-src/portmixer: configure.ac.orig



1.1                  media-sound/audacity/files/audacity-1.3.12-gcc45.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/audacity/files/audacity-1.3.12-gcc45.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/audacity/files/audacity-1.3.12-gcc45.patch?rev=1.1&content-type=text/plain

Index: audacity-1.3.12-gcc45.patch
===================================================================
https://bugs.gentoo.org/322145
http://bugzilla.audacityteam.org/show_bug.cgi?id=221

--- lib-src/portmixer/configure.ac
+++ lib-src/portmixer/configure.ac
@@ -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(---------------------------------------);