Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b4390c1320583aad66cb751cde07cb31914688d7
commit b4390c1320583aad66cb751cde07cb31914688d7 Author: Miklos Vajna <[EMAIL PROTECTED]> Date: Wed Mar 26 20:54:16 2008 +0100 audacity-1.3.4-1-i686 - version bump - old patches are in upstream - added patch to build with gcc43 diff --git a/source/xapps-extra/audacity/FrugalBuild b/source/xapps-extra/audacity/FrugalBuild index a5507ea..c7b94f2 100644 --- a/source/xapps-extra/audacity/FrugalBuild +++ b/source/xapps-extra/audacity/FrugalBuild @@ -2,9 +2,11 @@ # Maintainer: VMiklos <[EMAIL PROTECTED]> pkgname=audacity -pkgver=1.3.3 -pkgrel=2 +pkgver=1.3.4 +pkgrel=1 pkgdesc="A program that lets you manipulate digital audio waveforms" +_F_sourceforge_sep="-src-" +_F_sourceforge_ext=".tar.bz2" Finclude sourceforge url="http://audacity.sourceforge.net/"; depends=('wxgtk>=2.8.7' 'libvorbis' 'libid3tag' 'libmad' 'libogg' \ @@ -15,9 +17,8 @@ makedepends=('zip') groups=('xapps-extra') archs=('i686' 'x86_64') options=('scriptlet') -source=(${source/$pkgname-/$pkgname-src-} audacity-1.3.3-flac-1.1.3.patch \ - fix-desktop-file-and-warnings.patch locale-DESTDIR.patch) up2date="Flasttar http://audacity.sourceforge.net/download/beta_source | sed 's/^src-//'" +source=($source gcc43.diff) build() @@ -42,8 +43,6 @@ build() Fmakeinstall Ffilerel images/AudacityLogo48x48.xpm /usr/share/$pkgname/$pkgname.xpm } -sha1sums=('1b52f0de736cb5903df3e4776530839bee26f567' \ - 'f845c8337e8287da8df608df42cdbfaf4862980c' \ - 'f28d053b5ce943d55b746c041bf2f7696eaea739' \ - 'efd1a76e78e5ff7986c6609a0dc001e924e29ca5') +sha1sums=('50ab6cf19545f8cb38226b96252dbd958e7d88c4' \ + 'f8ddd61c1169b7b9725a281d4038933430c6900e') # optimization OK diff --git a/source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch b/source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch deleted file mode 100644 index 11b1128..0000000 --- a/source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch +++ /dev/null @@ -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++) { diff --git a/source/xapps-extra/audacity/fix-desktop-file-and-warnings.patch b/source/xapps-extra/audacity/fix-desktop-file-and-warnings.patch deleted file mode 100644 index 819fb55..0000000 --- a/source/xapps-extra/audacity/fix-desktop-file-and-warnings.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Naur audacity-src-1.3.2-beta/src/audacity.desktop audacity-src-1.3.2-beta-p/src/audacity.desktop ---- audacity-src-1.3.2-beta/src/audacity.desktop 2006-10-29 01:05:29.000000000 +0200 -+++ audacity-src-1.3.2-beta-p/src/audacity.desktop 2007-02-19 22:04:25.000000000 +0100 -@@ -1,4 +1,4 @@ --[Desktop Entry] -+[Desktop Entry] - Encoding=UTF-8 - - Name=Audacity Sound Editor -@@ -8,13 +8,13 @@ - GenericName[de]=Audio-Editor - GenericName[ru]=РедакÑÐ¾Ñ Ð·Ð²ÑковÑÑ Ñайлов - Comment=Record and edit audio files --Comment[de]=Audio-Dateien aufnehmen und bearbeiten -+Comment[de]=Audio-Dateien aufnehmen und bearbeiten - Comment[ru]=ÐапиÑÑ Ð¸ ÑедакÑиÑование звÑковÑÑ Ñайлов -- -+ - Icon=/usr/share/audacity/audacity.xpm - - Type=Application --Categories=Application;AudioVideo;Audio;Multimedia; -+Categories=QT;GTK;Application;AudioVideo;Audio;Multimedia; - - Exec=audacity - StartupNotify=false diff --git a/source/xapps-extra/audacity/gcc43.diff b/source/xapps-extra/audacity/gcc43.diff new file mode 100644 index 0000000..f598d7d --- /dev/null +++ b/source/xapps-extra/audacity/gcc43.diff @@ -0,0 +1,31 @@ +--- ./lib-src/libvamp/vamp-sdk/PluginHostAdapter.h.orig 2008-03-26 16:54:38.000000000 +0100 ++++ ./lib-src/libvamp/vamp-sdk/PluginHostAdapter.h 2008-03-26 16:54:48.000000000 +0100 +@@ -41,6 +41,7 @@ + #include <vamp-sdk/Plugin.h> + + #include <vector> ++#include <cstdlib> + + namespace Vamp { + +--- ./lib-src/libvamp/vamp-sdk/PluginAdapter.h.orig 2008-03-26 16:52:08.000000000 +0100 ++++ ./lib-src/libvamp/vamp-sdk/PluginAdapter.h 2008-03-26 16:53:48.000000000 +0100 +@@ -42,6 +42,8 @@ + #include "Plugin.h" + + #include <map> ++#include <cstdlib> ++#include <cstring> + + namespace Vamp { + +--- ./lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h.orig 2008-03-26 16:55:16.000000000 +0100 ++++ ./lib-src/libvamp/vamp-sdk/hostext/PluginLoader.h 2008-03-26 16:55:26.000000000 +0100 +@@ -39,6 +39,7 @@ + + #include <vector> + #include <string> ++#include <cstring> + #include <map> + + #include "PluginWrapper.h" diff --git a/source/xapps-extra/audacity/locale-DESTDIR.patch b/source/xapps-extra/audacity/locale-DESTDIR.patch deleted file mode 100644 index 6b2e646..0000000 --- a/source/xapps-extra/audacity/locale-DESTDIR.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naurp audacity-src-1.3.2-beta/locale/Makefile.in audacity-src-1.3.2-beta-locale/locale/Makefile.in ---- audacity-src-1.3.2-beta/locale/Makefile.in 2006-10-29 01:06:04.000000000 +0200 -+++ audacity-src-1.3.2-beta-locale/locale/Makefile.in 2007-02-03 02:01:14.000000000 +0100 -@@ -17,7 +17,7 @@ [EMAIL PROTECTED]@ - [EMAIL PROTECTED]@ - [EMAIL PROTECTED]@ - ifdef DESTDIR -- INSTALL_PATH=$(top_srcdir)/$(DESTDIR) -+ INSTALL_PATH=$(DESTDIR) - else - INSTALL_PATH= - endif _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
