[arch-commits] Commit in sox/trunk (PKGBUILD)

2020-08-19 Thread David Runge via arch-commits 
Date: Wednesday, August 19, 2020 @ 17:27:52
  Author: dvzrv
Revision: 685032

upgpkg: sox 14.4.2-7: Rebuild against opusfile 0.12.

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-19 16:48:13 UTC (rev 685031)
+++ PKGBUILD2020-08-19 17:27:52 UTC (rev 685032)
@@ -1,9 +1,9 @@
-# Maintainer: David Runge 
+# Maintainer: David Runge 
 # Contributor: Eric Bélanger 
 
 pkgname=sox
 pkgver=14.4.2
-pkgrel=6
+pkgrel=7
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('x86_64')
 url="http://sox.sourceforge.net/";

[arch-commits] Commit in sox/trunk (PKGBUILD)

2020-07-07 Thread Felix Yan via arch-commits 
Date: Tuesday, July 7, 2020 @ 18:48:32
  Author: felixonmars
Revision: 660103

upgpkg: sox 14.4.2-6: reproducibility rebuild

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-07 18:47:48 UTC (rev 660102)
+++ PKGBUILD2020-07-07 18:48:32 UTC (rev 660103)
@@ -3,7 +3,7 @@
 
 pkgname=sox
 pkgver=14.4.2
-pkgrel=5
+pkgrel=6
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('x86_64')
 url="http://sox.sourceforge.net/";

[arch-commits] Commit in sox/trunk (PKGBUILD)

2018-10-04 Thread David Runge via arch-commits 
Date: Thursday, October 4, 2018 @ 18:36:53
  Author: dvzrv
Revision: 389571

upgpkg: sox 14.4.2-4

Adding current maintainer. Changing to correct licenses (GPL2, LGPL2.1). 
Switching to https for source. Adding docs. Minor fixes.

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |   34 +++---
 1 file changed, 23 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-10-04 18:08:51 UTC (rev 389570)
+++ PKGBUILD2018-10-04 18:36:53 UTC (rev 389571)
@@ -1,12 +1,13 @@
-# Maintainer: Eric Bélanger 
+# Maintainer: David Runge 
+# Contributor: Eric Bélanger 
 
 pkgname=sox
 pkgver=14.4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('x86_64')
 url="http://sox.sourceforge.net/";
-license=('GPL' 'LGPL')
+license=('GPL2' 'LGPL2.1')
 depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm')
 makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse' 'opusfile' 
'twolame')
 checkdepends=('time')
@@ -15,9 +16,10 @@
 'libid3tag: for mp3 plugin'
 'wavpack: for wavpack plugin'
 'libpulse: for pulse plugin'
-   'opusfile: for opus plugin'
+'opusfile: for opus plugin'
 'twolame: for mp3 plugin')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 sox-dynamic.patch
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2";
+sox-dynamic.patch
 CVE-2017-15371.patch::https://github.com/mansr/sox/commit/818bdd0.patch
 CVE-2017-11358.patch::https://github.com/mansr/sox/commit/6cb44a4.patch
 CVE-2017-15370.patch::https://github.com/mansr/sox/commit/ef3d8be.patch
@@ -38,21 +40,29 @@
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
+  # fix man page installation
+  sed -e 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' \
+  -i Makefile.in
+
+  # fix dynamic linking
   patch -p1 -i "${srcdir}/sox-dynamic.patch"
+
+  # patch all (known) CVEs
   for _cve in 15371 11358 15370 11332 11359 15372 15642; do
 patch -p1 -i ../CVE-2017-$_cve.patch
   done
-  sed -e '/hcom/d' -i src/tests.sh # test fails with CVE-2017-11358.patch
 
-  aclocal
-  automake
+  # test fails with CVE-2017-11358.patch
+  sed -e '/hcom/d' -i src/tests.sh
+  autoreconf -vfi
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
---with-dyn-default --with-distro="Arch Linux"
+  ./configure --prefix=/usr \
+  --sysconfdir=/etc \
+  --with-dyn-default \
+  --with-distro="Arch Linux"
   make
 }
 
@@ -64,4 +74,6 @@
 package() {
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
+  install -vDm 644 {AUTHORS,ChangeLog,README} \
+-t "${pkgdir}/usr/share/doc/${pkgname}"
 }

[arch-commits] Commit in sox/trunk (PKGBUILD)

