Updated audacity to 1.2.6.

Changes since 1.2.4:

Changes in 1.2.6:

  * Fix memory leaks on Windows.

  * Correct font size problems.

  * Enable missing FLAC support.

Changes in 1.2.5:

  * An official Intel Mac version is now available.

  * Fixed bug in Generate Silence which caused it to apply to all tracks
    instead of just the selected ones.

  * Mac OS X: audio device opening code has been rewritten.  First, it
    is much more conservative about changing device settings; it will
    not change settings when you open the program or close the
    preferences dialog anymore, and it will not change the settings when
    you begin playback/recording if the current settings are adequate.
    When it does change the settings, it should work much better on
    devices such as the Griffin iMic, ART USB Phono Plus,
    and Ion iMX02 USB.

  * Mac OS X: added new Audio I/O preference that lets you tell Audacity
    to never change any audio device settings.

  * Newer libsndfile supports FLAC import and export

  * Updated soundtouch to current version which is faster and better quality

  * Modified configure script prefers system libraries to local copies to
    reduce compilation times and memory usage.

  * Minor updates to help files.

  * New or updated translations: Bulgarian (bg), Galician (gl),
    Traditional Chinese (zh_TW), Simplified Chinese (zh), Slovenian (sl),
    Swedish (sv), Bangladeshi (bn), Slovakian (sk), Romanian (ro),
    Lithuanian (lt), Welsh (cy), and Turkish (tr).

8 files changed, 72 insertions, 81 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 9548e2f3959..ad36e29700d 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2007/02/22 19:30:02 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2007/02/23 03:27:40 rillig Exp $
 
-DISTNAME=	audacity-src-1.2.4b
-PKGNAME=	audacity-1.2.4b
-PKGREVISION=	4
+DISTNAME=	audacity-src-1.2.6
+PKGNAME=	audacity-1.2.6
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=audacity/}
 
