Author: dtimms Update of /cvs/free/rpms/audacity-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv29297 Modified Files: audacity-freeworld.spec Added Files: audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch Log Message: add patch to suit APIChange introduced in ffmpeg-0.6. Resolves rfbz #1356. fixes ffmpeg import/export. audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch: FFmpeg.cpp | 4 ++-- FFmpeg.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch --- diff -ru audacity-src-1.3.12-beta/src/FFmpeg.cpp audacity-src-1.3.12-beta.newffmpeg/src/FFmpeg.cpp --- audacity-src-1.3.12-beta/src/FFmpeg.cpp 2010-03-30 07:28:54.000000000 -0400 +++ audacity-src-1.3.12-beta.newffmpeg/src/FFmpeg.cpp 2010-06-07 17:29:38.480673079 -0400 @@ -356,7 +356,7 @@ } // Otherwize, resort to extension matching if available else if (fmt1->extensions) { - if (FFmpegLibsInst->match_ext(filename, fmt1->extensions)) { + if (FFmpegLibsInst->av_match_ext(filename, fmt1->extensions)) { score = 50; } } @@ -829,7 +829,7 @@ INITDYN(avformat,av_open_input_file); INITDYN(avformat,av_open_input_stream); INITDYN(avformat,get_buffer); - INITDYN(avformat,match_ext); + INITDYN(avformat,av_match_ext); #if FFMPEG_STABLE INITDYN(avformat,av_init_packet); diff -ru audacity-src-1.3.12-beta/src/FFmpeg.h audacity-src-1.3.12-beta.newffmpeg/src/FFmpeg.h --- audacity-src-1.3.12-beta/src/FFmpeg.h 2010-03-30 07:28:54.000000000 -0400 +++ audacity-src-1.3.12-beta.newffmpeg/src/FFmpeg.h 2010-06-07 17:29:19.148672205 -0400 @@ -224,7 +224,7 @@ AVStream* (*av_new_stream) (AVFormatContext *s, int id); AVFormatContext* (*av_alloc_format_context) (void); AVOutputFormat* (*guess_format) (const char *short_name, const char *filename, const char *mime_type); - int (*match_ext) (const char *filename, const char *extensions); + int (*av_match_ext) (const char *filename, const char *extensions); int (*av_write_trailer) (AVFormatContext *s); int (*av_interleaved_write_frame) (AVFormatContext *s, AVPacket *pkt); int (*av_write_frame) (AVFormatContext *s, AVPacket *pkt); Index: audacity-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- audacity-freeworld.spec 28 Jun 2010 12:31:32 -0000 1.14 +++ audacity-freeworld.spec 8 Aug 2010 22:00:23 -0000 1.15 @@ -1,25 +1,29 @@ -%define tartopdir audacity-src-1.3.12-beta - Name: audacity-freeworld -%define realname audacity -Conflicts: %{realname} - Version: 1.3.12 -Release: 0.1.3.beta%{?dist} +Release: 0.7.beta%{?dist} Summary: Multitrack audio editor Group: Applications/Multimedia License: GPLv2 URL: http://audacity.sourceforge.net +%define tartopdir audacity-src-%{version}-beta +%define realname audacity +Conflicts: %{realname} + Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b... Source1: audacity.png Source2: audacity.desktop Patch1: audacity-1.3.7-libmp3lame-default.patch Patch2: audacity-1.3.9-libdir.patch -Patch6: audacity-1.3.7-vamp-1.3.patch -Patch7: audacity-1.3.9-getmaxpeak.patch +# add audio/x-flac +# remove audio/mpeg, audio/x-mp3 +# enable startup notification +# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature +Patch3: audacity-1.3.10-desktop.patch +# ffmpeg-0.6: utils.c changed match_ext() to av_match_ext(). +Patch4: audacity-1.3.12-ffmpeg-0.6-apichange-av_match_ext.patch Provides: audacity-nonfree = %{version}-%{release} Obsoletes: audacity-nonfree < %{version}-%{release} @@ -74,10 +78,8 @@ done grep -q -s __RPM_LIB * -R && exit 1 -%if 0%{?fedora} < 11 -%patch6 -p1 -b .vamp-1.3 -%endif -#%#patch7 -p1 -b .getmaxpeak +%patch3 -p1 -b .old-desktop-file +%patch4 -p1 -b .ffmpeg-0.6-apichange-av_match_ext # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0". for i in locale/*.po src/export/ExportMP3.cpp @@ -118,12 +120,11 @@ %{find_lang} %{realname} - -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE2} + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/audacity.desktop %clean @@ -155,6 +156,22 @@ %changelog +* Sat Aug 7 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.7.beta +- patch to suit APIChange introduced in ffmpeg-0.6. Resolves rfbz #1356. + fixes ffmpeg import/export. + +* Thu Jul 15 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.6.beta +- drop vamp-plugin path patch to suit updated vamp-plugin-sdk-2.1 + +* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.4.beta +- mods to ease diffs between builds for fedora and full + +* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.3.beta +- really package new icons found in icons/hicolor + +* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.2.beta +- mod tartopdir to use package version macro + * Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.3.beta - fix icons glob to use realname - add more supported mimetypes and categories to the desktop file