[arch-commits] Commit in sox/trunk (PKGBUILD sox-ffmpeg0.11.patch)
Eric Bélanger
eric at archlinux.org
Tue Jun 12 05:33:56 UTC 2012
Date: Tuesday, June 12, 2012 @ 01:33:56
Author: eric
Revision: 161503
upgpkg: sox 14.4.0-3
Rebuild against ffmpeg 0.11, Add check function
Added:
sox/trunk/sox-ffmpeg0.11.patch
Modified:
sox/trunk/PKGBUILD
----------------------+
PKGBUILD | 14 ++++-
sox-ffmpeg0.11.patch | 130 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 141 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-06-12 04:43:11 UTC (rev 161502)
+++ PKGBUILD 2012-06-12 05:33:56 UTC (rev 161503)
@@ -3,13 +3,14 @@
pkgname=sox
pkgver=14.4.0
-pkgrel=2
+pkgrel=3
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' 'gsm')
makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
+checkdepends=('time')
optdepends=('libao: for ao plugin'
'ffmpeg: for ffmpeg plugin'
'libmad: for mp3 plugin'
@@ -18,19 +19,26 @@
'libpulse: for pulse plugin')
options=('!libtool')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- sox_default_audio_driver_fallback.patch)
+ sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch)
sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
- 'ab304f1fc17269262dbc4977aa9b7e97ec805ae4')
+ 'ab304f1fc17269262dbc4977aa9b7e97ec805ae4'
+ '2f92bcaebcaf300782396f106cdd27c72048a851')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch"
+ patch -p1 -i "${srcdir}/sox-ffmpeg0.11.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
}
+check() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make bindir=. installcheck
+}
+
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
Added: sox-ffmpeg0.11.patch
===================================================================
--- sox-ffmpeg0.11.patch (rev 0)
+++ sox-ffmpeg0.11.patch 2012-06-12 05:33:56 UTC (rev 161503)
@@ -0,0 +1,130 @@
+diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
+--- sox-14.4.0-orig/configure 2012-06-12 00:35:53.462360803 -0400
++++ sox-14.4.0/configure 2012-06-12 00:36:08.572361294 -0400
+@@ -15781,9 +15781,9 @@
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
+-$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
+-if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5
++$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
++if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+@@ -15797,27 +15797,27 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char av_open_input_file ();
++char avformat_open_input ();
+ int
+ main ()
+ {
+-return av_open_input_file ();
++return avformat_open_input ();
+ ;
+ return 0;
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_avformat_av_open_input_file=yes
++ ac_cv_lib_avformat_avformat_open_input=yes
+ else
+- ac_cv_lib_avformat_av_open_input_file=no
++ ac_cv_lib_avformat_avformat_open_input=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5
+-$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
+-if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5
++$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
++if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
+ for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
+--- sox-14.4.0-orig/src/ffmpeg.c 2012-06-12 00:35:53.459027469 -0400
++++ sox-14.4.0/src/ffmpeg.c 2012-06-12 00:36:26.539028545 -0400
+@@ -93,7 +93,7 @@
+ #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+ enc->error_resilience = 1;
+ #else
+- enc->error_recognition = 1;
++ enc->err_recognition = 1;
+ #endif
+
+ if (!codec || avcodec_open(enc, codec) < 0)
+@@ -157,7 +157,7 @@
+ static int startread(sox_format_t * ft)
+ {
+ priv_t * ffmpeg = (priv_t *)ft->priv;
+- AVFormatParameters params;
++ AVDictionary *params;
+ int ret;
+ int i;
+
+@@ -172,7 +172,7 @@
+
+ /* Open file and get format */
+ memset(¶ms, 0, sizeof(params));
+- if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, ¶ms)) < 0) {
++ if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, ¶ms)) < 0) {
+ lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);
+ return SOX_EOF;
+ }
+@@ -231,7 +231,7 @@
+ /* If input buffer empty, read more data */
+ if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
+ if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
+- (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
++ (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
+ break;
+ ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+ ffmpeg->audio_buf_index = 0;
+@@ -373,13 +373,6 @@
+ return SOX_EOF;
+ }
+
+- /* set the output parameters (must be done even if no
+- parameters). */
+- if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
+- lsx_fail("ffmpeg invalid output format parameters");
+- return SOX_EOF;
+- }
+-
+ /* Next line for debugging */
+ /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
+
+@@ -391,14 +384,14 @@
+
+ /* open the output file, if needed */
+ if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
+- if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
++ if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
+ lsx_fail("ffmpeg could not open `%s'", ft->filename);
+ return SOX_EOF;
+ }
+ }
+
+ /* write the stream header, if any */
+- av_write_header(ffmpeg->ctxt);
++ avformat_write_header(ffmpeg->ctxt, NULL);
+
+ return SOX_SUCCESS;
+ }
+@@ -478,7 +471,7 @@
+ #if (LIBAVFORMAT_VERSION_INT < 0x340000)
+ url_fclose(&ffmpeg->ctxt->pb);
+ #else
+- url_fclose(ffmpeg->ctxt->pb);
++ avio_close(ffmpeg->ctxt->pb);
+ #endif
+ }
+
More information about the arch-commits
mailing list