@@ -14,7 +13,7 @@ DEPENDS+=	zip>=0.0:../../archivers/zip
 
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		autoconf gmake msgfmt
+USE_TOOLS+=		autoconf gmake msgfmt pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-xaudio
@@ -29,6 +28,8 @@ CONFIG_GUESS_OVERRIDE=		\
 CONFIG_SUB_OVERRIDE=		\
 	config.sub */config.sub */*/config.sub */*/*/config.sub
 
+PTHREAD_AUTO_VARS=	yes
+
 .include "../../audio/lame/buildlink3.mk"
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
@@ -36,9 +37,10 @@ CONFIG_SUB_OVERRIDE=		\
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../x11/wxGTK/buildlink3.mk"
+.include "../../x11/wxGTK24/buildlink3.mk"
 
 .include "../../mk/oss.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # XXX Internal compiler error with -O2
diff --git a/audio/audacity/PLIST b/audio/audacity/PLIST
index 54deaea1091..03aca332953 100644
--- a/audio/audacity/PLIST
+++ b/audio/audacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/04/17 07:07:11 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/02/23 03:27:40 rillig Exp $
 bin/audacity
 man/man1/audacity.1
 share/audacity/audacity-1.2-help.htb
@@ -31,10 +31,13 @@ share/audacity/plug-ins/pluck.ny
 share/audacity/plug-ins/tremolo.ny
 share/doc/audacity/LICENSE.txt
 share/doc/audacity/README.txt
+share/locale/af/LC_MESSAGES/audacity.mo
 share/locale/ar/LC_MESSAGES/audacity.mo
 share/locale/bg/LC_MESSAGES/audacity.mo
+share/locale/bn/LC_MESSAGES/audacity.mo
 share/locale/ca/LC_MESSAGES/audacity.mo
 share/locale/cs/LC_MESSAGES/audacity.mo
+share/locale/cy/LC_MESSAGES/audacity.mo
 share/locale/da/LC_MESSAGES/audacity.mo
 share/locale/de/LC_MESSAGES/audacity.mo
 share/locale/el/LC_MESSAGES/audacity.mo
@@ -43,6 +46,7 @@ share/locale/eu/LC_MESSAGES/audacity.mo
 share/locale/fi/LC_MESSAGES/audacity.mo
 share/locale/fr/LC_MESSAGES/audacity.mo
 share/locale/ga/LC_MESSAGES/audacity.mo
+share/locale/gl/LC_MESSAGES/audacity.mo
 share/locale/hu/LC_MESSAGES/audacity.mo
 share/locale/it/LC_MESSAGES/audacity.mo
 share/locale/ja/LC_MESSAGES/audacity.mo
@@ -52,9 +56,12 @@ share/locale/nb/LC_MESSAGES/audacity.mo
 share/locale/nl/LC_MESSAGES/audacity.mo
 share/locale/pl/LC_MESSAGES/audacity.mo
 share/locale/pt/LC_MESSAGES/audacity.mo
+share/locale/ro/LC_MESSAGES/audacity.mo
 share/locale/ru/LC_MESSAGES/audacity.mo
+share/locale/sk/LC_MESSAGES/audacity.mo
 share/locale/sl/LC_MESSAGES/audacity.mo
 share/locale/sv/LC_MESSAGES/audacity.mo
+share/locale/tr/LC_MESSAGES/audacity.mo
 share/locale/uk/LC_MESSAGES/audacity.mo
 share/locale/zh/LC_MESSAGES/audacity.mo
 share/locale/zh_TW/LC_MESSAGES/audacity.mo
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index d59d41c0d68..6831bd73d6b 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.14 2006/07/05 19:02:21 wiz Exp $
+$NetBSD: distinfo,v 1.15 2007/02/23 03:27:40 rillig Exp $
 
-SHA1 (audacity-src-1.2.4b.tar.gz) = cc159cbda4647af91460a1785db2bfa6a1ab9760
-RMD160 (audacity-src-1.2.4b.tar.gz) = 4c6609b200a86ff081ecaa1789525404031563d6
-Size (audacity-src-1.2.4b.tar.gz) = 4499894 bytes
+SHA1 (audacity-src-1.2.6.tar.gz) = 1bfdd119fdc09d1aa334aee21d4831ef6e939fce
+RMD160 (audacity-src-1.2.6.tar.gz) = f59ca075ae430a518b77ce2ed08441abe2b67a0c
+Size (audacity-src-1.2.6.tar.gz) = 4882379 bytes
 SHA1 (patch-aa) = 5494f3fb6035f15a4447556f8cf4a0a2404a2259
 SHA1 (patch-ab) = 8630488f5a89b1542ac2a9f01080c36f1eac7c7d
 SHA1 (patch-ac) = 00698c284e513e20f28ac536b206139ad87ab6d2
 SHA1 (patch-ad) = 820e5321a6558063d04ee8da11fc606d59e33046
-SHA1 (patch-ae) = 8e22a7a8ce064c8877323e44ffd07286fe3ea02f
-SHA1 (patch-af) = 54450e915cabde52e4276196d6eb8da331c8eedd
+SHA1 (patch-ae) = 628a6353b37418d182f3edd9f26bcea7b5f779d4
+SHA1 (patch-af) = 65b23fef2d842f4b9a1bef2723f4c020e2e0dcee
 SHA1 (patch-ag) = 68bcbd932cd4440bc9090c6afc369cfcae54a16b
 SHA1 (patch-ah) = fa0c240f7e20299a6ed26692d443dfb95c0b7eb9
-SHA1 (patch-ai) = 5b1f83ee02970cd7d24cc31e8a59fddbb0f55dd7
+SHA1 (patch-ai) = 625cd6337d8a246d1a9c388279efa0ade34a2093
 SHA1 (patch-aj) = 34b4cdd266345f04954983cc14e4b762f09f4df8
-SHA1 (patch-ak) = 23a2a2e2bee41922cc8383b685c1da72d375f49e
-SHA1 (patch-al) = b2e701ae5cb341b7d3946703f0178f1b6071dca9
diff --git a/audio/audacity/patches/patch-ae b/audio/audacity/patches/patch-ae
index ad849c0d6af..111e85122ba 100644
--- a/audio/audacity/patches/patch-ae
+++ b/audio/audacity/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.5 2004/04/20 18:02:16 ben Exp $
+$NetBSD: patch-ae,v 1.6 2007/02/23 03:27:41 rillig Exp $
 
---- configure.in.orig	Sat Feb 28 11:19:39 2004
-+++ configure.in
+--- configure.in.orig	2005-11-27 03:33:31.000000000 +0100
++++ configure.in	2007-02-23 02:06:19.000000000 +0100
 @@ -556,8 +556,8 @@ if [[ "$use_portaudio" = "v19" ]] ; then
  
  	AC_CONFIG_SUBDIRS([[lib-src/portaudio-v19]])
@@ -13,24 +13,10 @@ $NetBSD: patch-ae,v 1.5 2004/04/20 18:02:16 ben Exp $
  	CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
  
  	case "${host_os}" in
-@@ -625,6 +625,81 @@ else
+@@ -639,6 +639,81 @@ else
  
- 		BUILDLIBS="$BUILDLIBS portaudio/pa_unix_oss/portaudio.a"
- 		EXTRAOBJS="$EXTRAOBJS ../lib-src/portaudio/pa_unix_oss/portaudio.a"
-+
-+	   if [[ "$use_portmixer" = "yes" ]] ; then
-+			BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
-+			EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"		
-+	   fi
-+
-+		if [[ "$use_ladspa" = "default" ]] ; then
-+			use_ladspa="yes";
-+		fi
-+
-+		AFTERBUILD=""
-+
-+	esac
-+fi
+ 	esac
+ fi
 +if [[ "$use_portaudio" = "system" ]] ; then
 +
 +	LIBS="$LIBS -lportaudio"
@@ -92,6 +78,20 @@ $NetBSD: patch-ae,v 1.5 2004/04/20 18:02:16 ben Exp $
 +		dnl Unix OSS configuration
 +
 +		CONFIGHEADER="configunix.h"
++
++	   if [[ "$use_portmixer" = "yes" ]] ; then
++			BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
++			EXTRAOBJS="$EXTRAOBJS ../lib-src/portmixer/px_unix_oss/portmixer.a"		
++	   fi
++
++		if [[ "$use_ladspa" = "default" ]] ; then
++			use_ladspa="yes";
++		fi
++
++		AFTERBUILD=""
++
++	esac
++fi
+ 
+ use_precomp="no"
  
- 	   if [[ "$use_portmixer" = "yes" ]] ; then
- 			BUILDLIBS="$BUILDLIBS portmixer/px_unix_oss/portmixer.a"
diff --git a/audio/audacity/patches/patch-af b/audio/audacity/patches/patch-af
index 54470d0f0ca..33287e47abe 100644
--- a/audio/audacity/patches/patch-af
+++ b/audio/audacity/patches/patch-af
@@ -1,8 +1,14 @@
-$NetBSD: patch-af,v 1.4 2004/11/22 16:36:31 adam Exp $
+$NetBSD: patch-af,v 1.5 2007/02/23 03:27:41 rillig Exp $
 
---- configure.orig	2004-11-18 06:17:29.000000000 +0000
-+++ configure
-@@ -6118,7 +6118,8 @@ fi
+The CPPFLAGS and LIBS from wx-config had been set too early in the
+configure file, so that they were taken into the AC_CONFIG_SUBDIRS
+directories. Some of these directories only use a C compiler for
+linking, which of course caused problems with the wx* libraries, which
+are C++.
+
+--- configure.orig	2006-11-15 05:12:13.000000000 +0100
++++ configure	2007-02-23 04:17:41.000000000 +0100
+@@ -6586,7 +6586,8 @@ fi
  subdirs="$subdirs lib-src/portaudio-v19"
  
  
@@ -12,7 +18,7 @@ $NetBSD: patch-af,v 1.4 2004/11/22 16:36:31 adam Exp $
  
  	CXXFLAGS="-I../lib-src/portaudio/pa_common $CXXFLAGS"
  
-@@ -6204,6 +6205,84 @@ _ACEOF
+@@ -6672,6 +6673,84 @@ _ACEOF
  
  	esac
  fi
@@ -97,3 +103,12 @@ $NetBSD: patch-af,v 1.4 2004/11/22 16:36:31 adam Exp $
  
  use_precomp="no"
  
+@@ -7518,6 +7597,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
diff --git a/audio/audacity/patches/patch-ai b/audio/audacity/patches/patch-ai
index d6861f62910..2760e1834f8 100644
--- a/audio/audacity/patches/patch-ai
+++ b/audio/audacity/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2006/05/09 08:01:07 rillig Exp $
+$NetBSD: patch-ai,v 1.5 2007/02/23 03:27:41 rillig Exp $
 
---- lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp.orig	2005-07-22 17:07:42.000000000 +0000
-+++ lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp
-@@ -83,6 +83,7 @@ uint detectCPUextensions(void)
+--- lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp.orig	2006-11-15 05:12:11.000000000 +0100
++++ lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp	2007-02-23 03:25:18.000000000 +0100
+@@ -80,6 +80,7 @@ uint detectCPUextensions(void)
      if (_dwDisabledISA == 0xffffffff) return 0;

  

      asm volatile(

@@ -10,16 +10,11 @@ $NetBSD: patch-ai,v 1.4 2006/05/09 08:01:07 rillig Exp $
          "\n\txor     %%esi, %%esi"       // clear %%esi = result register

          // check if 'cpuid' instructions is available by toggling eflags bit 21

  

-@@ -131,10 +132,11 @@ uint detectCPUextensions(void)
+@@ -128,6 +129,7 @@ uint detectCPUextensions(void)
      "\n\tend:"

  

          "\n\tmov     %%esi, %0"

-+	"\n\tpopl   %%ebx"
++	"\n\tpopl    %%ebx"
  

-       : "=rm" (res)

+       : "=r" (res)

        : /* no inputs */

