[arch-commits] CVS update of extra/multimedia/audacity (4 files)
Alexander Baldeck
alexander at archlinux.org
Wed May 23 08:28:19 UTC 2007
Date: Wednesday, May 23, 2007 @ 04:28:19
Author: alexander
Path: /home/cvs-extra/extra/multimedia/audacity
Added: audacity-1.3.3+flac-1.1.3.patch (1.1)
Modified: PKGBUILD (1.19 -> 1.20)
Removed: audacity-1.3.2+flac-1.1.3.patch (1.1)
audacity-1.3.2-libnyquistp.patch (1.1)
upgpkg: audacity 1.3.3
closes: FS#7223
----------------------------------+
PKGBUILD | 26 +++---
audacity-1.3.2+flac-1.1.3.patch | 138 -------------------------------------
audacity-1.3.2-libnyquistp.patch | 40 ----------
audacity-1.3.3+flac-1.1.3.patch | 121 ++++++++++++++++++++++++++++++++
4 files changed, 135 insertions(+), 190 deletions(-)
Index: extra/multimedia/audacity/PKGBUILD
diff -u extra/multimedia/audacity/PKGBUILD:1.19 extra/multimedia/audacity/PKGBUILD:1.20
--- extra/multimedia/audacity/PKGBUILD:1.19 Sun May 6 18:33:41 2007
+++ extra/multimedia/audacity/PKGBUILD Wed May 23 04:28:19 2007
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD,v 1.19 2007/05/06 22:33:41 dan Exp $
+# $Id: PKGBUILD,v 1.20 2007/05/23 08:28:19 alexander Exp $
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
# Maintainer: dorphell <dorphell at archlinux.org>
pkgname=audacity
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.3.3
+pkgrel=1
pkgdesc="Audacity is a program that lets you manipulate digital audio waveforms"
arch=(i686 x86_64)
depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk-2.6' 'flac' 'libsamplerate' \
'lame' 'shared-mime-info')
-makedepends=('zip' 'python')
+makedepends=('zip' 'python' 'pkgconfig')
+license=('GPL')
source=(http://dl.sourceforge.net/sourceforge/audacity/${pkgname}-src-${pkgver}.tar.gz \
- audacity-1.3.2+flac-1.1.3.patch \
+ audacity-1.3.3+flac-1.1.3.patch \
audacity-1.3.2-disable-optimization.patch \
audacity-1.3.2-no-msse.patch \
audacity-1.3.2-desktopentry.patch \
- audacity-1.3.2-libnyquistp.patch \
audacity.xpm
audacity16.xpm)
url="http://audacity.sourceforge.net/"
@@ -22,11 +22,10 @@
build() {
export MAKEFLAGS="-j1"
cd ${startdir}/src/${pkgname}-src-${pkgver}-beta
- patch -Np0 -i ${startdir}/src/audacity-1.3.2+flac-1.1.3.patch || return 1
+ patch -Np1 -i ${startdir}/src/audacity-1.3.3+flac-1.1.3.patch || return 1
patch -Np1 -i ${startdir}/src/audacity-1.3.2-disable-optimization.patch || return 1
patch -Np0 -i ${startdir}/src/audacity-1.3.2-no-msse.patch || return 1
patch -Np1 -i ${startdir}/src/audacity-1.3.2-desktopentry.patch || return 1
- patch -Np1 -i ${startdir}/src/audacity-1.3.2-libnyquistp.patch || return 1
aclocal
autoconf
@@ -52,7 +51,10 @@
install -m644 ${startdir}/src/audacity16.xpm \
${startdir}/pkg/usr/share/${pkgname}/audacity16.xpm
}
-md5sums=('bf63673140254f1283dfd55b61ff2422' '9a8818667ff40745e903ead0821b6d68'\
- '94db7bade2576db7f3154d3f3a0326e5' '02554130e92dcceb574954c71fcc7be9'\
- '82e2af0f2cd1005a237ecfd3095dd070' '77f59711ba16bde8252993f438cb82fc'\
- 'c8f7f7851638eedf84d05a1afde797b2' '5e94ccbfb665e8356dc4172a3673b4d4')
+md5sums=('72a9e3239f3b5af63030a1e1b07e40e7'
+ 'a0f597abfd605b0e8c2d0e683c93cd66'
+ '94db7bade2576db7f3154d3f3a0326e5'
+ '02554130e92dcceb574954c71fcc7be9'
+ '82e2af0f2cd1005a237ecfd3095dd070'
+ 'c8f7f7851638eedf84d05a1afde797b2'
+ '5e94ccbfb665e8356dc4172a3673b4d4')
Index: extra/multimedia/audacity/audacity-1.3.2+flac-1.1.3.patch
diff -u extra/multimedia/audacity/audacity-1.3.2+flac-1.1.3.patch:1.1 extra/multimedia/audacity/audacity-1.3.2+flac-1.1.3.patch:removed
--- extra/multimedia/audacity/audacity-1.3.2+flac-1.1.3.patch:1.1 Tue Apr 17 10:51:07 2007
+++ extra/multimedia/audacity/audacity-1.3.2+flac-1.1.3.patch Wed May 23 04:28:19 2007
@@ -1,138 +0,0 @@
-? src/export/2
-? src/export/makefile
-? src/import/2
-? src/import/makefile
-Index: acinclude.m4
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/acinclude.m4,v
-retrieving revision 1.17
-diff -u -r1.17 acinclude.m4
---- acinclude.m4 20 Oct 2006 10:31:59 -0000 1.17
-+++ acinclude.m4 20 Oct 2006 22:46:26 -0000
-@@ -463,7 +463,7 @@
- dnl See if FLAC is installed in the system
-
- AC_CHECK_LIB(FLAC,
-- FLAC__file_decoder_new,
-+ FLAC__stream_decoder_new,
- lib_found="yes",
- lib_found="no",
- -lFLAC++ -lFLAC)
-Index: src/export/ExportFLAC.cpp
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/src/export/ExportFLAC.cpp,v
-retrieving revision 1.9
-diff -u -r1.9 ExportFLAC.cpp
---- src/export/ExportFLAC.cpp 23 Sep 2006 02:26:41 -0000 1.9
-+++ src/export/ExportFLAC.cpp 20 Oct 2006 22:46:32 -0000
-@@ -41,6 +41,13 @@
-
- #define SAMPLES_PER_RUN 8192
-
-+/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
-+#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- bool ExportFLAC(AudacityProject *project,
- int numChannels, wxString fName,
- bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec)
-@@ -58,7 +65,9 @@
- gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
-
- FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
-+#ifdef LEGACY_FLAC
- encoder->set_filename(OSFILENAME(fName));
-+#endif
- encoder->set_channels(numChannels);
- encoder->set_sample_rate(int(rate + 0.5));
-
-@@ -72,7 +81,11 @@
- format=int16Sample;
- encoder->set_bits_per_sample(16);
- }
-- encoder->init();
-+#ifdef LEGACY_FLAC
-+ encoder->init(); // really should check the return value here...
-+#else
-+ encoder->init(OSFILENAME(fName)); // really should check the return value here...
-+#endif
-
- int numWaveTracks;
- WaveTrack **waveTracks;
-@@ -129,7 +142,7 @@
- return !cancelling;
- }
-
--#endif // USE_LIBVORBIS
-+#endif // USE_LIBFLAC
-
-
- // Indentation settings for Vim and Emacs and unique identifier for Arch, a
-Index: src/import/ImportFLAC.cpp
-===================================================================
-RCS file: /cvsroot/audacity/audacity-src/src/import/ImportFLAC.cpp,v
-retrieving revision 1.16
-diff -u -r1.16 ImportFLAC.cpp
---- src/import/ImportFLAC.cpp 23 Sep 2006 02:26:55 -0000 1.16
-+++ src/import/ImportFLAC.cpp 20 Oct 2006 22:46:32 -0000
-@@ -63,6 +63,13 @@
- #include "../WaveTrack.h"
- #include "ImportPlugin.h"
-
-+/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
-+#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- class FLACImportFileHandle;
-
- class MyFLACFile : public FLAC::Decoder::File
-@@ -264,6 +271,7 @@
-
- bool FLACImportFileHandle::Init()
- {
-+#ifdef LEGACY_FLAC
- bool success = mFile->set_filename(OSFILENAME(mName));
- if (!success) {
- return false;
-@@ -272,11 +280,23 @@
- if (state != FLAC__FILE_DECODER_OK) {
- return false;
- }
-+#else
-+ if (mFile->init(OSFILENAME(mName)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
-+ return false;
-+ }
-+#endif
- mFile->process_until_end_of_metadata();
-+#ifdef LEGACY_FLAC
- state = mFile->get_state();
- if (state != FLAC__FILE_DECODER_OK) {
- return false;
- }
-+#else
-+ // not necessary to check state, error callback will catch errors, but here's how:
-+ if (mFile->get_state() > FLAC__STREAM_DECODER_READ_FRAME) {
-+ return false;
-+ }
-+#endif
- if (!mFile->is_valid() || mFile->get_was_error())
- {
- // This probably is not a FLAC file at all
-@@ -340,7 +360,11 @@
- mChannels[1]->SetTeamed(true);
- }
-
-+#ifdef LEGACY_FLAC
- mFile->process_until_end_of_file();
-+#else
-+ mFile->process_until_end_of_stream();
-+#endif
-
- *outTracks = new Track *[*outNumTracks];
- for(c = 0; c < *outNumTracks; c++) {
Index: extra/multimedia/audacity/audacity-1.3.2-libnyquistp.patch
diff -u extra/multimedia/audacity/audacity-1.3.2-libnyquistp.patch:1.1 extra/multimedia/audacity/audacity-1.3.2-libnyquistp.patch:removed
--- extra/multimedia/audacity/audacity-1.3.2-libnyquistp.patch:1.1 Tue Apr 17 10:51:07 2007
+++ extra/multimedia/audacity/audacity-1.3.2-libnyquistp.patch Wed May 23 04:28:19 2007
@@ -1,40 +0,0 @@
-diff -urd /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in
---- /tmp/audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in 2006-10-29 01:05:50.000000000 +0200
-+++ audacity-src-1.3.2-beta/lib-src/libnyquist/Makefile.in 2006-11-17 19:14:04.430148792 +0100
-@@ -338,16 +338,16 @@
- $(CC) -c tran/pluck.c -o tran/pluck.o $(CFLAGS)
-
- tran/abs.o: tran/abs.c tran/abs.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
-- cc -c tran/abs.c -o tran/abs.o $(CFLAGS)
-+ $(CC) -c tran/abs.c -o tran/abs.o $(CFLAGS)
-
- tran/sqrt.o: tran/sqrt.c tran/sqrt.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
-- cc -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
-+ $(CC) -c tran/sqrt.c -o tran/sqrt.o $(CFLAGS)
-
- tran/alpasscv.o: tran/alpasscv.c tran/alpasscv.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
-- cc -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
-+ $(CC) -c tran/alpasscv.c -o tran/alpasscv.o $(CFLAGS)
-
- tran/alpassvc.o: tran/alpassvc.c tran/alpassvc.h nyqsrc/sound.h nyqsrc/falloc.h nyqsrc/cque.h
-- cc -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
-+ $(CC) -c tran/alpassvc.c -o tran/alpassvc.o $(CFLAGS)
-
- nyqsrc/sndfnint.o: nyqsrc/sndfnint.c
- $(CC) -c nyqsrc/sndfnint.c -o nyqsrc/sndfnint.o $(CFLAGS)
-@@ -493,6 +493,14 @@
- nyqsrc/seqfnintptrs.h: $(CMTHDRS) misc/intgen
- $(INTGEN) nyqsrc/seqfnint $(CMTHDRS)
-
-+nyqsrc/sndfnintdefs.h : nyqsrc/sndfnintptrs.h
-+
-+nyqsrc/seqfnintdefs.h : nyqsrc/seqfnintptrs.h
-+
-+nyqsrc/sndfnint.c : nyqsrc/sndfnintptrs.h
-+
-+nyqsrc/seqfnint.c : nyqsrc/seqfnintptrs.h
-+
- clean:
- rm -f libnyquist.a
- cd misc; $(MAKE) clean
-
Index: extra/multimedia/audacity/audacity-1.3.3+flac-1.1.3.patch
diff -u /dev/null extra/multimedia/audacity/audacity-1.3.3+flac-1.1.3.patch:1.1
--- /dev/null Wed May 23 04:28:19 2007
+++ extra/multimedia/audacity/audacity-1.3.3+flac-1.1.3.patch Wed May 23 04:28:19 2007
@@ -0,0 +1,121 @@
+diff -Naur audacity-src-1.3.3-beta.orig/acinclude.m4 audacity-src-1.3.3-beta/acinclude.m4
+--- audacity-src-1.3.3-beta.orig/acinclude.m4 2007-05-18 13:56:02.000000000 +0900
++++ audacity-src-1.3.3-beta/acinclude.m4 2007-05-19 13:37:01.000000000 +0900
+@@ -479,7 +479,7 @@
+ dnl See if FLAC is installed in the system
+
+ AC_CHECK_LIB(FLAC,
+- FLAC__file_decoder_new,
++ FLAC__stream_decoder_new,
+ lib_found="yes",
+ lib_found="no",
+ -lFLAC++ -lFLAC)
+diff -Naur audacity-src-1.3.3-beta.orig/src/export/ExportFLAC.cpp audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp
+--- audacity-src-1.3.3-beta.orig/src/export/ExportFLAC.cpp 2007-05-18 13:55:50.000000000 +0900
++++ audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp 2007-05-19 13:41:16.000000000 +0900
+@@ -145,6 +145,13 @@
+
+ #define SAMPLES_PER_RUN 8192
+
++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ static struct
+ {
+ bool do_exhaustive_model_search;
+@@ -229,7 +236,9 @@
+ gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
+
+ FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
++#ifdef LEGACY_FLAC
+ encoder->set_filename(OSFILENAME(fName));
++#endif
+ encoder->set_channels(numChannels);
+ encoder->set_sample_rate(int(rate + 0.5));
+
+@@ -264,7 +273,11 @@
+ encoder->set_rice_parameter_search_dist(flacLevels[levelPref].rice_parameter_search_dist);
+ encoder->set_max_lpc_order(flacLevels[levelPref].max_lpc_order);
+
++#ifdef LEGACY_FLAC
+ encoder->init();
++#else
++ encoder->init(OSFILENAME(fName));
++#endif
+
+ int numWaveTracks;
+ WaveTrack **waveTracks;
+@@ -343,7 +356,7 @@
+ return new ExportFLAC();
+ }
+
+-#endif // USE_LIBVORBIS
++#endif // USE_LIBFLAC
+
+ // Indentation settings for Vim and Emacs and unique identifier for Arch, a
+ // version control system. Please do not modify past this point.
+diff -Naur audacity-src-1.3.3-beta.orig/src/import/ImportFLAC.cpp audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp
+--- audacity-src-1.3.3-beta.orig/src/import/ImportFLAC.cpp 2007-05-18 13:55:53.000000000 +0900
++++ audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp 2007-05-19 13:37:01.000000000 +0900
+@@ -63,6 +63,13 @@
+ #include "../WaveTrack.h"
+ #include "ImportPlugin.h"
+
++/* FLACPP_API_VERSION_CURRENT is 6 for libFLAC++ from flac-1.1.3 (see <FLAC++/export.h>) */
++#if !defined FLACPP_API_VERSION_CURRENT || FLACPP_API_VERSION_CURRENT < 6
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+ class FLACImportFileHandle;
+
+ class MyFLACFile : public FLAC::Decoder::File
+@@ -273,6 +280,7 @@
+
+ bool FLACImportFileHandle::Init()
+ {
++#ifdef LEGACY_FLAC
+ bool success = mFile->set_filename(OSFILENAME(mName));
+ if (!success) {
+ return false;
+@@ -281,11 +289,23 @@
+ if (state != FLAC__FILE_DECODER_OK) {
+ return false;
+ }
++#else
++ if (mFile->init(OSFILENAME(mName)) != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
++ return false;
++ }
++#endif
+ mFile->process_until_end_of_metadata();
++#ifdef LEGACY_FLAC
+ state = mFile->get_state();
+ if (state != FLAC__FILE_DECODER_OK) {
+ return false;
+ }
++#else
++ // not necessary to check state, error callback will catch errors, but here's how:
++ if (mFile->get_state() > FLAC__STREAM_DECODER_READ_FRAME) {
++ return false;
++ }
++#endif
+ if (!mFile->is_valid() || mFile->get_was_error())
+ {
+ // This probably is not a FLAC file at all
+@@ -349,7 +369,11 @@
+ mChannels[1]->SetTeamed(true);
+ }
+
++#ifdef LEGACY_FLAC
+ mFile->process_until_end_of_file();
++#else
++ mFile->process_until_end_of_stream();
++#endif
+
+ *outTracks = new Track *[*outNumTracks];
+ for(c = 0; c < *outNumTracks; c++) {
More information about the arch-commits
mailing list