Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at Mon May 31 18:25:51 CEST 2010. -------- --- audacity/audacity.changes 2010-04-17 17:02:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/audacity/audacity.changes 2010-05-27 00:00:17.000000000 +0200 @@ -1,0 +2,6 @@ +Wed May 26 21:59:23 UTC 2010 - cmorve69@yahoo.es + +- Fix build-compare +- Fix ffmpeg support + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- audacity-ffmpeg_match_ext.patch audacity-no_exact_ffmpeg_version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.Au4jZj/_old 2010-05-31 18:24:06.000000000 +0200 +++ /var/tmp/diff_new_pack.Au4jZj/_new 2010-05-31 18:24:06.000000000 +0200 @@ -42,7 +42,7 @@ %endif Summary: A Free, Cross-Platform Digital Audio Editor Version: 1.3.12 -Release: 2 +Release: 3 License: GPLv2+ Group: Productivity/Multimedia/Sound/Editors and Convertors BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -54,6 +54,10 @@ Patch5: %{name}-retval.patch Patch12: %{name}-audiodevdefaults.patch Patch13: audacity-nomac.patch +# PATCH-FIX-OPENSUSE %{name}-ffmpeg_match_ext.patch cmorve69@yahoo.es -- Fix ffmpeg support with versions after 2010-03-08 +Patch14: %{name}-ffmpeg_match_ext.patch +# PATCH-FIX-OPENSUSE %{name}-no_exact_ffmpeg_version.patch cmorve69@yahoo.es -- remove referene to minor/micro ffmpeg versions so build-compare can do its work +Patch15: %{name}-no_exact_ffmpeg_version.patch %description Audacity is a program that manipulates digital audio wave forms. In @@ -68,6 +72,8 @@ %patch5 %patch12 -p1 %patch13 -p1 +%patch14 +%patch15 %build #%{?suse_update_config:%{suse_update_config -f . lib-src/*/.}} ++++++ audacity-ffmpeg_match_ext.patch ++++++ Index: src/FFmpeg.cpp =================================================================== --- src/FFmpeg.cpp.orig +++ src/FFmpeg.cpp @@ -356,7 +356,7 @@ int ufile_fopen_input(AVFormatContext ** } // 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 @@ bool FFmpegLibs::InitLibs(wxString libpa 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); Index: src/FFmpeg.h =================================================================== --- src/FFmpeg.h.orig +++ src/FFmpeg.h @@ -224,7 +224,7 @@ public: 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); ++++++ audacity-no_exact_ffmpeg_version.patch ++++++ Index: src/FFmpeg.cpp =================================================================== --- src/FFmpeg.cpp.orig +++ src/FFmpeg.cpp @@ -895,9 +895,9 @@ bool FFmpegLibs::InitLibs(wxString libpa mAVFormatVersion = wxString::Format(wxT("%d.%d.%d"),avfver >> 16 & 0xFF, avfver >> 8 & 0xFF, avfver & 0xFF); mAVUtilVersion = wxString::Format(wxT("%d.%d.%d"),avuver >> 16 & 0xFF, avuver >> 8 & 0xFF, avuver & 0xFF); - wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against 0x%06x - %s)"),avcver,mAVCodecVersion.c_str(),LIBAVCODEC_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION)).c_str()); - wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against 0x%06x - %s)"),avfver,mAVFormatVersion.c_str(),LIBAVFORMAT_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION)).c_str()); - wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against 0x%06x - %s)"),avuver,mAVUtilVersion.c_str(),LIBAVUTIL_VERSION_INT,wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION)).c_str()); + wxLogMessage(wxT("AVCodec version 0x%06x - %s (built against %s)"),avcver,mAVCodecVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVCODEC_VERSION_MAYOR)).c_str()); + wxLogMessage(wxT("AVFormat version 0x%06x - %s (built against %s)"),avfver,mAVFormatVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAYOR)).c_str()); + wxLogMessage(wxT("AVUtil version 0x%06x - %s (built against %s)"),avuver,mAVUtilVersion.c_str(),wxString::FromUTF8(AV_STRINGIFY(LIBAVUTIL_VERSION_MAYOR)).c_str()); int avcverdiff = (avcver >> 16 & 0xFF) - int(LIBAVCODEC_VERSION_MAJOR); int avfverdiff = (avfver >> 16 & 0xFF) - int(LIBAVFORMAT_VERSION_MAJOR); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org