shithub: sox

Download patch

ref: f204a4dc9d05990c386dc6bf6eff228dd25602ba
parent: a87a798fb96e2de4760aebdf225bb17bef8caeda
author: Pascal Giard <evilynux@gmail.com>
date: Wed Mar 2 06:22:35 EST 2011

Sync with latest Debian package.

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,28 @@
-sox (14.3.2-0cvs1) UNRELEASED; urgency=low
+sox (14.3.2-1cvs1) UNRELEASED; urgency=low
 
   * CVS Version.
+
+ -- Pascal Giard <evilynux@gmail.com>  Wed, 02 Mar 2011 11:20:15 -0500
+
+sox (14.3.2-1) unstable; urgency=low
+
+  * New upstream release (closes: #616098).
     - Fixed segfault for some LADSPA effects (closes: #555940).
+    - Fixed --with-dyn-default for sndfile, amr-nb and arm-wb.
   * [debian/patches/01_fix_ffmpeg_alignment.patch]:
     - Removed, fixed upstream.
   * [debian/control]:
     - Fixed build-dep minimum required version of liavcodec to 4:0.6.0. The
       mips arch currently fails to build as it is still at 0.5.x.
+    - Modified libsox-fmt-mp3 to include a note on mp3 support.
+  * [debian/rules]:
+    - Removed --without-lame and added --enable-dl-lame to configure flags.
+      LAME can now be detected at runtime; the user HAS to install LAME himself
+      (closes: #382275, #480180).
+  * [debian/libsox-fmt-base.install]:
+    - Added new dynamic libraries for sndfile, amr-nb and amr-wb.
 
- -- Pascal Giard <evilynux@gmail.com>  Wed, 16 Feb 2011 11:22:35 -0500
+ -- Pascal Giard <pascal@debian.org>  Wed, 02 Mar 2011 11:04:21 -0500
 
 sox (14.3.1-2) unstable; urgency=low
 
--- a/debian/control
+++ b/debian/control
@@ -119,9 +119,10 @@
  SoX is the swiss army knife of sound processing.
  .
  This package contains the SoX MP3 format library.
- Read support by libmad. Write support not available yet.
+ Read support by libmad. Write support is available if libmp3lame is installed.
  .
  libmad: http://www.underbit.com/products/mad/
+ lame: http://lame.sourceforge.net/
 
 Package: libsox-fmt-oss
 Architecture: any
--- a/debian/libsox-fmt-base.install
+++ b/debian/libsox-fmt-base.install
@@ -1,5 +1,8 @@
+debian/tmp/usr/lib/sox/libsox_fmt_amr_nb.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_amr_wb.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_flac.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_gsm.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_lpc10.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_sndfile.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_vorbis.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_wavpack.so* usr/lib/sox/
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
-DEB_TAR_SRCDIR := sox-14.3.1
+DEB_TAR_SRCDIR := sox-14.3.2
 
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -9,6 +9,6 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 CPPFLAGS += -I/usr/include/ffmpeg
-DEB_CONFIGURE_EXTRA_FLAGS := --without-lame --with-distro="$(shell dpkg-vendor --query vendor)" --with-dyn-default
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-dl-lame --with-distro="$(shell dpkg-vendor --query vendor)" --with-dyn-default
 # Takes care of postinst-has-useless-call-to-ldconfig for libsox-fmt-*
 DEB_DH_MAKESHLIBS_ARGS := -Xfmt