Hello community, here is the log from the commit of package sox for openSUSE:Factory checked in at Mon Jun 27 11:42:38 CEST 2011.
-------- --- sox/sox.changes 2011-03-01 15:16:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/sox/sox.changes 2011-06-27 10:14:59.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jun 27 08:14:11 UTC 2011 - [email protected] + +- remove _service file, way too fragile (see sr#74395) + +------------------------------------------------------------------- +Wed Jun 22 23:24:09 UTC 2011 - [email protected] + +- make it support new ffmpeg versions +- remove buildstamp without modifying the output +- use opencore-amr for AMR support + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service _service:download_url:sox-14.3.2.tar.bz2 _service:set_version:sox.spec sox-no_buildstamp.patch New: ---- sox-14.3.2-new_ffmpeg.patch sox-14.3.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sox.spec ++++++ --- /var/tmp/diff_new_pack.Va5GVf/_old 2011-06-27 11:28:20.000000000 +0200 +++ /var/tmp/diff_new_pack.Va5GVf/_new 2011-06-27 11:28:20.000000000 +0200 @@ -46,22 +46,19 @@ %if %{with lame} BuildRequires: libmp3lame-devel %endif -%if %{with amrwb} -BuildRequires: libamrwb-devel +%if %{with amrwb} && %{with amrnb} +BuildRequires: libopencore-amr-devel %endif -%if %{with amrnb} -BuildRequires: libamrnb-devel -%endif -Version: to_be_filled_by_service -Release: 1 +Version: 14.3.2 +Release: 3 License: LGPLv2.1+ ; GPLv2+ Summary: Sound Conversion Tools and Library Url: http://sox.sourceforge.net Group: Productivity/Multimedia/Sound/Editors and Convertors -Source: %{name}-%{version}.tar.bz2 +Source: http://downloads.sourceforge.net/project/sox/sox/%{version}/%{name}-%{version}.tar.bz2 Source1: audioio.h -# PATCH-FIX-OPENSUSE %{name}-no_buildstamp.patch [email protected] -- this patch removes the buildstamp -Patch1: %{name}-no_buildstamp.patch +# PATCH-FIX-UPSTREAM %{name}-14.3.2-new_ffmpeg.patch [email protected] -- make it work with new ffmpeg, from upstream GIT +Patch0: %{name}-14.3.2-new_ffmpeg.patch # PATCH-FIX-UPSTREAM %{name}-14.3.1-undefined.patch sf#3072301 [email protected] -- fix undefined behavior problems as reported by post-build script Patch2: %{name}-14.3.1-undefined.patch # PATCH-FIX-UPSTREAM %{name}-14.3.1-aliasing.patch sf#3072320 [email protected] -- fix an aliasing problem as reported by post-build script @@ -89,9 +86,13 @@ %prep %setup -q -%patch1 +%patch0 -p1 %patch2 %patch3 +FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') +sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/sox.c +FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') +sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/sox.c %build # /dev/audio (OSS) support. If it ever breaks just remove it. ++++++ sox-14.3.2-new_ffmpeg.patch ++++++ >From 0904a4c1387919d318adece40838564b0a96c5b6 Mon Sep 17 00:00:00 2001 From: Reuben Thomas <[email protected]> Date: Wed, 25 May 2011 22:38:50 +0100 Subject: [PATCH] Stop using some deprecated symbol names. --- src/ffmpeg.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ffmpeg.c b/src/ffmpeg.c index e6292f3..b9727ba 100644 --- a/src/ffmpeg.c +++ b/src/ffmpeg.c @@ -91,7 +91,7 @@ static int stream_component_open(priv_t * ffmpeg, int stream_index) if (!codec || avcodec_open(enc, codec) < 0) return -1; - if (enc->codec_type != CODEC_TYPE_AUDIO) { + if (enc->codec_type != AVMEDIA_TYPE_AUDIO) { lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type); return -1; } @@ -182,7 +182,7 @@ static int startread(sox_format_t * ft) /* Find audio stream (FIXME: allow different stream to be selected) */ for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) { AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec; - if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) { + if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) { ffmpeg->audio_index = i; break; } @@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_format_t * ft, AVFormatContext *oc, enum C c = st->codec; c->codec_id = codec_id; - c->codec_type = CODEC_TYPE_AUDIO; + c->codec_type = AVMEDIA_TYPE_AUDIO; /* put sample parameters */ c->bit_rate = 256000; /* FIXME: allow specification */ @@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t * ft, const sox_sample_t *buf, size_t l av_init_packet(&pkt); pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples); pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base, ffmpeg->audio_st->time_base); - pkt.flags |= PKT_FLAG_KEY; + pkt.flags |= AV_PKT_FLAG_KEY; pkt.stream_index = ffmpeg->audio_st->index; pkt.data = ffmpeg->audio_buf_aligned; -- 1.7.0.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