2018-02-21 Thread Antonio Rojas via arch-commits 
Date: Wednesday, February 21, 2018 @ 23:13:52
  Author: arojas
Revision: 317369

Fix multiple security issues (FS#57485)

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |   26 +++---
 1 file changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-21 22:38:26 UTC (rev 317368)
+++ PKGBUILD2018-02-21 23:13:52 UTC (rev 317369)
@@ -3,7 +3,7 @@
 
 pkgname=sox
 pkgver=14.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('x86_64')
 url="http://sox.sourceforge.net/";
@@ -18,14 +18,34 @@
 'libpulse: for pulse plugin'
'opusfile: for opus plugin'
 'twolame: for mp3 plugin')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 sox-dynamic.patch)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 sox-dynamic.patch
+CVE-2017-15371.patch::https://github.com/mansr/sox/commit/818bdd0.patch
+CVE-2017-11358.patch::https://github.com/mansr/sox/commit/6cb44a4.patch
+CVE-2017-15370.patch::https://github.com/mansr/sox/commit/ef3d8be.patch
+CVE-2017-11332.patch::https://github.com/mansr/sox/commit/7405bca.patch
+CVE-2017-11359.patch::https://github.com/mansr/sox/commit/8b590b3.patch
+CVE-2017-15372.patch::https://github.com/mansr/sox/commit/001c337.patch
+
CVE-2017-15642.patch::https://github.com/mansr/sox/commit/0be259e.patch)
+
 sha1sums=('dc9668256b9d81ef25d672f14f12ec026b0b4087'
-  '9c71fa36596ed127b1bb367cfbab3b52cd2ecb6d')
+  '9c71fa36596ed127b1bb367cfbab3b52cd2ecb6d'
+  'e10b3903906eee6e1ac413c985de8deba1089c6c'
+  '67c701cf7b3b78b167e5c62a2deade5b92c73bf6'
+  '8cf9cda08e3da1d3cf75fa64d17859b9b2a05b73'
+  'dc832d954ea1dcddfdf80719bbcb7b4f187a9901'
+  '293e4b7942a82c686695d968a2e0b0400ba4f534'
+  'd580cfbac8e6562e9150dbd10b36fd66f4011a48'
+  '23b0012c3e214eade8e6fedeb610548f90527ee4')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
   patch -p1 -i "${srcdir}/sox-dynamic.patch"
+  for _cve in 15371 11358 15370 11332 11359 15372 15642; do
+patch -p1 -i ../CVE-2017-$_cve.patch
+  done
+  sed -e '/hcom/d' -i src/tests.sh # test fails with CVE-2017-11358.patch
+
   aclocal
   automake
 }

[arch-commits] Commit in sox/trunk (PKGBUILD)

2017-07-29 Thread Antonio Rojas 
Date: Saturday, July 29, 2017 @ 10:22:06
  Author: arojas
Revision: 301378

Add twolame MP2 support (FS#54936)

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-29 10:11:35 UTC (rev 301377)
+++ PKGBUILD2017-07-29 10:22:06 UTC (rev 301378)
@@ -3,13 +3,13 @@
 
 pkgname=sox
 pkgver=14.4.2
-pkgrel=1
+pkgrel=2
 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=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse' 'opusfile')
+makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse' 'opusfile' 
'twolame')
 checkdepends=('time')
 optdepends=('libao: for ao plugin'
 'libmad: for mp3 plugin'
@@ -16,7 +16,8 @@
 'libid3tag: for mp3 plugin'
 'wavpack: for wavpack plugin'
 'libpulse: for pulse plugin'
-   'opusfile: for opus plugin')
+   'opusfile: for opus plugin'
+'twolame: for mp3 plugin')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 sox-dynamic.patch)
 sha1sums=('dc9668256b9d81ef25d672f14f12ec026b0b4087'
   '9c71fa36596ed127b1bb367cfbab3b52cd2ecb6d')

[arch-commits] Commit in sox/trunk (PKGBUILD sox-dynamic.patch)

2015-04-12 Thread Eric Bélanger 
Date: Sunday, April 12, 2015 @ 21:46:03
  Author: eric
Revision: 236318

upgpkg: sox 14.4.2-1

Upstream update, Add opus support

Added:
  sox/trunk/sox-dynamic.patch
Modified:
  sox/trunk/PKGBUILD

---+
 PKGBUILD  |   17 +++--
 sox-dynamic.patch |   12 
 2 files changed, 23 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-04-12 19:26:30 UTC (rev 236317)
