aboutsummaryrefslogtreecommitdiffstats
path: root/main/sox
diff options
context:
space:
mode:
Diffstat (limited to 'main/sox')
-rw-r--r--main/sox/APKBUILD10
-rw-r--r--main/sox/sox-ffmpeg-0.8.patch38
2 files changed, 4 insertions, 44 deletions
diff --git a/main/sox/APKBUILD b/main/sox/APKBUILD
index d2cf7dacad..ec5a51ec32 100644
--- a/main/sox/APKBUILD
+++ b/main/sox/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sox
-pkgver=14.3.2
-pkgrel=2
+pkgver=14.4.0
+pkgrel=0
pkgdesc="The Swiss Army knife of sound processing tools"
url="http://sox.sourceforge.net/"
arch="all"
@@ -13,7 +13,6 @@ depends=
subpackages="$pkgname-dev $pkgname-doc"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
sox-uclibc.patch
- sox-ffmpeg-0.8.patch
"
prepare() {
@@ -44,6 +43,5 @@ package() {
"$pkgdir"/usr/lib/sox/*.la \
|| return 1
}
-md5sums="e9d35cf3b0f8878596e0b7c49f9e8302 sox-14.3.2.tar.gz
-d8267f718ba6b4fb2f48c5104af31364 sox-uclibc.patch
-f99f0c37c31dd103921292a1d89ad266 sox-ffmpeg-0.8.patch"
+md5sums="b0c15cff7a4ba0ec17fdc74e6a1f9cf1 sox-14.4.0.tar.gz
+d8267f718ba6b4fb2f48c5104af31364 sox-uclibc.patch"
diff --git a/main/sox/sox-ffmpeg-0.8.patch b/main/sox/sox-ffmpeg-0.8.patch
deleted file mode 100644
index 74b8cacdff..0000000000
--- a/main/sox/sox-ffmpeg-0.8.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./src/ffmpeg.c.orig
-+++ ./src/ffmpeg.c
-@@ -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;
-