[Frugalware-darcs] frugalware-current: audacity-1.3.3-1-i686

VMiklos vmiklos at frugalware.org
Fri Jun 1 02:30:48 CEST 2007


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20070601002840-e2957-c2e83b496c6e030590035341d4ac569fb4cf5895.gz;

[audacity-1.3.3-1-i686
VMiklos <vmiklos at frugalware.org>**20070601002840
 version bump
 FIXME: flac is problematic atm
] {
move ./source/xapps-extra/audacity/audacity-1.3.2-flac-1.1.3.patch ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch
hunk ./source/xapps-extra/audacity/FrugalBuild 5
-pkgver=1.3.2
-pkgrel=3
+pkgver=1.3.3
+pkgrel=1
hunk ./source/xapps-extra/audacity/FrugalBuild 11
-	'libsamplerate' 'libsamplerate' 'flac>=1.1.3' 'soundtouch')
+	'libsamplerate' 'flac>=1.1.3' 'soundtouch' 'alsa-lib')
hunk ./source/xapps-extra/audacity/FrugalBuild 13
+# FIXME: flac somehow gets disabled
hunk ./source/xapps-extra/audacity/FrugalBuild 18
-source=(${source/$pkgname-/$pkgname-src-} audacity-1.3.2-flac-1.1.3.patch \
-	soundtouch.patch fix-desktop-file-and-warnings.patch locale-DESTDIR.patch)
+source=(${source/$pkgname-/$pkgname-src-} audacity-1.3.3-flac-1.1.3.patch \
+	fix-desktop-file-and-warnings.patch locale-DESTDIR.patch)
hunk ./source/xapps-extra/audacity/FrugalBuild 32
-		--with-lib-preference=system,local \
-		--with-portaudio=v19
+		--with-portaudio=v19 \
+		--with-libsamplerate=system \
+		--without-libresample \
+		--with-libmad=system \
+		--with-id3tag=system \
+		--with-flac=system \
+		--with-vorbis=system \
+		--with-libexpat=system \
+		--with-libsndfile=system
hunk ./source/xapps-extra/audacity/FrugalBuild 45
-sha1sums=('87690806763b7de26a8e2df1f0d4c3a7e6d1a404'\
-          '1e38825cb8ba0a5ffa74cd4086ca3a04aaa1264c'\
-          '219cec3343c3be0ab5cd12c3013241327ba9c309'\
-          'a72d8e3b2c30bcc2d72da97e963253bdcbe9a3d7'\
+sha1sums=('1b52f0de736cb5903df3e4776530839bee26f567' \
+          'f845c8337e8287da8df608df42cdbfaf4862980c' \
+          'f28d053b5ce943d55b746c041bf2f7696eaea739' \
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 1
-? 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 @@
+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 @@
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 13
-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 @@
+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 @@
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 27
- bool ExportFLAC(AudacityProject *project,
-                 int numChannels, wxString fName,
-                 bool selectionOnly, double t0, double t1, MixerSpec *mixerSpec)
-@@ -58,7 +65,9 @@
+ static struct
+ {
+    bool        do_exhaustive_model_search;
+@@ -229,7 +236,9 @@
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 32
-    
+ 
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 40
-@@ -72,7 +81,11 @@
-     	format=int16Sample;
-    	encoder->set_bits_per_sample(16);
-    }
--   encoder->init();
+@@ -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);
+ 
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 45
-+   encoder->init(); // really should check the return value here...
+    encoder->init();
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 47
-+   encoder->init(OSFILENAME(fName)); // really should check the return value here...
++   encoder->init(OSFILENAME(fName));
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 49
-    
+ 
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 52
-@@ -129,7 +142,7 @@
-    return !cancelling;
+@@ -343,7 +356,7 @@
+    return new ExportFLAC();
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 59
- 
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 60
-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
+ // 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
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 78
-@@ -264,6 +271,7 @@
+@@ -273,6 +280,7 @@
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 86
-@@ -272,11 +280,23 @@
+@@ -281,11 +289,23 @@
hunk ./source/xapps-extra/audacity/audacity-1.3.3-flac-1.1.3.patch 110
-@@ -340,7 +360,11 @@
+@@ -349,7 +369,11 @@
hunk ./source/xapps-extra/audacity/fix-desktop-file-and-warnings.patch 27
-diff -Naur audacity-src-1.3.2-beta/src/Audacity.h audacity-src-1.3.2-beta-p/src/Audacity.h
---- audacity-src-1.3.2-beta/src/Audacity.h	2006-10-29 01:05:28.000000000 +0200
-+++ audacity-src-1.3.2-beta-p/src/Audacity.h	2007-02-19 22:04:08.000000000 +0100
-@@ -29,12 +29,12 @@
- 
- // Version string for visual display
- #define AUDACITY_VERSION_STRING "1.3.2-beta"
--// Need to figure out how to concatenate for unicode builds
--//#define AUDACITY_VERSION_STRING AUDACITY_QUOTE( AUDACITY_VERSION ) "." \
--//                                AUDACITY_QUOTE( AUDACITY_RELEASE ) "." \
--//                                AUDACITY_QUOTE( AUDACITY_REVISION ) \
--//                                AUDACITY_SUFFIX
--
-+/* Need to figure out how to concatenate for unicode builds
-+ *#define AUDACITY_VERSION_STRING AUDACITY_QUOTE( AUDACITY_VERSION ) "." \
-+ *                                AUDACITY_QUOTE( AUDACITY_RELEASE ) "." \
-+ *                                AUDACITY_QUOTE( AUDACITY_REVISION ) \
-+ *                              AUDACITY_SUFFIX
-+ */
- // Version string for file info (under Windows)
- #define AUDACITY_FILE_VERSION AUDACITY_QUOTE( AUDACITY_VERSION ) "," \
-                               AUDACITY_QUOTE( AUDACITY_RELEASE ) "," \
hunk ./source/xapps-extra/audacity/soundtouch.patch 1
-diff -Naur audacity-src-1.3.2-beta/acinclude.m4 audacity-src-1.3.2-beta-st/acinclude.m4
---- audacity-src-1.3.2-beta/acinclude.m4	2006-10-29 01:06:04.000000000 +0200
-+++ audacity-src-1.3.2-beta-st/acinclude.m4	2007-02-02 19:43:34.000000000 +0100
-@@ -88,12 +88,23 @@
- 
-    dnl see if soundtouch is installed on the system
- 
--   dnl ... TODO: I don't know if stock, unmodified soundtouch is
--   dnl suitable for audacity, so I don't allow it
-+   PKG_CHECK_MODULES(SOUNDTOUCH, soundtouch-1.0 >= 1.3.1,
-+                     soundtouch_available_system="yes",
-+                     soundtouch_available_system="no")
- 
--   LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no"
- 
--   dnl see if libresample is available locally
-+   if test "x$soundtouch_available_system" = "xyes" ; then
-+      LIBSOUNDTOUCH_SYSTEM_AVAILABLE="yes"
-+      LIBSOUNDTOUCH_SYSTEM_LIBS=$SOUNDTOUCH_LIBS
-+      LIBSOUNDTOUCH_SYSTEM_CXXFLAGS=$SOUNDTOUCH_CFLAGS
-+      LIBSOUNDTOUCH_SYSTEM_CPPSYMBOLS="USE_SOUNDTOUCH"
-+      AC_MSG_NOTICE([Libsoundtouch libraries are available as system libraries])
-+   else
-+      LIBSOUNDTOUCH_SYSTEM_AVAILABLE="no"
-+      AC_MSG_NOTICE([Libsoundtouch libraries are NOT available as system libraries])
-+   fi
-+
-+   dnl see if libsoundtouch is available locally
- 
-    AC_CHECK_FILE(${srcdir}/lib-src/soundtouch/include/SoundTouch.h,
-                  soundtouch_h_found="yes",
-@@ -180,6 +191,7 @@
-       LIBSAMPLERATE_SYSTEM_AVAILABLE="yes"
-       LIBSAMPLERATE_SYSTEM_LIBS=$SAMPLERATE_LIBS
-       LIBSAMPLERATE_SYSTEM_CXXFLAGS=$SAMPLERATE_CFLAGS
-+      LIBSAMPLERATE_SYSTEM_CPPSYMBOLS="USE_LIBSAMPLERATE"
-       AC_MSG_NOTICE([Libsamplerate libraries are available as system libraries])
-    else
-       LIBSAMPLERATE_SYSTEM_AVAILABLE="no"
rmfile ./source/xapps-extra/audacity/soundtouch.patch
}


More information about the Frugalware-darcs mailing list