Hello community, here is the log from the commit of package audacity for openSUSE:Factory checked in at 2015-03-05 15:43:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/audacity (Old) and /work/SRC/openSUSE:Factory/.audacity.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "audacity" Changes: -------- --- /work/SRC/openSUSE:Factory/audacity/audacity.changes 2014-10-31 12:23:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.audacity.new/audacity.changes 2015-03-05 18:17:35.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 03 20:13:49 UTC 2015 - [email protected] + +- Add patch audacity-ffmpeg.patch to build against current ffmpeg + on PMBS. + +------------------------------------------------------------------- New: ---- audacity-ffmpeg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ audacity.spec ++++++ --- /var/tmp/diff_new_pack.Ai52Yh/_old 2015-03-05 18:17:35.000000000 +0100 +++ /var/tmp/diff_new_pack.Ai52Yh/_new 2015-03-05 18:17:35.000000000 +0100 @@ -71,11 +71,12 @@ # PATCH-FIX-OPENSUSE audacity-no_buildstamp.patch [email protected] -- this patch removes the buildstamp Patch0: audacity-no_buildstamp.patch Patch1: audacity-flac_assert.h.patch +Patch2: audacity-ffmpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: libmp3lame0 -Recommends: libavformat55 -Recommends: libavcodec55 -Recommends: libavutil52 +Recommends: libavformat56 +Recommends: libavcodec56 +Recommends: libavutil54 %description Audacity is a program that manipulates digital audio wave forms. In @@ -88,6 +89,9 @@ %setup -q -n audacity-src-%{version} %patch0 %patch1 +%if %{with ffmpeg} +%patch2 +%endif cp %{SOURCE1} LICENSE_NYQUIST.txt # Make sure we use the system versions rm -r lib-src/libvamp/ ++++++ audacity-ffmpeg.patch ++++++ --- src/FFmpeg.h.orig 2015-03-03 20:56:22.816742627 +0100 +++ src/FFmpeg.h 2015-03-03 20:56:22.851741975 +0100 @@ -688,7 +688,7 @@ FFMPEG_FUNCTION_WITH_RETURN( AVOutputFormat*, av_oformat_next, - (AVOutputFormat *f), + (const AVOutputFormat *f), (f) ); FFMPEG_FUNCTION_WITH_RETURN( @@ -755,7 +755,7 @@ FFMPEG_FUNCTION_WITH_RETURN( int, av_fifo_size, - (AVFifoBuffer *f), + (const AVFifoBuffer *f), (f) ); FFMPEG_FUNCTION_WITH_RETURN( @@ -801,7 +801,7 @@ FFMPEG_FUNCTION_WITH_RETURN( AVDictionaryEntry *, av_dict_get, - (AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), + (const AVDictionary *m, const char *key, const AVDictionaryEntry *prev, int flags), (m, key, prev, flags) ); FFMPEG_FUNCTION_WITH_RETURN( -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
