rpms/audacity/devel audacity-1.3.4-gcc43.patch, 1.1, 1.2 audacity-1.3.4-libdir.patch, 1.1, 1.2 audacity-1.3.4-libmp3lame-default.patch, 1.1, 1.2 audacity.desktop, 1.1, 1.2 .cvsignore, 1.8, 1.9 audacity.spec, 1.50, 1.51 sources, 1.10, 1.11 audacity-1.3.2-CVE-2007-6061.patch, 1.1, NONE audacity-1.3.2-FLAC.patch, 1.1, NONE audacity-1.3.2-allegro-cflags.patch, 1.2, NONE audacity-1.3.2-destdir.patch, 1.1, NONE audacity-1.3.2-expat2.patch, 1.1, NONE audacity-1.3.2-exportmp3.patch, 1.1, NONE audacity-1.3.2-fr.patch, 1.1, NONE audacity-1.3.2-gcc43.patch, 1.1, NONE audacity-1.3.2-jack-api-109.patch, 1.1, NONE audacity-1.3.2-libdir.patch, 1.1, NONE audacity-1.3.2-resample.patch, 1.1, NONE audacity-1.3.2-soundtouch-cxxflags.patch, 1.2, NONE

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Thu May 15 19:32:37 UTC 2008


Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27144

Modified Files:
	.cvsignore audacity.spec sources 
Added Files:
	audacity-1.3.4-gcc43.patch audacity-1.3.4-libdir.patch 
	audacity-1.3.4-libmp3lame-default.patch audacity.desktop 
Removed Files:
	audacity-1.3.2-CVE-2007-6061.patch audacity-1.3.2-FLAC.patch 
	audacity-1.3.2-allegro-cflags.patch 
	audacity-1.3.2-destdir.patch audacity-1.3.2-expat2.patch 
	audacity-1.3.2-exportmp3.patch audacity-1.3.2-fr.patch 
	audacity-1.3.2-gcc43.patch audacity-1.3.2-jack-api-109.patch 
	audacity-1.3.2-libdir.patch audacity-1.3.2-resample.patch 
	audacity-1.3.2-soundtouch-cxxflags.patch 
Log Message:
- merge 1.3.5-beta from fedora audacity test branch
- expat2 patch merged upstream
- scriptlets: run update-desktop-database without path
- drop scriptlet dependencies
- ExportMP3.cpp libdir patch obsolete
- set a default location for libmp3lame.so.0 again
- build newer release with wxGTK 2.8.x  
- BR soundtouch-devel  and  --with-soundtouch=system
- drop obsolete patches: resample, mp3 export, destdir, FLAC, fr
- (spec indentation+macro cleanup)


audacity-1.3.4-gcc43.patch:

Index: audacity-1.3.4-gcc43.patch
===================================================================
RCS file: audacity-1.3.4-gcc43.patch
diff -N audacity-1.3.4-gcc43.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacity-1.3.4-gcc43.patch	15 May 2008 19:31:29 -0000	1.2
@@ -0,0 +1,56 @@
+diff -Nur audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp
+--- audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp	2008-01-23 18:32:54.000000000 +0100
++++ audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/hostext/PluginLoader.cpp	2008-03-22 01:43:07.000000000 +0100
+@@ -41,6 +41,7 @@
+ 
+ #include <fstream>
+ #include <cctype> // tolower
++#include <cstring>
+ 
+ #ifdef _WIN32
+ 
+diff -Nur audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp
+--- audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp	2008-01-23 18:32:54.000000000 +0100
++++ audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginAdapter.cpp	2008-03-22 01:13:09.000000000 +0100
+@@ -36,6 +36,10 @@
+ 
+ #include "PluginAdapter.h"
+ 
++#include <cstdlib>
++#include <cstring>
++using namespace std;
++
+ //#define DEBUG_PLUGIN_ADAPTER 1
+ 
+ 
+diff -Nur audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
+--- audacity-src-1.3.4-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp	2008-01-23 18:32:54.000000000 +0100
++++ audacity-src-1.3.4-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp	2008-03-22 01:27:20.000000000 +0100
+@@ -36,6 +36,9 @@
+ 
+ #include "PluginHostAdapter.h"
+ 
++#include <cstdlib>
++
++
+ namespace Vamp
+ {
+ 
+@@ -63,7 +66,7 @@
+     std::vector<std::string> path;
+     std::string envPath;
+ 
+-    char *cpath = getenv("VAMP_PATH");
++    char *cpath = std::getenv("VAMP_PATH");
+     if (cpath) envPath = cpath;
+ 
+ #ifdef _WIN32
+@@ -80,7 +83,7 @@
+ 
+     if (envPath == "") {
+         envPath = DEFAULT_VAMP_PATH;
+-        char *chome = getenv("HOME");
++        char *chome = std::getenv("HOME");
+         if (chome) {
+             std::string home(chome);
+             std::string::size_type f;

audacity-1.3.4-libdir.patch:

Index: audacity-1.3.4-libdir.patch
===================================================================
RCS file: audacity-1.3.4-libdir.patch
diff -N audacity-1.3.4-libdir.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacity-1.3.4-libdir.patch	15 May 2008 19:31:29 -0000	1.2
@@ -0,0 +1,26 @@
+diff -Nur audacity-src-1.3.4-beta-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.4-beta/src/effects/ladspa/LoadLadspa.cpp
+--- audacity-src-1.3.4-beta-orig/src/effects/ladspa/LoadLadspa.cpp	2008-01-23 18:32:52.000000000 +0100
++++ audacity-src-1.3.4-beta/src/effects/ladspa/LoadLadspa.cpp	2008-03-21 23:21:45.000000000 +0100
+@@ -92,8 +92,8 @@
+ 
+    #ifdef __WXGTK__
+    wxGetApp().AddUniquePathToPathList(wxT(INSTALL_PREFIX) wxT("/ladspa"), pathList);
+-   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/lib/ladspa"), pathList);
+-   wxGetApp().AddUniquePathToPathList(wxT("/usr/lib/ladspa"), pathList);
++   wxGetApp().AddUniquePathToPathList(wxT("/usr/local/__RPM_LIB__/ladspa"), pathList);
++   wxGetApp().AddUniquePathToPathList(wxT("__RPM_LIBDIR__/ladspa"), pathList);
+    #endif
+ 
+    #ifdef __WXMAC__
+diff -Nur audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
+--- audacity-src-1.3.5-beta-orig/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp	2008-05-07 23:19:58.000000000 +0200
++++ audacity-src-1.3.5-beta/lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp	2008-05-11 20:56:59.000000000 +0200
+@@ -75,7 +75,7 @@
+ #ifdef __APPLE__
+ #define DEFAULT_VAMP_PATH "$HOME/Library/Audio/Plug-Ins/Vamp:/Library/Audio/Plug-Ins/Vamp"
+ #else
+-#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/lib/vamp:/usr/lib/vamp"
++#define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/__RPM_LIB__/vamp:__RPM_LIBDIR__/vamp"
+ #endif
+ #endif
+ 

audacity-1.3.4-libmp3lame-default.patch:

Index: audacity-1.3.4-libmp3lame-default.patch
===================================================================
RCS file: audacity-1.3.4-libmp3lame-default.patch
diff -N audacity-1.3.4-libmp3lame-default.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacity-1.3.4-libmp3lame-default.patch	15 May 2008 19:31:29 -0000	1.2
@@ -0,0 +1,12 @@
+diff -Nur audacity-src-1.3.4-beta-orig/src/AudacityApp.cpp audacity-src-1.3.4-beta/src/AudacityApp.cpp
+--- audacity-src-1.3.4-beta-orig/src/AudacityApp.cpp	2008-01-23 18:32:52.000000000 +0100
++++ audacity-src-1.3.4-beta/src/AudacityApp.cpp	2008-04-12 16:40:33.000000000 +0200
+@@ -726,6 +726,8 @@
+       return false;
+    }
+ 
++   gPrefs->Write(wxT("/MP3/MP3LibPath"),wxT("__RPM_LIBDIR__/libmp3lame.so.0"));
++
+    // More initialization
+    InitCleanSpeech();
+ 


Index: audacity.desktop
===================================================================
RCS file: audacity.desktop
diff -N audacity.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacity.desktop	15 May 2008 19:31:29 -0000	1.2
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Audacity
+GenericName=Sound editor
+Type=Application
+Exec=audacity
+Icon=audacity.png
+Terminal=false
+Comment=A multitrack audio editor
+Encoding=UTF-8
+MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
+Categories=AudioVideo;GNOME;
+StartupWMClass=Audacity


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	23 Feb 2007 22:01:51 -0000	1.8
+++ .cvsignore	15 May 2008 19:31:29 -0000	1.9
@@ -1 +1 @@
-audacity-src-1.3.2.tar.gz
+audacity-src-1.3.5.tar.bz2


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- audacity.spec	5 May 2008 19:03:07 -0000	1.50
+++ audacity.spec	15 May 2008 19:31:29 -0000	1.51
@@ -1,50 +1,43 @@
-Name:           audacity
-Version:        1.3.2
-Release:        22%{?dist}
-Summary:        A multitrack audio editor
-
-Group:          Applications/Multimedia
-License:        GPLv2
-URL:            http://audacity.sourceforge.net
-Source:         http://dl.sf.net/sourceforge/audacity/audacity-src-%{version}.tar.gz
-Source1:        audacity.png
-# iconv on locale/fr.po (MAC to ISO Latin-1)
-Patch2:         audacity-1.3.2-fr.patch
-Patch3:         audacity-1.3.2-exportmp3.patch
-Patch4:         audacity-1.3.2-destdir.patch
-Patch5:         audacity-1.3.2-resample.patch
-Patch6:         audacity-1.3.2-FLAC.patch
-Patch7:         audacity-1.3.2-expat2.patch
-Patch8:         audacity-1.3.2-gcc43.patch
-Patch9:         audacity-1.3.2-libdir.patch
-Patch10:        audacity-1.3.2-jack-api-109.patch
-Patch11:        audacity-1.3.2-soundtouch-cxxflags.patch
-Patch12:        audacity-1.3.2-allegro-cflags.patch
-Patch13:        audacity-1.3.2-CVE-2007-6061.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  alsa-lib-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:  expat-devel
-BuildRequires:  flac-devel
-BuildRequires:  gettext
-BuildRequires:  jack-audio-connection-kit-devel
-BuildRequires:  ladspa-devel
-BuildRequires:  libid3tag-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libsamplerate-devel
-BuildRequires:  libsndfile-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  compat-wxGTK26-devel
-BuildRequires:  zip
-BuildRequires:  zlib-devel
-%{?_with_mp3:BuildRequires: libmad-devel}
-
-Requires(post):   shared-mime-info, desktop-file-utils
-Requires(postun): shared-mime-info, desktop-file-utils
-
 # Compile options:
 # --with mp3          : enable mp3 support
 
+%define tartopdir audacity-src-1.3.5-beta
+
+Name: audacity
+Version: 1.3.5
+Release: 0.3.beta%{?dist}
+Summary: Multitrack audio editor
+Group: Applications/Multimedia
+License: GPLv2
+URL: http://audacity.sourceforge.net
+
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-src-1.3.5.tar.bz2
+Source1: audacity.png
+Source2: audacity.desktop
+
+Patch1: audacity-1.3.4-libmp3lame-default.patch
+Patch2: audacity-1.3.4-libdir.patch
+Patch3: audacity-1.3.4-gcc43.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: expat-devel
+BuildRequires: flac-devel
+BuildRequires: gettext
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: ladspa-devel
+BuildRequires: libid3tag-devel
+BuildRequires: libogg-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libvorbis-devel
+BuildRequires: soundtouch-devel
+BuildRequires: zip
+BuildRequires: zlib-devel
+BuildRequires: wxGTK2-devel
+%{?_with_mp3:BuildRequires: libmad-devel}
+
 
 %description
 Audacity is a cross-platform multitrack audio editor. It allows you to
@@ -55,78 +48,59 @@
 Linux/*BSD, MacOS, and Windows.
 
 %prep
-%setup -q -n %{name}-src-%{version}-beta
-%patch2 -p1 -b .fr
-%patch3 -p1 -b .exportmp3
-%patch4 -p1 -b .destdir
-%patch5 -p1 -b .resample
-%patch6 -p1 -b .FLAC
-%patch7 -p1 -b .expat2
-%patch8 -p1 -b .gcc43
+%setup -q -n %{tartopdir}
 
 # Substitute hardcoded library paths.
-%patch9 -p1
-for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp
+%patch1 -p1
+%patch2 -p1
+for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp src/AudacityApp.cpp lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
 do
     sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
     sed -i -e 's!__RPM_LIB__!%{_lib}!g' $i
 done
 grep -q -s __RPM_LIB * -R && exit 1
 
-%if 0%{?fedora} > 8
-%patch10 -p1 -b .jack-api
-%endif
-%patch11 -p1 -b .soundtouch-cxxflags
-%patch12 -p1 -b .allegro-cflags
-%patch13 -p1 -b .CVE-2007-6061
+%patch3 -p1 -b .gcc43
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
-for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
+for i in locale/*.po src/export/ExportMP3.cpp
 do
     sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
 done
 
-%ifnarch %{ix86} x86_64
-sed -i -e 's!-msse!!' lib-src/soundtouch/source/SoundTouch/Makefile.*
-%endif
-
-# for wxGTK26-compat
-sed -i -e 's!wx-config!wx-2.6-config!g' configure
-
 
 %build
-%configure --with-help --with-libsndfile=system --without-libresample --with-libsamplerate=system --with-libflac=system --with-ladspa --with-vorbis=system --with-id3tag=system --with-expat=system %{?_with_mp3:--with-libmad=system} 
+%configure \
+    --with-help \
+    --with-libsndfile=system \
+    --without-libresample \
+    --with-libsamplerate=system \
+    --with-libflac=system \
+    --with-ladspa \
+    --with-vorbis=system \
+    --with-id3tag=system \
+    --with-expat=system \
+    --with-soundtouch=system \
+    %{?_with_mp3:--with-libmad=system}
+# _smp_mflags cause problems
 make
 
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-make DESTDIR=${RPM_BUILD_ROOT} install
+
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
 cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
 
-cat > audacity.desktop <<EOF
-[Desktop Entry]
-Name=Audacity
-GenericName=Sound editor
-Type=Application
-Exec=audacity
-Icon=audacity.png
-Terminal=false
-Comment=A multitrack audio editor
-Encoding=UTF-8
-MimeType=audio/x-wav;application/ogg;audio/x-aiff;audio/x-aiffc;audio/x-aifc;audio/basic;application/x-audacity-project;
-StartupWMClass=Audacity
-EOF
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*
+make DESTDIR=${RPM_BUILD_ROOT} install
+
+%{find_lang} %{name}
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 desktop-file-install \
     --vendor fedora \
-    --add-category GNOME \
-    --add-category AudioVideo \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-    audacity.desktop
-
-%{find_lang} %{name}
+    %{SOURCE2}
 
 
 %clean
@@ -135,20 +109,20 @@
 
 %post
 umask 022
-%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %postun
 umask 022
-%{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
-%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
+update-desktop-database &> /dev/null || :
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_datadir}/audacity
+%{_bindir}/%{name}
+%{_datadir}/%{name}/
 %{_mandir}/man*/*
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
@@ -157,9 +131,34 @@
 
 
 %changelog
-* Sat May  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.2-21
+* Thu May 15 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.3.beta
+- merge 1.3.5-beta from test branch
+
+* Fri May  9 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.2.beta
+- update to 1.3.5-beta
+- expat2 patch merged upstream
+- scriptlets: run update-desktop-database without path
+- drop scriptlet dependencies
+
+* Mon May  5 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.5-0.1.rc3.20080505cvs
+- update to 1.3.5-rc3 cvs snapshot
+- ExportMP3.cpp libdir patch obsolete
+
+* Sat May  3 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.4-0.7.20080123cvs
 - check ownership of temporary files directory (#436260) (CVE-2007-6061)
 
+* Sat Apr 12 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.4-0.6.20080123cvs
+- set a default location for libmp3lame.so.0 again
+
+* Fri Mar 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.4-0.5.20080123cvs
+- package the old 1.3.2-beta and a post 1.3.4-beta snapshot in the
+  same package -- users may stick to the older one, but please help
+  with evaluating the newer one
+- merge packaging changes from my 1.3.3/1.3.4 test packages:
+- build newer release with wxGTK 2.8.x  
+- BR soundtouch-devel  and  --with-soundtouch=system
+- drop obsolete patches: resample, mp3 export, destdir, FLAC, fr
+
 * Fri Mar 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.2-20
 - make soundtouch and allegro build with RPM optflags
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	23 Feb 2007 22:01:51 -0000	1.10
+++ sources	15 May 2008 19:31:29 -0000	1.11
@@ -1 +1 @@
-bf63673140254f1283dfd55b61ff2422  audacity-src-1.3.2.tar.gz
+b15503c331e7145942fa0e4b27760d61  audacity-src-1.3.5.tar.bz2


--- audacity-1.3.2-CVE-2007-6061.patch DELETED ---


--- audacity-1.3.2-FLAC.patch DELETED ---


--- audacity-1.3.2-allegro-cflags.patch DELETED ---


--- audacity-1.3.2-destdir.patch DELETED ---


--- audacity-1.3.2-expat2.patch DELETED ---


--- audacity-1.3.2-exportmp3.patch DELETED ---


--- audacity-1.3.2-fr.patch DELETED ---


--- audacity-1.3.2-gcc43.patch DELETED ---


--- audacity-1.3.2-jack-api-109.patch DELETED ---


--- audacity-1.3.2-libdir.patch DELETED ---


--- audacity-1.3.2-resample.patch DELETED ---


--- audacity-1.3.2-soundtouch-cxxflags.patch DELETED ---




More information about the fedora-extras-commits mailing list