+++ PKGBUILD2015-04-12 19:46:03 UTC (rev 236318)
@@ -2,26 +2,31 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=sox
-pkgver=14.4.1
-pkgrel=4
+pkgver=14.4.2
+pkgrel=1
 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=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
+makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse' 'opusfile')
 checkdepends=('time')
 optdepends=('libao: for ao plugin'
 'libmad: for mp3 plugin'
 'libid3tag: for mp3 plugin'
 'wavpack: for wavpack plugin'
-'libpulse: for pulse plugin')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9')
+'libpulse: for pulse plugin'
+   'opusfile: for opus plugin')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 sox-dynamic.patch)
+sha1sums=('dc9668256b9d81ef25d672f14f12ec026b0b4087'
+  '9c71fa36596ed127b1bb367cfbab3b52cd2ecb6d')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.in
+  patch -p1 -i "${srcdir}/sox-dynamic.patch"
+  aclocal
+  automake
 }
 
 build() {

Added: sox-dynamic.patch
===
--- sox-dynamic.patch   (rev 0)
+++ sox-dynamic.patch   2015-04-12 19:46:03 UTC (rev 236318)
@@ -0,0 +1,12 @@
+diff -Naur sox-14.4.2-orig/src/Makefile.am sox-14.4.2/src/Makefile.am
+--- sox-14.4.2-orig/src/Makefile.am2015-04-08 17:11:09.555343005 -0400
 sox-14.4.2/src/Makefile.am 2015-04-08 17:11:25.115317153 -0400
+@@ -95,7 +95,7 @@
+ 
+ libsox_la_CFLAGS = @WARN_CFLAGS@
+ libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \
+-  -export-symbols-regex 
'^(sox_.*|lsx_(check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$'
++  -export-symbols-regex 
'^(sox_.*|lsx_(error|flush|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|fail_errno|filelength|find_(enum_(text|value)|file_extension)|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|realloc|rewind|seeki|sigfigs3p?|strcasecmp|tell|unreadb|write(b|_b_buf|buf|s)))$$'
+ 
+ if HAVE_WIN32_LTDL
+   libsox_la_SOURCES += win32-ltdl.c win32-ltdl.h

[arch-commits] Commit in sox/trunk (PKGBUILD)

2013-10-25 Thread Eric Bélanger 
Date: Friday, October 25, 2013 @ 21:24:31
  Author: eric
Revision: 197425

upgpkg: sox 14.4.1-4

Rebuild without static libraries

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-10-25 19:17:26 UTC (rev 197424)
+++ PKGBUILD2013-10-25 19:24:31 UTC (rev 197425)
@@ -3,7 +3,7 @@
 
 pkgname=sox
 pkgver=14.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
@@ -16,7 +16,6 @@
 'libid3tag: for mp3 plugin'
 'wavpack: for wavpack plugin'
 'libpulse: for pulse plugin')
-options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9')

[arch-commits] Commit in sox/trunk (PKGBUILD sox-ffmpeg0.11.patch)

2013-07-11 Thread Eric Bélanger 
Date: Friday, July 12, 2013 @ 04:43:14
  Author: eric
Revision: 189968

upgpkg: sox 14.4.1-3

Disable ffmpeg support as sox doesn't rebuild against ffmpeg 2.0, Ffmpeg 
support is deprecated in 14.4.1 and will be removed completely in 14.4.2

Modified:
  sox/trunk/PKGBUILD
Deleted:
  sox/trunk/sox-ffmpeg0.11.patch

--+
 PKGBUILD |   12 +---
 sox-ffmpeg0.11.patch |  130 -
 2 files changed, 4 insertions(+), 138 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-12 01:43:53 UTC (rev 189967)
+++ PKGBUILD2013-07-12 02:43:14 UTC (rev 189968)
@@ -3,29 +3,25 @@
 
 pkgname=sox
 pkgver=14.4.1
-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')
+makedepends=('libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 checkdepends=('time')
 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-ffmpeg0.11.patch)
-sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9'
-  '2f92bcaebcaf300782396f106cdd27c72048a851')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9')
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  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
 }
 

Deleted: sox-ffmpeg0.11.patch
===
--- sox-ffmpeg0.11.patch2013-07-12 01:43:53 UTC (rev 189967)
+++ sox-ffmpeg0.11.patch2013-07-12 02:43:14 UTC (rev 189968)
@@ -1,130 +0,0 @@
-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.c2012-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_inpu

