summaryrefslogtreecommitdiff
path: root/staging/sox
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2012-02-05 17:25:05 +0000
committerParabola <dev@list.parabolagnulinux.org>2012-02-05 17:25:05 +0000
commit359d940358dec836dd0acfe9d9caf0b1ff0a97fe (patch)
treeeeed5f77c8417a98fe5b8538d3c019d1cea00c04 /staging/sox
parentcdc66cc7110e78bf1197f9effc70422114f9341b (diff)
Sun Feb 5 17:25:01 UTC 2012
Diffstat (limited to 'staging/sox')
-rw-r--r--staging/sox/PKGBUILD37
-rw-r--r--staging/sox/sox-14.3.2-ffmpeg.patch40
2 files changed, 0 insertions, 77 deletions
diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD
deleted file mode 100644
index 4ac83085c..000000000
--- a/staging/sox/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 146873 2012-01-19 01:56:50Z eric $
-# Maintainer: Eric BĂ©langer <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.3.2
-pkgrel=5
-pkgdesc="The Swiss Army knife of sound processing tools"
-arch=('i686' 'x86_64')
-url="http://sox.sourceforge.net/"
-license=('GPL' 'LGPL')
-depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
-optdepends=('libao: for ao plugin'
- 'ffmpeg: for ffmpeg plugin'
- 'libmad: for mp3 plugin'
- 'libid3tag: for mp3 plugin'
- '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')
-
-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"
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/sox/sox-14.3.2-ffmpeg.patch b/staging/sox/sox-14.3.2-ffmpeg.patch
deleted file mode 100644
index 5289b9b47..000000000
--- a/staging/sox/sox-14.3.2-ffmpeg.patch
+++ /dev/null
@@ -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;
-