Date: Tuesday, April 17, 2012 @ 15:41:03 Author: eric Revision: 156375
upgpkg: sox 14.4.0-1 Upstream update, Remove old patch Modified: sox/trunk/PKGBUILD Deleted: sox/trunk/sox-14.3.2-ffmpeg.patch -------------------------+ PKGBUILD | 11 ++++------- sox-14.3.2-ffmpeg.patch | 40 ---------------------------------------- 2 files changed, 4 insertions(+), 47 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-17 19:32:26 UTC (rev 156374) +++ PKGBUILD 2012-04-17 19:41:03 UTC (rev 156375) @@ -2,8 +2,8 @@ # Maintainer: Eric Bélanger <[email protected]> pkgname=sox -pkgver=14.3.2 -pkgrel=6 +pkgver=14.4.0 +pkgrel=1 pkgdesc="The Swiss Army knife of sound processing tools" arch=('i686' 'x86_64') url="http://sox.sourceforge.net/"; @@ -17,14 +17,11 @@ 'wavpack: for wavpack plugin' 'libpulse: for pulse plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - sox-14.3.2-ffmpeg.patch) -sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3' - '86caa6aa86a0bf7a048522114d4efd11acbbda70') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i "${srcdir}/sox-14.3.2-ffmpeg.patch" sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in ./configure --prefix=/usr --sysconfdir=/etc \ --with-dyn-default --with-distro="Arch Linux" Deleted: sox-14.3.2-ffmpeg.patch =================================================================== --- sox-14.3.2-ffmpeg.patch 2012-04-17 19:32:26 UTC (rev 156374) +++ sox-14.3.2-ffmpeg.patch 2012-04-17 19:41:03 UTC (rev 156375) @@ -1,40 +0,0 @@ -Index: sox-14.3.2/src/ffmpeg.c -=================================================================== ---- sox-14.3.2.orig/src/ffmpeg.c -+++ sox-14.3.2/src/ffmpeg.c -@@ -91,7 +91,7 @@ static int stream_component_open(priv_t - - 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_fo - - 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 - 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; -
