[arch-commits] Commit in audacity/repos (6 files)
Eric Belanger
eric at archlinux.org
Mon Jul 21 02:36:06 UTC 2008
Date: Sunday, July 20, 2008 @ 22:36:06
Author: eric
Revision: 5814
Merged revisions 2-5813 via svnmerge from
svn+ssh://svn.archlinux.org/home/svn-packages/audacity/trunk
........
r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
Added svn:keywords to all PKGBUILDs
........
r5813 | eric | 2008-07-20 22:35:52 -0400 (Sun, 20 Jul 2008) | 2 lines
upgpkg: audacity 1.3.5-1
upstream update, build against wxgkt 2.8 instead of wxgtk-2.6, removed old patches
........
Modified:
audacity/repos/extra-x86_64/ (properties)
audacity/repos/extra-x86_64/PKGBUILD
Deleted:
audacity/repos/extra-x86_64/audacity-1.3.2-desktopentry.patch
audacity/repos/extra-x86_64/audacity-1.3.2-disable-optimization.patch
audacity/repos/extra-x86_64/audacity-1.3.2-no-msse.patch
audacity/repos/extra-x86_64/audacity-1.3.3+flac-1.1.3.patch
-------------------------------------------+
PKGBUILD | 23 ++---
audacity-1.3.2-desktopentry.patch | 10 --
audacity-1.3.2-disable-optimization.patch | 11 --
audacity-1.3.2-no-msse.patch | 11 --
audacity-1.3.3+flac-1.1.3.patch | 121 ----------------------------
5 files changed, 11 insertions(+), 165 deletions(-)
Property changes on: audacity/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
- /audacity/trunk:1
+ /audacity/trunk:1-5813
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2008-07-21 02:35:52 UTC (rev 5813)
+++ extra-x86_64/PKGBUILD 2008-07-21 02:36:06 UTC (rev 5814)
@@ -2,25 +2,31 @@
# Maintainer: Alexander Baldeck <alexander at archlinux.org>
# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
# Contributor: dorphell <dorphell at archlinux.org>
+
pkgname=audacity
-pkgver=1.3.4
+pkgver=1.3.5
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' \
+url="http://audacity.sourceforge.net/"
+license=('GPL')
+depends=('libvorbis' 'libmad' 'libid3tag' 'wxgtk' 'flac' 'libsamplerate' \
'lame' 'shared-mime-info')
makedepends=('zip' 'python' 'pkgconfig')
-license=('GPL')
options=('!makeflags')
source=(http://downloads.sourceforge.net/sourceforge/audacity/${pkgname}-src-${pkgver}.tar.bz2 \
audacity.xpm
audacity16.xpm)
-url="http://audacity.sourceforge.net/"
+md5sums=('b15503c331e7145942fa0e4b27760d61' 'c8f7f7851638eedf84d05a1afde797b2'\
+ '5e94ccbfb665e8356dc4172a3673b4d4')
+sha1sums=('6ff24769fdef7bb0db7702eecb128f242fc85fce'
+ 'a2b6626cd1cdcd9facb262116804d9349e1e6144'
+ 'a208a4ed129c73f97347bab929c7758a345e8e9a')
build() {
cd ${startdir}/src/${pkgname}-src-${pkgver}-beta
- WX_CONFIG=/usr/bin/wx-config-2.6 \
+ WX_CONFIG=/usr/bin/wx-config \
./configure --prefix=/usr \
--with-portaudio=v19 \
--with-libsamplerate=system \
@@ -40,10 +46,3 @@
install -m644 ${startdir}/src/audacity16.xpm \
${startdir}/pkg/usr/share/${pkgname}/audacity16.xpm
}
-md5sums=('6c4ada9085f916b5ae1675eaa4754442'
- 'a0f597abfd605b0e8c2d0e683c93cd66'
- '94db7bade2576db7f3154d3f3a0326e5'
- '02554130e92dcceb574954c71fcc7be9'
- '82e2af0f2cd1005a237ecfd3095dd070'
- 'c8f7f7851638eedf84d05a1afde797b2'
- '5e94ccbfb665e8356dc4172a3673b4d4')
Deleted: extra-x86_64/audacity-1.3.2-desktopentry.patch
===================================================================
--- extra-x86_64/audacity-1.3.2-desktopentry.patch 2008-07-21 02:35:52 UTC (rev 5813)
+++ extra-x86_64/audacity-1.3.2-desktopentry.patch 2008-07-21 02:36:06 UTC (rev 5814)
@@ -1,10 +0,0 @@
-Index: audacity-src-1.3.2-beta/src/audacity.desktop
-===================================================================
---- audacity-src-1.3.2-beta.orig/src/audacity.desktop
-+++ audacity-src-1.3.2-beta/src/audacity.desktop
-@@ -1,4 +1,4 @@
--[Desktop Entry]
-+[Desktop Entry]
- Encoding=UTF-8
-
- Name=Audacity Sound Editor
Deleted: extra-x86_64/audacity-1.3.2-disable-optimization.patch
===================================================================
--- extra-x86_64/audacity-1.3.2-disable-optimization.patch 2008-07-21 02:35:52 UTC (rev 5813)
+++ extra-x86_64/audacity-1.3.2-disable-optimization.patch 2008-07-21 02:36:06 UTC (rev 5814)
@@ -1,11 +0,0 @@
-diff -Naur audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h
---- audacity-src-1.3.2-beta.orig/lib-src/soundtouch/include/STTypes.h 2006-10-29 08:06:01.000000000 +0900
-+++ audacity-src-1.3.2-beta/lib-src/soundtouch/include/STTypes.h 2006-11-17 01:27:15.000000000 +0900
-@@ -92,7 +92,6 @@
- /// However, if you're having difficulties getting the optimized routines
- /// compiled with your compler (e.g. some gcc compiler versions may be picky),
- /// you may wish to disable the optimizations to make the library compile.
-- #define ALLOW_OPTIMIZATIONS 1
-
-
- // If defined, allows the SIMD-optimized routines to take minor shortcuts
Deleted: extra-x86_64/audacity-1.3.2-no-msse.patch
===================================================================
--- extra-x86_64/audacity-1.3.2-no-msse.patch 2008-07-21 02:35:52 UTC (rev 5813)
+++ extra-x86_64/audacity-1.3.2-no-msse.patch 2008-07-21 02:36:06 UTC (rev 5814)
@@ -1,11 +0,0 @@
---- lib-src/soundtouch/source/SoundTouch/Makefile.am.old 2006-11-02 13:30:00.000000000 +0900
-+++ lib-src/soundtouch/source/SoundTouch/Makefile.am 2006-11-02 13:30:12.000000000 +0900
-@@ -35,7 +35,7 @@
-
- # ??? test for -fcheck-new in configure.ac
- # other compiler flags to add
--AM_CXXFLAGS=-O3 -msse -fcheck-new -I../../include
-+AM_CXXFLAGS=-fcheck-new -I../../include
-
- # other linking flags to add
- #libSoundTouch_la_LIBADD=
Deleted: extra-x86_64/audacity-1.3.3+flac-1.1.3.patch
===================================================================
--- extra-x86_64/audacity-1.3.3+flac-1.1.3.patch 2008-07-21 02:35:52 UTC (rev 5813)
+++ extra-x86_64/audacity-1.3.3+flac-1.1.3.patch 2008-07-21 02:36:06 UTC (rev 5814)
@@ -1,121 +0,0 @@
-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