shithub: sox

Download patch

ref: 81d4bae0b757b7c9d250b06320cc64e59054564e
parent: 364af1c842b21770642afc516b12491381ee79ef
author: evilynux <evilynux>
date: Thu Jun 26 23:51:48 EDT 2008

- Added new formats.
- Started to merge free formats in libsox-fmt-base as per Debian users' request. Only gsm and libsndfile for now.
- Fixed RPATH issue with configure flag (--disable-rpath) instead of using chrpath.

--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,20 @@
   * CVS version.
     - Adds support for for the 2, 2.6 and 4-bit ADPCM .voc (closes: #103479).
     - Adds pkgconfig support (closes: #462704).
+    - Adds many formats supported by sndfile.
   * [debian/libsox-fmt-base.install]:
     - Removed auto library, no longer exists upstream.
-    - Added htk format library.
+    - Added Hidden Markov Model speech processing format (htk) library.
+    - Added Aaron Wallace's `Sounder' of 1991 format (sndr) library.
+    - Added Martin Hepperle's `SoundTool' of 1991/2 format (sndt) library.
+    - Added WavPack format (wv) library.
+    - Added Apples's Core Audio Format (caf) library.
+    - Added Ensoniq PARIS digitial audio format (fap, paf) libraries.
+    - Added Gnu Octave 2.0 and 2.1 format (mat, mat4, mat5) libraries.
+    - Added Portable Voice Format (pvf) library.
+    - Added Sound Designer II format (sd2) library.
+    - Added Sound Forge Audio Format (w64) library.
+    - Added Fasttracker 2 format (xi) library.
   * [debian/libsox-dev.install]:
     - Added pkgconfig file.
   * [debian/sox.install]:
@@ -13,13 +24,18 @@
   * [debian/patches/00-fix-segfault-64bit.diff]:
     - Removed, fixed upstream.
   * [debian/rules]:
-    - Disabled patch system.
+    - Disabled patch system, no more patches.
   * [debian/control]:
     - Added Build-Dep on libavutil-dev and libwavpack-dev.
     - Fixed lintian warning, "meta package" changed to "metapackage".
+    - Bumped Standards-Version to 3.8.0, needed changes were already made.
+    - Removed libsox-fmt-gsm and libsox-fmt-sndfile, merged in libsox-fmt-base.
+  * [debian/libsox-fmt-gsm.install, debian/libsox-fmt-gsm.dirs,
+     debian/libsox-fmt-libsndfile.install, debian/libsox-fmt-libsndfile.dirs]:
+    - Removed, merged gsm in libsox-fmt-base.
+  
+ -- Pascal Giard <evilynux@gmail.com>  Thu, 26 Jun 2008 21:18:00 -0400
 
- -- Pascal Giard <evilynux@gmail.com>  Fri, 14 Mar 2008 16:02:58 -0400
-
 sox (14.0.1-2) unstable; urgency=low
 
   * [debian/libsox-dev.install]:
@@ -103,7 +119,6 @@
     - Splitted format libraries in different packages (libsox-fmt-foo).
     - Added !hurd-i386 to dependency on libasound-dev (closes: #440470).
     - Replaced ${Source-Version} with ${binary:Version}.
-    - Added Build-Dep on chrpath.
   * [debian/libsox-dev.dirs]:
     - Added /usr/lib/sox/ for format plugins.
   * [debian/libsox0.install, debian/libsox-dev.install]:
@@ -114,7 +129,7 @@
     - Removed fPIC from CFLAGS as libtool takes care of it upstream.
     - Removed LDFLAGS -Wl,-z,defs as upstream is now doing it.
     - Added DEB_DH_MAKESHLIBS_ARGS -Xfmt to avoid useless calls to ldconfig.
-    - Fixed all lintian binary-or-shlib-defines-rpath warnings using chrpath.
+    - Fixed lintian binary-or-shlib-defines-rpath warnings with configure flag.
 	
  -- Pascal Giard <pascal@debian.org>  Wed, 12 Sep 2007 12:10:38 -0400
 
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Pascal Giard <pascal@debian.org>
 Uploaders: Guenter Geiger (Debian/GNU) <geiger@debian.org>
-Build-Depends: debhelper (>= 1.2.64), cdbs, libltdl3-dev, libvorbis-dev, libmad0-dev, libgsm1-dev, libsndfile1-dev (>= 1.0.12), libsamplerate0-dev, libavcodec-dev (>= 0.cvs20070301), libavformat-dev, libavutil-dev, libwavpack-dev, libao-dev, libid3tag0-dev, ladspa-sdk, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], chrpath
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 1.2.64), cdbs, libltdl3-dev, libvorbis-dev, libmad0-dev, libgsm1-dev, libsndfile1-dev (>= 1.0.12), libsamplerate0-dev, libavcodec-dev (>= 0.cvs20070301), libavformat-dev, libavutil-dev, libwavpack-dev, libao-dev, libid3tag0-dev, ladspa-sdk, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386]
+Standards-Version: 3.8.0
 
 Package: sox
 Section: sound
