Add patch to build with file-5.0, bug 259652

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 97 insertions, 3 deletions

diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index b06e55347a60..a68583456a0c 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/sox
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.104 2008/12/26 12:48:12 armin76 Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.105 2009/03/10 21:18:03 beandog Exp $
+
+*sox-14.2.0-r1 (10 Mar 2009)
+
+  10 Mar 2009; Steve Dibb <beandog@gentoo.org>
+  +files/sox-14.2.0-file-5.0.patch, +sox-14.2.0-r1.ebuild:
+  Add patch to build with file-5.0, bug 259652
 
   26 Dec 2008; Raúl Porcel <armin76@gentoo.org> sox-14.2.0.ebuild:
   sparc stable wrt #250671
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 118fe2eb1660..5fd64b7359e8 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,9 +1,11 @@
 AUX sox-14.1.0-lavc.patch 534 RMD160 9088ed507a43c3e0edc97f502a76099e2c425b1f SHA1 d635b8c413c969056c78cf05ba768c8e247bcfe7 SHA256 5713fcbb50c681d7026387d92bfb1a1940e515518b4f57d00b1225addc63ab16
 AUX sox-14.1.0-runsox.patch 517 RMD160 622deff871038c1fa9b9490c322830e38b7367f2 SHA1 1d5b0104d489cdf3fe111b651acbf0e43f66e5e9 SHA256 bc2d682e06f61956995f49e4bdb0bd9cf8581249f4ab568cd20c687611551823
 AUX sox-14.2.0-distro.patch 1245 RMD160 a0ea4f0ab40113d8ffd4f6e5be7b1f2189c6aa76 SHA1 4aba29093e30720e785bac8e51e2a661ad2d9716 SHA256 6bee373206b67fe9040ca34e98d08b32ac45330ec48f68ac665398baab97a9f6
+AUX sox-14.2.0-file-5.0.patch 580 RMD160 8a6c0de5d55b3986bb343de02e96f4f155eee91c SHA1 6eded5629a863e88e9b96a08eff3e24224ae2413 SHA256 5fa17a034348bd9b5301b7df9c4b8b6603902404103a9d145d5e7084a39bd622
 DIST sox-14.1.0.tar.gz 912057 RMD160 df4067b874b0ff1df594f1986aa350cf40fe5a3f SHA1 897cb68b2b4159f979e6ba33fabaa31b967a1c7e SHA256 319cf07ee06fcbfbcaced7307e23ca567739c278f76bc143a9258a9a23e42101
 DIST sox-14.2.0.tar.gz 964800 RMD160 7c76a2db5c5838fc3d9f8b5402e47d548fd094d5 SHA1 1b60e5af43f44a51247fb978f2423f0de7e27363 SHA256 8d1b8eb33a72a181369475c9da5fdcbe5f6820e6af3d86a0e84f6939e61a9dc1
 EBUILD sox-14.1.0.ebuild 1986 RMD160 0cc0984883af35dd8d9df625bac177c34ba7b05a SHA1 ca241c9e6b31e69e17133e8b2d66892d383d9181 SHA256 c8c0677a3b71b989f2b01ee68f15b5cf561f9224298205bc651e3f390dcd1b31
+EBUILD sox-14.2.0-r1.ebuild 2058 RMD160 b4eadcc2e2af3ac5747b27c8b56882e11dcaa524 SHA1 422a1ba2805735c0b53ac139f291426b31800de1 SHA256 528cef6524d063566ff4bf5893e112feaa7461e7d9b7972d20a8aa73bbe94aeb
 EBUILD sox-14.2.0.ebuild 1992 RMD160 4f5614059e81fa9e7d75c1ce845dff6fd1fd46df SHA1 5e3a3813815bd3ba53c3a1ea5ed9d2d49e388e9c SHA256 d9fa449304e94c8c963ba3b21168c167fa26501fc5f96a08ad496de00bd11917
