diff --git a/audacity-1.3.2-allegro-cflags.patch b/audacity-1.3.2-allegro-cflags.patch new file mode 100644 index 0000000..e4323aa --- /dev/null +++ b/audacity-1.3.2-allegro-cflags.patch @@ -0,0 +1,12 @@ +diff -Nur audacity-src-1.3.2-beta-orig/lib-src/allegro/Makefile.in audacity-src-1.3.2-beta/lib-src/allegro/Makefile.in +--- audacity-src-1.3.2-beta-orig/lib-src/allegro/Makefile.in 2006-10-29 01:05:59.000000000 +0200 ++++ audacity-src-1.3.2-beta/lib-src/allegro/Makefile.in 2008-03-22 10:26:33.000000000 +0100 +@@ -4,7 +4,7 @@ + CCC = @CXX@ + srcdir=@srcdir@ + +-CFLAGS = -g -O ++CFLAGS = @CFLAGS@ + CPPOBJ = \ + allegro.cpp.o \ + allegrord.cpp.o \ diff --git a/audacity-1.3.2-gcc43.patch b/audacity-1.3.2-gcc43.patch new file mode 100644 index 0000000..e9aaf41 --- /dev/null +++ b/audacity-1.3.2-gcc43.patch @@ -0,0 +1,39 @@ +diff -Nur audacity-src-1.3.2-beta-orig/lib-src/soundtouch/include/soundtouch_config.h.in audacity-src-1.3.2-beta/lib-src/soundtouch/include/soundtouch_config.h.in +--- audacity-src-1.3.2-beta-orig/lib-src/soundtouch/include/soundtouch_config.h.in 2006-10-29 01:06:01.000000000 +0200 ++++ audacity-src-1.3.2-beta/lib-src/soundtouch/include/soundtouch_config.h.in 2008-01-03 16:53:06.000000000 +0100 +@@ -43,24 +43,6 @@ + /* Use Integer as Sample type */ + #undef INTEGER_SAMPLES + +-/* Name of package */ +-#undef PACKAGE +- +-/* Define to the address where bug reports for this package should be sent. */ +-#undef PACKAGE_BUGREPORT +- +-/* Define to the full name of this package. */ +-#undef PACKAGE_NAME +- +-/* Define to the full name and version of this package. */ +-#undef PACKAGE_STRING +- +-/* Define to the one symbol short name of this package. */ +-#undef PACKAGE_TARNAME +- +-/* Define to the version of this package. */ +-#undef PACKAGE_VERSION +- + /* Define as the return type of signal handlers (`int' or `void'). */ + #undef RETSIGTYPE + +diff -Nur audacity-src-1.3.2-beta-orig/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp audacity-src-1.3.2-beta/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp +--- audacity-src-1.3.2-beta-orig/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp 2006-10-29 01:06:00.000000000 +0200 ++++ audacity-src-1.3.2-beta/lib-src/soundtouch/source/example/SoundStretch/WavFile.cpp 2008-01-03 15:53:25.000000000 +0100 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/audacity-1.3.2-jack-api-109.patch b/audacity-1.3.2-jack-api-109.patch new file mode 100644 index 0000000..7d58a2a --- /dev/null +++ b/audacity-1.3.2-jack-api-109.patch @@ -0,0 +1,31 @@ +diff -Nur audacity-src-1.3.2-beta-orig/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c +--- audacity-src-1.3.2-beta-orig/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c 2006-10-29 01:05:49.000000000 +0200 ++++ audacity-src-1.3.2-beta/lib-src/portaudio-v19/src/hostapi/jack/pa_jack.c 2008-02-11 01:13:04.000000000 +0100 +@@ -1669,27 +1669,19 @@ + { + for( i = 0; i < stream->num_incoming_connections; i++ ) + { +- UNLESS( !jack_port_lock( stream->jack_client, stream->local_input_ports[i] ), +- paUnanticipatedHostError ); + if( jack_port_connected( stream->local_input_ports[i] ) ) + { + UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_input_ports[i] ), + paUnanticipatedHostError ); + } +- UNLESS( !jack_port_unlock( stream->jack_client, stream->local_input_ports[i] ), +- paUnanticipatedHostError ); + } + for( i = 0; i < stream->num_outgoing_connections; i++ ) + { +- UNLESS( !jack_port_lock( stream->jack_client, stream->local_output_ports[i] ), +- paUnanticipatedHostError ); + if( jack_port_connected( stream->local_output_ports[i] ) ) + { + UNLESS( !jack_port_disconnect( stream->jack_client, stream->local_output_ports[i] ), + paUnanticipatedHostError ); + } +- UNLESS( !jack_port_unlock( stream->jack_client, stream->local_output_ports[i] ), +- paUnanticipatedHostError ); + } + } + diff --git a/audacity-1.3.2-libdir.patch b/audacity-1.3.2-libdir.patch new file mode 100644 index 0000000..428b74d --- /dev/null +++ b/audacity-1.3.2-libdir.patch @@ -0,0 +1,26 @@ +diff -Nur audacity-src-1.3.2-beta-orig/src/effects/ladspa/LoadLadspa.cpp audacity-src-1.3.2-beta/src/effects/ladspa/LoadLadspa.cpp +--- audacity-src-1.3.2-beta-orig/src/effects/ladspa/LoadLadspa.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta/src/effects/ladspa/LoadLadspa.cpp 2008-02-10 22:00:53.000000000 +0100 +@@ -86,8 +86,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.2-beta-orig/src/export/ExportMP3.cpp audacity-src-1.3.2-beta/src/export/ExportMP3.cpp +--- audacity-src-1.3.2-beta-orig/src/export/ExportMP3.cpp 2006-10-29 01:05:27.000000000 +0200 ++++ audacity-src-1.3.2-beta/src/export/ExportMP3.cpp 2008-02-10 21:58:51.000000000 +0100 +@@ -258,7 +258,7 @@ + + wxString GetLibraryPath() + { +- return wxT("/usr/lib"); ++ return wxT("__RPM_LIBDIR__"); + } + + wxString GetLibraryName() diff --git a/audacity-1.3.2-soundtouch-cxxflags.patch b/audacity-1.3.2-soundtouch-cxxflags.patch new file mode 100644 index 0000000..b57ba4b --- /dev/null +++ b/audacity-1.3.2-soundtouch-cxxflags.patch @@ -0,0 +1,13 @@ +diff -Nur audacity-src-1.3.2-beta-orig/lib-src/soundtouch/configure audacity-src-1.3.2-beta/lib-src/soundtouch/configure +--- audacity-src-1.3.2-beta-orig/lib-src/soundtouch/configure 2006-10-29 01:06:00.000000000 +0200 ++++ audacity-src-1.3.2-beta/lib-src/soundtouch/configure 2008-03-22 10:15:28.000000000 +0100 +@@ -2443,7 +2443,8 @@ + + #AC_MAINTAINER_MODE + +-CXXFLAGS= ac_ext=cpp ++#CXXFLAGS= ++ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' diff --git a/audacity.spec b/audacity.spec index 31db3ad..291b3c6 100644 --- a/audacity.spec +++ b/audacity.spec @@ -1,6 +1,6 @@ Name: audacity Version: 1.3.2 -Release: 17%{?dist} +Release: 20%{?dist} Summary: A multitrack audio editor Group: Applications/Multimedia @@ -17,6 +17,11 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -59,17 +64,27 @@ Linux/*BSD, MacOS, and Windows. %patch5 -p1 -b .resample %patch6 -p1 -b .FLAC %patch7 -p1 -b .expat2 +%patch8 -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 +# Substitute hardcoded library paths. +%patch9 -p1 +for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp do - sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i + 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 -# Substitute hardcoded /usr/lib paths. -for i in src/AudacityApp.cpp src/export/ExportMP3.cpp +%if 0%{?fedora} > 8 +%patch10 -p1 -b .jack-api +%endif +%patch11 -p1 -b .soundtouch-cxxflags +%patch12 -p1 -b .allegro-cflags + +# 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 do - sed -i -e 's!/usr/lib!%{_libdir}!g' $i + sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i done %ifnarch %{ix86} x86_64 @@ -122,13 +137,13 @@ rm -rf ${RPM_BUILD_ROOT} %post umask 022 %{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : +%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun umask 022 %{_bindir}/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : -%{_bindir}/update-desktop-database /usr/share/applications > /dev/null 2>&1 || : +%{_bindir}/update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %files -f %{name}.lang @@ -143,23 +158,34 @@ umask 022 %changelog -* Fri Nov 16 2007 Michael Schwendt - 1.3.2-17 +* Fri Mar 21 2008 Michael Schwendt - 1.3.2-20 +- make soundtouch and allegro build with RPM optflags + +* Sun Feb 10 2008 Michael Schwendt - 1.3.2-19 +- rawhide: patch for JACK 0.109.0 API changes (jack_port_lock/unlock removal). +- rebuilt for GCC 4.3 as requested by Fedora Release Engineering +- subst _libdir in ladspa plugin loader + +* Thu Jan 3 2008 Michael Schwendt - 1.3.2-18 +- Patch for GCC 4.3.0 C++. + +* Fri Nov 16 2007 Michael Schwendt - 1.3.2-17 - rebuilt for FLAC 1.1.4 -> 1.2.x upgrade, which broke FLAC import -* Tue Aug 28 2007 Michael Schwendt - 1.3.2-16 +* Tue Aug 28 2007 Michael Schwendt - 1.3.2-16 - rebuilt for new expat (#195888) -* Tue Aug 21 2007 Michael Schwendt - 1.3.2-15 +* Tue Aug 21 2007 Michael Schwendt - 1.3.2-15 - rebuild per request on fedora-devel-list - clarify licence (GPLv2) -* Mon Mar 5 2007 Michael Schwendt +* Mon Mar 5 2007 Michael Schwendt - add umask 022 to scriptlets -* Sat Feb 24 2007 Michael Schwendt - 1.3.2-14 +* Sat Feb 24 2007 Michael Schwendt - 1.3.2-14 - patch for FLAC 1.1.4 API compatibility -* Sat Feb 24 2007 Michael Schwendt - 1.3.2-13 +* Sat Feb 24 2007 Michael Schwendt - 1.3.2-13 - patch ExportMP3.cpp (MPEG-2 Layer III bitrates resulted in broken/empty files) - convert locale related perl substitutions into patches (safer) @@ -215,7 +241,7 @@ umask 022 * Mon Aug 28 2006 Gerard Milmeister - 1.2.4-0.2.b - Rebuild for FE6 -* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b +* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b - Update to 1.2.4b (stable release). - Follow upstream recommendation and use the GTK+ 1.x wxGTK. This is because of various issues with fonts/layout/behaviour. @@ -234,7 +260,7 @@ umask 022 * Thu Apr 7 2005 Gerard Milmeister - 1.2.3-3 - Build gtk2 version by default -* Fri Apr 7 2005 Michael Schwendt +* Fri Apr 7 2005 Michael Schwendt - rebuilt * Tue Apr 5 2005 Gerard Milmeister - 1.2.3-2 @@ -243,7 +269,7 @@ umask 022 * Sat Nov 20 2004 Gerard Milmeister - 0:1.2.3-1 - New Version 1.2.3 -* Sat Oct 30 2004 Michael Schwendt - 0:1.2.2-0.fdr.1 +* Sat Oct 30 2004 Michael Schwendt - 0:1.2.2-0.fdr.1 - Update to 1.2.2, patch aboutdialog to be readable with wxGTK. * Mon May 10 2004 Gerard Milmeister - 0:1.2.1-0.fdr.1