[arch-commits] Commit in sox/trunk (PKGBUILD)

2013-04-27 Thread Eric Bélanger 
Date: Sunday, April 28, 2013 @ 03:50:29
  Author: eric
Revision: 183804

upgpkg: sox 14.4.1-2

Rebuild against libpng 1.6

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-04-28 00:51:37 UTC (rev 183803)
+++ PKGBUILD2013-04-28 01:50:29 UTC (rev 183804)
@@ -3,7 +3,7 @@
 
 pkgname=sox
 pkgver=14.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
@@ -23,21 +23,25 @@
 sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9'
   '2f92bcaebcaf300782396f106cdd27c72048a851')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   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
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
 --with-dyn-default --with-distro="Arch Linux"
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make bindir=. installcheck
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }

[arch-commits] Commit in sox/trunk (PKGBUILD sox_default_audio_driver_fallback.patch)

2013-02-13 Thread Eric Bélanger 
Date: Wednesday, February 13, 2013 @ 23:50:24
  Author: eric
Revision: 178033

upgpkg: sox 14.4.1-1

Upstream update, Remove old patch

Modified:
  sox/trunk/PKGBUILD
Deleted:
  sox/trunk/sox_default_audio_driver_fallback.patch

-+
 PKGBUILD|   10 ++---
 sox_default_audio_driver_fallback.patch |   51 --
 2 files changed, 4 insertions(+), 57 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-13 22:22:13 UTC (rev 178032)
+++ PKGBUILD2013-02-13 22:50:24 UTC (rev 178033)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 pkgname=sox
-pkgver=14.4.0
-pkgrel=4
+pkgver=14.4.1
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
@@ -19,14 +19,12 @@
 'libpulse: for pulse plugin')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-sox_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch)
-sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
-  'ab304f1fc17269262dbc4977aa9b7e97ec805ae4'
+sox-ffmpeg0.11.patch)
+sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9'
   '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 \

Deleted: sox_default_audio_driver_fallback.patch
===
--- sox_default_audio_driver_fallback.patch 2013-02-13 22:22:13 UTC (rev 
178032)
+++ sox_default_audio_driver_fallback.patch 2013-02-13 22:50:24 UTC (rev 
178033)
@@ -1,51 +0,0 @@
 src/sox.c.old  2012-05-06 22:45:45.380564154 -0400