-MISC ChangeLog 13857 RMD160 c42a500024186b80134d80cc54e1a0b0caf18280 SHA1 1bd5826d2f7024b62b5c0472524cf1d9ce1d7e20 SHA256 9deb92cabf223eab4bc565f4ef8da7cfe38f87c14fd1d6bcf017d0414c1955f2
+MISC ChangeLog 14041 RMD160 e9d2955f36203b4c8204185c65ce8bd295e75624 SHA1 a6761d1c8f695df3f58a428a76977cb9029e4628 SHA256 3bf3a9b0ae20cac2f4a0b2af745f2a50eb2fafbf15df2c8ac0e72e807858729c
 MISC metadata.xml 418 RMD160 1f3867aa79178df758b99750e4a3b7e59f4be0ed SHA1 86e119a86fdcbee68766895c75337677d1e5dc40 SHA256 0548fffd025ccc348006d12685ff30dc59ba6b8f1a2a3e39baf9a2bd8dacf530
diff --git a/media-sound/sox/files/sox-14.2.0-file-5.0.patch b/media-sound/sox/files/sox-14.2.0-file-5.0.patch
new file mode 100644
index 000000000000..bc7c251d1e69
--- /dev/null
+++ b/media-sound/sox/files/sox-14.2.0-file-5.0.patch
@@ -0,0 +1,12 @@
+diff -u --recursive --new-file sox-14.2.0/src/mp3.c sox-14.2.0_new/src/mp3.c
+--- sox-14.2.0/src/mp3.c	2008-11-02 21:54:31.000000000 +0100
++++ sox-14.2.0_new/src/mp3.c	2009-02-25 11:48:53.000000000 +0100
+@@ -504,7 +504,7 @@
+ 
+ SOX_FORMAT_HANDLER(mp3)
+ {
+-  static char const * const names[] = {"mp3", "mp2", "audio/mpeg", NULL};
++  static char const * const names[] = {"mp3", "mp2", "audio/mpeg", "audio/mpeg; charset=binary", NULL};
+   static unsigned const write_encodings[] = {
+     SOX_ENCODING_GSM, 0, 0};
+   static sox_format_handler_t const handler = {SOX_LIB_VERSION_CODE,
diff --git a/media-sound/sox/sox-14.2.0-r1.ebuild b/media-sound/sox/sox-14.2.0-r1.ebuild
new file mode 100644
index 000000000000..24b951c1c508
--- /dev/null
+++ b/media-sound/sox/sox-14.2.0-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.2.0-r1.ebuild,v 1.1 2009/03/10 21:18:03 beandog Exp $
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="The swiss army knife of sound processing programs"
+HOMEPAGE="http://sox.sourceforge.net"
+SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa amrnb amrwb ao debug encode ffmpeg flac id3tag ladspa mad libsamplerate ogg oss png sndfile wavpack"
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	encode? ( media-sound/lame )
+	flac? ( media-libs/flac )
+	mad? ( media-libs/libmad )
+	sndfile? ( media-libs/libsndfile )
+	libsamplerate? ( media-libs/libsamplerate )
+	ogg? ( media-libs/libvorbis	media-libs/libogg )
+	ao? ( media-libs/libao )
+	ffmpeg? ( media-video/ffmpeg )
+	ladspa? ( media-libs/ladspa-sdk )
+	>=media-sound/gsm-1.0.12-r1
+	id3tag? ( media-libs/libid3tag )
+	amrnb? ( media-libs/amrnb )
+	amrwb? ( media-libs/amrwb )
+	png? ( media-libs/libpng )
+	wavpack? ( media-sound/wavpack )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-distro.patch"
+	# bug 259652
+	epatch "${FILESDIR}/${P}-file-5.0.patch"
+	eautoreconf
+}
+
+src_compile () {
+	# Fixes wav segfaults. See Bug #35745.
+	append-flags -fsigned-char
+
+	econf $(use_enable alsa) \
+		$(use_enable debug) \
+		$(use_enable ao libao) \
+		$(use_enable oss) \
+		$(use_with encode lame) \
+		$(use_with mad) \
+		$(use_with sndfile) \
+		$(use_with flac) \
+		$(use_with ogg) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with ffmpeg) \
+		$(use_with ladspa) \
+		$(use_with id3tag) \
+		$(use_with amrwb amr-wb) \
+		$(use_with amrnb amr-nb) \
+		$(use_with png) \
+		$(use_with wavpack) \
+		--with-distro="Gentoo" \
+		--enable-fast-ulaw \
+		--enable-fast-alaw \
+		|| die "configure failed"
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc NEWS ChangeLog README AUTHORS
+}