@@ -47,10 +47,11 @@
 Section: sound
 Depends: ${shlibs:Depends}
 Homepage: http://sox.sourceforge.net
+Replaces: libsox-fmt-gsm, libsox-fmt-sndfile
 Description: Minimal set of SoX format libraries
  SoX is the swiss army knife of sound processing.
  .
- This package contains the minimal set of SoX format libraries.
+ This package contains most audio formats libraries support by SoX.
 
 Package: libsox-fmt-alsa
 Architecture: any
@@ -100,17 +101,6 @@
  .
  FLAC: http://flac.sourceforge.net
 
-Package: libsox-fmt-gsm
-Architecture: any
-Section: sound
-Depends: ${shlibs:Depends}
-Description: SoX GSM format library
- SoX is the swiss army knife of sound processing.
- .
- This package contains the SoX GSM format library.
- .
- SoX: http://sox.sourceforge.net
-
 Package: libsox-fmt-mp3
 Architecture: any
 Section: sound
@@ -136,18 +126,6 @@
  .
  OGG Vorbis: http://www.vorbis.com
 
-Package: libsox-fmt-sndfile
-Architecture: any
-Section: sound
-Depends: ${shlibs:Depends}
-Homepage: http://sox.sourceforge.net
-Description: SoX libsndfile format library
- SoX is the swiss army knife of sound processing.
- .
- This package contains the SoX libsndfile format library.
- .
- libsndfile: http://www.mega-nerd.com/libsndfile/
-
 Package: libsox-fmt-oss
 Architecture: any
 Section: sound
@@ -161,7 +139,7 @@
 Package: libsox-fmt-all
 Architecture: any
 Section: sound
-Depends: libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-flac, libsox-fmt-gsm, libsox-fmt-mp3, libsox-fmt-ogg, libsox-fmt-sndfile, libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss
+Depends: libsox-fmt-base, libsox-fmt-ffmpeg, libsox-fmt-flac, libsox-fmt-mp3, libsox-fmt-ogg, libsox-fmt-alsa, libsox-fmt-ao, libsox-fmt-oss
 Homepage: http://sox.sourceforge.net
 Description: All SoX format libraries
  SoX is the swiss army knife of sound processing.
--- a/debian/libsox-fmt-base.install
+++ b/debian/libsox-fmt-base.install
@@ -7,6 +7,7 @@
 debian/tmp/usr/lib/sox/libsox_fmt_cvsd.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_dat.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_dvms.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_gsm.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_hcom.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_htk.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_ima.so* usr/lib/sox/
@@ -24,6 +25,8 @@
 debian/tmp/usr/lib/sox/libsox_fmt_sf.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_smp.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_sndrtool.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_sounder.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_soundtool.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_sphere.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_svx.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_txw.so* usr/lib/sox/
@@ -37,3 +40,16 @@
 debian/tmp/usr/lib/sox/libsox_fmt_wav.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_wve.so* usr/lib/sox/
 debian/tmp/usr/lib/sox/libsox_fmt_xa.so* usr/lib/sox/
+
+debian/tmp/usr/lib/sox/libsox_fmt_wavpack.so* usr/lib/sox/
+
+debian/tmp/usr/lib/sox/libsox_fmt_sndfile.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_caf.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_fap.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_paf.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_mat4.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_mat5.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_pvf.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_sd2.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_w64.so* usr/lib/sox/
+debian/tmp/usr/lib/sox/libsox_fmt_xi.so* usr/lib/sox/
--- a/debian/libsox-fmt-gsm.dirs
+++ /dev/null
@@ -1,1 +1,0 @@
-usr/lib/sox
--- a/debian/libsox-fmt-gsm.install
+++ /dev/null
@@ -1,1 +1,0 @@
-debian/tmp/usr/lib/sox/libsox_fmt_gsm.so* usr/lib/sox/
--- a/debian/libsox-fmt-sndfile.dirs
+++ /dev/null
@@ -1,1 +1,0 @@
-usr/lib/sox
--- a/debian/libsox-fmt-sndfile.install
+++ /dev/null
@@ -1,1 +1,0 @@
-debian/tmp/usr/lib/sox/libsox_fmt_sndfile.so* usr/lib/sox/
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,6 @@
 #include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 CFLAGS += -D_REENTRANT
-DEB_CONFIGURE_EXTRA_FLAGS := --disable-lame
+DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath --disable-lame
 # Takes care of postinst-has-useless-call-to-ldconfig for libsox-fmt-*
 DEB_DH_MAKESHLIBS_ARGS := -Xfmt
-
-binary-post-install/sox::
-	chrpath -d debian/sox/usr/bin/sox
-
-binary-post-install/libsox0::
-	chrpath -d debian/libsox0/usr/lib/lib*.so.*
-
-binary-post-install/libsox-fmt-all::
-	chrpath -d debian/libsox-fmt-*/usr/lib/sox/libsox_fmt_*.so.*