-+++ src/sox.c  2012-05-06 22:47:11.948248987 -0400
-@@ -2538,20 +2538,38 @@
-   return name? from_env? from_env : name : NULL;
- }
- 
-+static char const * try_device(char const * name)
-+{
-+  sox_format_handler_t const * handler = sox_find_format(name, sox_false);
-+  if (handler) {
-+sox_format_t format, * ft = &format;
-+memset(ft, 0, sizeof(*ft));
-+ft->filename = (char *)device_name(name);
-+ft->priv = lsx_calloc(1, handler->priv_size);
-+if (handler->startwrite(ft) == SOX_SUCCESS) {
-+  handler->stopwrite(ft);
-+  free(ft->priv);
-+  return name;
-+}
-+free(ft->priv);
-+  }
-+  return NULL;
-+}
-+
- static char const * set_default_device(file_t * f)
- {
-   /* Default audio driver type in order of preference: */
-   if (!f->filetype) f->filetype = getenv("AUDIODRIVER");
--  if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = 
"coreaudio";
--  if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype 
= "pulseaudio";
--  if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = 
"alsa";
--  if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = 
"waveaudio";
--  if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = 
"sndio";
--  if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss";
--  if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = 
"sunau";
--  if (!f->filetype && sox_find_format("ao"  , sox_false) && file_count) 
/*!rec*/
--f->filetype = "ao";
--
-+  if (!f->filetype) f->filetype = try_device("coreaudio");
-+  if (!f->filetype) f->filetype = try_device("pulseaudio");
-+  if (!f->filetype) f->filetype = try_device("alsa");
-+  if (!f->filetype) f->filetype = try_device("waveaudio");
-+  if (!f->filetype) f->filetype = try_device("sndio");
-+  if (!f->filetype) f->filetype = try_device("oss");
-+  if (!f->filetype) f->filetype = try_device("sunau");
-+  if (!f->filetype && file_count) /*!rec*/
-+f->filetype = try_device("ao");
-+ 
-   if (!f->filetype) {
- lsx_fail("Sorry, there is no default audio device configured");
- exit(1);

[arch-commits] Commit in sox/trunk (PKGBUILD)

2013-02-07 Thread Eric Bélanger 
Date: Thursday, February 7, 2013 @ 18:49:32
  Author: eric
Revision: 177583

upgpkg: sox 14.4.0-4

Rebuild against ffmpeg and x264

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-07 17:43:30 UTC (rev 177582)
+++ PKGBUILD2013-02-07 17:49:32 UTC (rev 177583)
@@ -3,7 +3,7 @@
 
 pkgname=sox
 pkgver=14.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";

[arch-commits] Commit in sox/trunk (PKGBUILD sox-ffmpeg0.11.patch)

2012-06-11 Thread Eric Bélanger 
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
===
--- PKGBUILD2012-06-12 04:43:11 UTC (rev 161502)
+++ PKGBUILD2012-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.patch2012-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.c2012-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;
+-  AVFormatParamete

[arch-commits] Commit in sox/trunk (PKGBUILD sox_default_audio_driver_fallback.patch)

2012-06-02 Thread Eric Bélanger 
Date: Sunday, June 3, 2012 @ 00:02:07
  Author: eric
Revision: 160645

upgpkg: sox 14.4.0-2

Add default audio driver fallback (close FS#29524)

Added:
  sox/trunk/sox_default_audio_driver_fallback.patch
Modified:
  sox/trunk/PKGBUILD

-+
 PKGBUILD|9 +++--
 sox_default_audio_driver_fallback.patch |   51 ++
 2 files changed, 57 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-02 23:55:03 UTC (rev 160644)
+++ PKGBUILD2012-06-03 04:02:07 UTC (rev 160645)
@@ -3,7 +3,7 @@
 
 pkgname=sox
 pkgver=14.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
@@ -17,11 +17,14 @@
 'wavpack: for wavpack plugin'
 'libpulse: for pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+sox_default_audio_driver_fallback.patch)
+sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
+  'ab304f1fc17269262dbc4977aa9b7e97ec805ae4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.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"

Added: sox_default_audio_driver_fallback.patch
===
--- sox_default_audio_driver_fallback.patch (rev 0)
+++ sox_default_audio_driver_fallback.patch 2012-06-03 04:02:07 UTC (rev 
160645)
@@ -0,0 +1,51 @@
+--- src/sox.c.old  2012-05-06 22:45:45.380564154 -0400
 src/sox.c  2012-05-06 22:47:11.948248987 -0400
+@@ -2538,20 +2538,38 @@
+   return name? from_env? from_env : name : NULL;
+ }
+ 
++static char const * try_device(char const * name)
++{
++  sox_format_handler_t const * handler = sox_find_format(name, sox_false);
++  if (handler) {
++sox_format_t format, * ft = &format;
++memset(ft, 0, sizeof(*ft));
++ft->filename = (char *)device_name(name);
++ft->priv = lsx_calloc(1, handler->priv_size);
++if (handler->startwrite(ft) == SOX_SUCCESS) {
++  handler->stopwrite(ft);
++  free(ft->priv);
++  return name;
++}
++free(ft->priv);
++  }
++  return NULL;
++}
++
+ static char const * set_default_device(file_t * f)
+ {
+   /* Default audio driver type in order of preference: */
+   if (!f->filetype) f->filetype = getenv("AUDIODRIVER");
+-  if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = 
"coreaudio";
+-  if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype 
= "pulseaudio";
+-  if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = 
"alsa";
+-  if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = 
"waveaudio";
+-  if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = 
"sndio";
+-  if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss";
+-  if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = 
"sunau";
+-  if (!f->filetype && sox_find_format("ao"  , sox_false) && file_count) 
/*!rec*/
+-f->filetype = "ao";
+-
++  if (!f->filetype) f->filetype = try_device("coreaudio");
++  if (!f->filetype) f->filetype = try_device("pulseaudio");
++  if (!f->filetype) f->filetype = try_device("alsa");
++  if (!f->filetype) f->filetype = try_device("waveaudio");
++  if (!f->filetype) f->filetype = try_device("sndio");
++  if (!f->filetype) f->filetype = try_device("oss");
++  if (!f->filetype) f->filetype = try_device("sunau");
++  if (!f->filetype && file_count) /*!rec*/
++f->filetype = try_device("ao");
++ 
+   if (!f->filetype) {
+ lsx_fail("Sorry, there is no default audio device configured");
+ exit(1);

[arch-commits] Commit in sox/trunk (PKGBUILD sox-14.3.2-ffmpeg.patch)

2012-04-17 Thread Eric Bélanger 
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
===
--- PKGBUILD2012-04-17 19:32:26 UTC (rev 156374)
+++ PKGBUILD2012-04-17 19:41:03 UTC (rev 156375)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger 
 
 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;
-

[arch-commits] Commit in sox/trunk (PKGBUILD)

2012-02-09 Thread Eric Bélanger 
Date: Thursday, February 9, 2012 @ 23:38:22
  Author: eric
Revision: 149754

upgpkg: sox 14.3.2-6

Add gsm depends (close FS#28327)

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-10 04:20:16 UTC (rev 149753)
+++ PKGBUILD2012-02-10 04:38:22 UTC (rev 149754)
@@ -3,12 +3,12 @@
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=5
+pkgrel=6
 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')
+depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr' 'gsm')
 makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 optdepends=('libao: for ao plugin'
 'ffmpeg: for ffmpeg plugin'

[arch-commits] Commit in sox/trunk (PKGBUILD)

2012-01-18 Thread Eric Bélanger 
Date: Wednesday, January 18, 2012 @ 20:56:22
  Author: eric
Revision: 146872

upgpkg: sox 14.3.2-5

Rebuild against libpng 1.5 and libtiff 4.0

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-19 01:34:27 UTC (rev 146871)
+++ PKGBUILD2012-01-19 01:56:22 UTC (rev 146872)
@@ -3,7 +3,7 @@
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
@@ -25,7 +25,7 @@
 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.am
+  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

[arch-commits] Commit in sox/trunk (PKGBUILD sox-14.3.2-ffmpeg.patch)

2011-10-31 Thread Eric Bélanger 
Date: Monday, October 31, 2011 @ 22:15:59
  Author: eric
Revision: 141634

upgpkg: sox 14.3.2-4

Rebuild against ffmpeg 20111030, Clean up depends

Added:
  sox/trunk/sox-14.3.2-ffmpeg.patch
Modified:
  sox/trunk/PKGBUILD

-+
 PKGBUILD|   12 +++-
 sox-14.3.2-ffmpeg.patch |   40 
 2 files changed, 47 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-11-01 00:51:56 UTC (rev 141633)
+++ PKGBUILD2011-11-01 02:15:59 UTC (rev 141634)
@@ -3,12 +3,12 @@
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
 license=('GPL' 'LGPL')
-depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
+depends=('libltdl' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
 makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
 optdepends=('libao: for ao plugin'
 'ffmpeg: for ffmpeg plugin'
@@ -17,12 +17,14 @@
 'wavpack: for wavpack plugin'
 'libpulse: for pulse plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')
-sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3')
+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.am
   ./configure --prefix=/usr --sysconfdir=/etc \
 --with-dyn-default --with-distro="Arch Linux"

Added: sox-14.3.2-ffmpeg.patch
===
--- sox-14.3.2-ffmpeg.patch (rev 0)
+++ sox-14.3.2-ffmpeg.patch 2011-11-01 02:15:59 UTC (rev 141634)
@@ -0,0 +1,40 @@
+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;
+

[arch-commits] Commit in sox/trunk (PKGBUILD)

2011-05-22 Thread Eric Bélanger 
Date: Monday, May 23, 2011 @ 00:58:46
  Author: eric
Revision: 124581

upgpkg: sox 14.3.2-3
Added pulse support, Cleaned up PKGBUILD

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-23 03:14:05 UTC (rev 124580)
+++ PKGBUILD2011-05-23 04:58:46 UTC (rev 124581)
@@ -3,18 +3,19 @@
 
 pkgname=sox
 pkgver=14.3.2
-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=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack')
+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')
+'wavpack: for wavpack plugin'
+'libpulse: for pulse plugin')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')
@@ -22,6 +23,7 @@
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|man1/sox.1 soxeffect.7|man1/sox.1.gz soxeffect.7.gz|' Makefile.am
   ./configure --prefix=/usr --sysconfdir=/etc \
 --with-dyn-default --with-distro="Arch Linux"
   make
@@ -30,6 +32,4 @@
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  ln -sf play "${pkgdir}/usr/bin/rec"
-  ln -sf ../man1/sox.1.gz "${pkgdir}/usr/share/man/man7/soxeffect.7"
 }

[arch-commits] Commit in sox/trunk (PKGBUILD)

2011-03-30 Thread Ray Rashif 
Date: Wednesday, March 30, 2011 @ 14:17:00
  Author: schiv
Revision: 117296

upgpkg: sox 14.3.2-2
Fix FS#23517: add wavpack (optional) support

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-30 17:30:15 UTC (rev 117295)
+++ PKGBUILD2011-03-30 18:17:00 UTC (rev 117296)
@@ -3,15 +3,18 @@
 
 pkgname=sox
 pkgver=14.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
 license=('GPL' 'LGPL')
 depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag')
-optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' 'libmad: for 
mp3 plugin' \
-'libid3tag: for mp3 plugin')
+makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack')
+optdepends=('libao: for ao plugin'
+'ffmpeg: for ffmpeg plugin'
+'libmad: for mp3 plugin'
+'libid3tag: for mp3 plugin'
+'wavpack: for wavpack plugin')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')

[arch-commits] Commit in sox/trunk (PKGBUILD)

2011-03-08 Thread Eric Bélanger 
Date: Tuesday, March 8, 2011 @ 17:25:17
  Author: eric
Revision: 113488

upgpkg: sox 14.3.2-1
Upstream update

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |   25 ++---
 1 file changed, 10 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-08 21:55:44 UTC (rev 113487)
+++ PKGBUILD2011-03-08 22:25:17 UTC (rev 113488)
@@ -1,12 +1,9 @@
 # $Id$
 # Maintainer: Eric Bélanger 
-# Contributor: Ronald van Haren 
-# Contributor: dale 
-# Contributor: Tom Newsom 
 
 pkgname=sox
-pkgver=14.3.1
-pkgrel=2
+pkgver=14.3.2
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
@@ -16,22 +13,20 @@
 optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' 'libmad: for 
mp3 plugin' \
 'libid3tag: for mp3 plugin')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('b99871c7bbae84feac9d0d1f010331ba')
-sha1sums=('ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('f6e1999b05d9b0cc9bb47ce8d3208dee')
+sha1sums=('026636c90d7accba76225a2821aaa2ffa6fe41a3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
---sysconfdir=/etc \
---with-dyn-default \
---with-distro="Arch Linux" || return 1
-  make || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc \
+--with-dyn-default --with-distro="Arch Linux"
+  make
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-  ln -sf play "${pkgdir}/usr/bin/rec" || return 1
+  make DESTDIR="${pkgdir}" install
+  ln -sf play "${pkgdir}/usr/bin/rec"
   ln -sf ../man1/sox.1.gz "${pkgdir}/usr/share/man/man7/soxeffect.7"
 }

[arch-commits] Commit in sox/trunk (PKGBUILD)

2010-06-11 Thread Eric Bélanger 
Date: Friday, June 11, 2010 @ 20:02:02
  Author: eric
Revision: 82492

upgpkg: sox 14.3.1-2
Added libpng depends (close FS#19758), Cleaned up depends, Added optdepends

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-11 18:29:00 UTC (rev 82491)
+++ PKGBUILD2010-06-12 00:02:02 UTC (rev 82492)
@@ -6,12 +6,15 @@
 
 pkgname=sox
 pkgver=14.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
 license=('GPL' 'LGPL')
-depends=('ffmpeg' 'libao' 'libvorbis' 'lame' 'libmad' 'alsa-lib' 'libsndfile' 
'libtool' 'file')
+depends=('libtool' 'file' 'libsndfile' 'libpng' 'lame' 'opencore-amr')
+makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag')
+optdepends=('libao: for ao plugin' 'ffmpeg: for ffmpeg plugin' 'libmad: for 
mp3 plugin' \
+'libid3tag: for mp3 plugin')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('b99871c7bbae84feac9d0d1f010331ba')

[arch-commits] Commit in sox/trunk (PKGBUILD)

2010-04-29 Thread Eric Bélanger 
Date: Friday, April 30, 2010 @ 01:03:53
  Author: eric
Revision: 79035

upgpkg: sox 14.3.1-1
Upstream update, cleaned up depends

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-30 02:30:05 UTC (rev 79034)
+++ PKGBUILD2010-04-30 05:03:53 UTC (rev 79035)
@@ -5,16 +5,17 @@
 # Contributor: Tom Newsom 
 
 pkgname=sox
-pkgver=14.3.0
-pkgrel=4
+pkgver=14.3.1
+pkgrel=1
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
 license=('GPL' 'LGPL')
-depends=('ffmpeg' 'libao' 'libvorbis' 'lame' 'libmad' 'bash' 'alsa-lib' 
'libsndfile' 'libsamplerate' 'libtool' 'file')
+depends=('ffmpeg' 'libao' 'libvorbis' 'lame' 'libmad' 'alsa-lib' 'libsndfile' 
'libtool' 'file')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8e3509804e6227273ef84092e1a2fea7')
+md5sums=('b99871c7bbae84feac9d0d1f010331ba')
+sha1sums=('ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"

[arch-commits] Commit in sox/trunk (PKGBUILD)

2010-04-10 Thread Andrea Scarpino 
Date: Saturday, April 10, 2010 @ 17:37:44
  Author: andrea
Revision: 77135

upgpkg: sox 14.3.0-4
libao 1.0 rebuild

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-10 21:37:41 UTC (rev 77134)
+++ PKGBUILD2010-04-10 21:37:44 UTC (rev 77135)
@@ -1,12 +1,12 @@
 # $Id$
-# Maintainer:
+# Maintainer: Eric Bélanger 
 # Contributor: Ronald van Haren 
 # Contributor: dale 
 # Contributor: Tom Newsom 
 
 pkgname=sox
 pkgver=14.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
@@ -23,6 +23,10 @@
 --with-dyn-default \
 --with-distro="Arch Linux" || return 1
   make || return 1
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install || return 1
   ln -sf play "${pkgdir}/usr/bin/rec" || return 1
   ln -sf ../man1/sox.1.gz "${pkgdir}/usr/share/man/man7/soxeffect.7"

[arch-commits] Commit in sox/trunk (PKGBUILD)

2010-01-18 Thread Andrea Scarpino 
Date: Monday, January 18, 2010 @ 05:48:19
  Author: andrea
Revision: 63706

upgpkg: sox 14.3.0-3
libpng rebuild

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-18 10:48:14 UTC (rev 63705)
+++ PKGBUILD2010-01-18 10:48:19 UTC (rev 63706)
@@ -1,24 +1,27 @@
 # $Id$
-# Maintainer: Ronald van Haren 
+# Maintainer:
+# Contributor: Ronald van Haren 
 # Contributor: dale 
 # Contributor: Tom Newsom 
 
 pkgname=sox
 pkgver=14.3.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=('ffmpeg>=20100108' 'libao' 'libvorbis' 'lame' 'libmad' 'bash' 
'alsa-lib' 'libsndfile' 'libsamplerate' 'libtool' 'file')
+depends=('ffmpeg' 'libao' 'libvorbis' 'lame' 'libmad' 'bash' 'alsa-lib' 
'libsndfile' 'libsamplerate' 'libtool' 'file')
 options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('8e3509804e6227273ef84092e1a2fea7')
-sha1sums=('34b8e991ba8511fa9683e9e9d356fb7f4179d03c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --with-dyn-default 
--with-distro="Arch Linux" || return 1
+  ./configure --prefix=/usr \
+--sysconfdir=/etc \
+--with-dyn-default \
+--with-distro="Arch Linux" || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
   ln -sf play "${pkgdir}/usr/bin/rec" || return 1

[arch-commits] Commit in sox/trunk (PKGBUILD)

2010-01-10 Thread Eric Bélanger 
Date: Sunday, January 10, 2010 @ 15:59:26
  Author: eric
Revision: 62661

upgpkg: sox 14.3.0-2
Rebuilt against ffmpeg 20100108

Modified:
  sox/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-10 20:50:18 UTC (rev 62660)
+++ PKGBUILD2010-01-10 20:59:26 UTC (rev 62661)
@@ -5,12 +5,12 @@
 
 pkgname=sox
 pkgver=14.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64')
 url="http://sox.sourceforge.net/";
 license=('GPL' 'LGPL')
-depends=('ffmpeg>=0.5' 'libao' 'libvorbis' 'lame' 'libmad' 'bash' 'alsa-lib' 
'libsndfile' 'libsamplerate' 'libtool' 'file')
+depends=('ffmpeg>=20100108' 'libao' 'libvorbis' 'lame' 'libmad' 'bash' 
'alsa-lib' 'libsndfile' 'libsamplerate' 'libtool' 'file')
 options=('!libtool')
 
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('8e3509804e6227273ef84092e1a2fea7')