--      : "%edx", "%eax", "%ecx", "%ebx", "%esi" );

-+      : "%edx", "%eax", "%ecx", "%esi" );

-       

-     return res & ~_dwDisabledISA;

- #endif

diff --git a/audio/audacity/patches/patch-ak b/audio/audacity/patches/patch-ak
deleted file mode 100644
index 1849700ef9d..00000000000
--- a/audio/audacity/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2006/06/21 18:09:28 drochner Exp $
-
---- src/effects/ToneGen.cpp.orig	2006-06-21 12:45:24.000000000 +0200
-+++ src/effects/ToneGen.cpp
-@@ -265,7 +265,7 @@ wxSizer *CreateToneGenDialog(wxWindow * 
-    item2->Add(item3, 0, wxALIGN_CENTRE | wxALL, 5);
- 
-    wxChoice *item4 = new wxChoice(parent, ID_WAVEFORM, wxDefaultPosition,
--                                  wxSize(80, -1), 0, NULL);
-+                                  wxSize(80, -1), 0, NULL, 0);
-    item2->Add(item4, 0, wxALIGN_CENTRE | wxALL, 5);
- 
-    item0->Add(item2, 1, wxALIGN_CENTRE | wxALL, 5);
diff --git a/audio/audacity/patches/patch-al b/audio/audacity/patches/patch-al
deleted file mode 100644
index 5cd183b9109..00000000000
--- a/audio/audacity/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.3 2006/07/05 19:02:21 wiz Exp $
-
---- lib-src/soundtouch/include/SoundTouch.h.orig	2005-11-27 02:33:39.000000000 +0000
-+++ lib-src/soundtouch/include/SoundTouch.h
-@@ -146,7 +146,7 @@ public:
-     static const char *getVersionString();
- 
-     /// Get SoundTouch library version Id
--    static uint SoundTouch::getVersionId();
-+    static uint getVersionId();
- 
-     /// Sets new rate control value. Normal rate = 1.0, smaller values
-     /// represent slower rate, larger faster rates.