diff options
| author | piernov <piernov@piernov.org> | 2011-09-17 13:21:46 +0200 |
|---|---|---|
| committer | piernov <piernov@piernov.org> | 2011-09-17 13:21:46 +0200 |
| commit | 72e7f4a81c1eae2ac94ed65c46eba76e5559ced4 (patch) | |
| tree | ac6ed6ed222333fe32a38b43e4728b26db04ec0a /extra/sox | |
| parent | 91799f10519755fecc1bbaa28d219286bdd647e9 (diff) | |
| download | nutyx-extra-72e7f4a81c1eae2ac94ed65c46eba76e5559ced4.tar.gz nutyx-extra-72e7f4a81c1eae2ac94ed65c46eba76e5559ced4.tar.bz2 nutyx-extra-72e7f4a81c1eae2ac94ed65c46eba76e5559ced4.tar.xz nutyx-extra-72e7f4a81c1eae2ac94ed65c46eba76e5559ced4.zip | |
sox 14.3.2-3 patch ffmpeg 0.8
Diffstat (limited to 'extra/sox')
| -rw-r--r-- | extra/sox/.md5sum.i686 | 1 | ||||
| -rw-r--r-- | extra/sox/.md5sum.x86_64 | 1 | ||||
| -rw-r--r-- | extra/sox/Pkgfile | 6 | ||||
| -rw-r--r-- | extra/sox/sox-14.3.2-ffmpeg-0.8.patch | 38 |
4 files changed, 44 insertions, 2 deletions
diff --git a/extra/sox/.md5sum.i686 b/extra/sox/.md5sum.i686 index 7a1ef7a2c..38b54a300 100644 --- a/extra/sox/.md5sum.i686 +++ b/extra/sox/.md5sum.i686 @@ -1 +1,2 @@ +5fdf2681393f5ed045f3ff5e4ea163b1 sox-14.3.2-ffmpeg-0.8.patch e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz diff --git a/extra/sox/.md5sum.x86_64 b/extra/sox/.md5sum.x86_64 index 7a1ef7a2c..38b54a300 100644 --- a/extra/sox/.md5sum.x86_64 +++ b/extra/sox/.md5sum.x86_64 @@ -1 +1,2 @@ +5fdf2681393f5ed045f3ff5e4ea163b1 sox-14.3.2-ffmpeg-0.8.patch e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz diff --git a/extra/sox/Pkgfile b/extra/sox/Pkgfile index 374988eb2..60a0f4897 100644 --- a/extra/sox/Pkgfile +++ b/extra/sox/Pkgfile @@ -7,11 +7,13 @@ name=sox version=14.3.2 -release=2 -source=(http://sourceforge.net/projects/sox/files/$name/$version/$name-$version.tar.gz) +release=3 +source=(http://sourceforge.net/projects/sox/files/$name/$version/$name-$version.tar.gz + sox-14.3.2-ffmpeg-0.8.patch) build() { cd $name-$version + patch -p0 < ../sox-14.3.2-ffmpeg-0.8.patch ./configure --prefix=/usr \ --mandir=/usr/share/man \ --infodir=/usr/share/info diff --git a/extra/sox/sox-14.3.2-ffmpeg-0.8.patch b/extra/sox/sox-14.3.2-ffmpeg-0.8.patch new file mode 100644 index 000000000..023914694 --- /dev/null +++ b/extra/sox/sox-14.3.2-ffmpeg-0.8.patch @@ -0,0 +1,38 @@ +--- src/ffmpeg.c.ffmpeg 2011-06-24 12:54:05.000000000 +0200 ++++ src/ffmpeg.c 2011-06-24 12:55:19.000000000 +0200 +@@ -91,7 +91,7 @@ + + 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 @@ + /* 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 @@ + + 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 @@ + 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; + |