diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-02-16 15:54:19 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-02-16 15:54:19 +0000 |
| commit | 6c0af5ba8b84f6b89bcd5c9a9ee2656044195061 (patch) | |
| tree | 5276c19727c12b52443f54b3b799029b5a8280ce /media-sound | |
| parent | Add version 0.58.5 (diff) | |
| download | historical-6c0af5ba8b84f6b89bcd5c9a9ee2656044195061.tar.gz historical-6c0af5ba8b84f6b89bcd5c9a9ee2656044195061.tar.bz2 historical-6c0af5ba8b84f6b89bcd5c9a9ee2656044195061.zip | |
fix build with libpng 1.5
Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/sox/ChangeLog | 8 | ||||
| -rw-r--r-- | media-sound/sox/Manifest | 15 | ||||
| -rw-r--r-- | media-sound/sox/files/sox-14.3.1-libpng15.patch | 12 | ||||
| -rw-r--r-- | media-sound/sox/sox-14.3.1.ebuild | 7 |
4 files changed, 35 insertions, 7 deletions
diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog index 23fbb5a9e970..f3f48eb2a886 100644 --- a/media-sound/sox/ChangeLog +++ b/media-sound/sox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/sox -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.120 2010/04/29 12:02:15 ssuominen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.121 2011/02/16 15:54:18 aballier Exp $ + + 16 Feb 2011; Alexis Ballier <aballier@gentoo.org> sox-14.3.1.ebuild, + +files/sox-14.3.1-libpng15.patch: + fix build with libpng 1.5 29 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> sox-14.3.0.ebuild: Fix commit that was made 29 Dec 2009 to stabilize sox-14.3.0 for sparc. diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest index 63c41ebb0d23..2fb0cd2e2ae0 100644 --- a/media-sound/sox/Manifest +++ b/media-sound/sox/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX sox-14.3.1-libpng15.patch 332 RMD160 5078592c0cb2e84f28b2641e884e1f3b258656f8 SHA1 675e6f5bd2c081a668d64ccccfa6f72829a9cb2f SHA256 5be2254db57ef36a1f40a0dc30982a9ad5be4a9b9602b205bfdede6ba3391d83 AUX sox-14.3.1-nomad.patch 401 RMD160 ebd569e1fe54521cce9acf22f5c10a039deae27b SHA1 8eda98ea9ff97cca42007d6964d8139f111bf70f SHA256 d8a8ffd166becd9acf39b1b55dc49f1dabeebdcc3965cfb5e6985f4b571dc033 DIST sox-14.3.0.tar.gz 1007679 RMD160 9302e00d76c972c4916979d147468f640e04acaa SHA1 34b8e991ba8511fa9683e9e9d356fb7f4179d03c SHA256 9abf411c949366d75c884b368284690b6c8c7d5fb5df0deaf599539b704b2397 DIST sox-14.3.1.tar.gz 1044595 RMD160 d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7 SHA1 ef1773e08322ad9d9deb0a9f8e37a7ba4b9ca384 SHA256 c4be9ebdb1e77a3bc9f3ee1f3fd274a1fe7b162a174fcc74874b231f3f1ace54 EBUILD sox-14.3.0.ebuild 1809 RMD160 2fae5f05d1646bd668106c6625d3ff573db4e48a SHA1 4969b55aae0d2cdd7fd41a3acdda8e194613aa13 SHA256 11b18ea2f7285e0cb64af2f6007a16ae9a0722bd343dd65a0cc9d817e261afce -EBUILD sox-14.3.1.ebuild 1938 RMD160 a314dbae801dd21bfea4bdf83599baf89179f9de SHA1 1efb76465ff24782b9ede46be786477cc8a27329 SHA256 9a5a6978d167f5a800e830cef35089e6b6f2c2a92c11ace495b0c41176f907dc -MISC ChangeLog 15848 RMD160 3c7e2a716492dd7b3a2ae47ab4c211fb0a0b7fda SHA1 3a14cc15fb92f2a13761ca3ba4445b843ab3ac15 SHA256 6807bd561db73e09941e63b87c9d14a328302bfd81fd0d3cc5e220b96e753b27 +EBUILD sox-14.3.1.ebuild 1993 RMD160 b0743a01189c21eddf225f7f491c8fdffd29449e SHA1 693e7e02c7ccb447810114fd4d09a9f19742046e SHA256 4deab5b9f0eb1b656c5028abe30e392cd23abde3b899073c71191e97575ffd89 +MISC ChangeLog 15983 RMD160 38f9b742e6dd6bd46ff3fcc90066d9bc46c59c3d SHA1 17686f137b39b0ae8caeef2dcfcc2e52a52a4b73 SHA256 19fcbb7b354f097962d16ce41fa8e8b45787ecc30d9464e335597222eab8c5f7 MISC metadata.xml 318 RMD160 9ed7f56a243d795af858a8269ef4aa6c0b12de10 SHA1 77351e7231619c84672be1f9407a91268c728043 SHA256 cbacb312c7d857414aacc7c5c44d7f0c6c617cc8475feb8371c7174ee5b04f5c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk1b8zAACgkQvFcC4BYPU0oNeQCgv/z12AZ82sG92YfHrbsIVZZ0 +73QAnRXWm/qKQCv/gpCTT5adbIwCzIop +=Jjvk +-----END PGP SIGNATURE----- diff --git a/media-sound/sox/files/sox-14.3.1-libpng15.patch b/media-sound/sox/files/sox-14.3.1-libpng15.patch new file mode 100644 index 000000000000..6b1b8df5eb37 --- /dev/null +++ b/media-sound/sox/files/sox-14.3.1-libpng15.patch @@ -0,0 +1,12 @@ +Index: sox-14.3.1/src/spectrogram.c +=================================================================== +--- sox-14.3.1.orig/src/spectrogram.c ++++ sox-14.3.1/src/spectrogram.c +@@ -25,6 +25,7 @@ + #include <assert.h> + #include <math.h> + #include <png.h> ++#include <zlib.h> + + #define MAX_FFT_SIZE 4096 + #define is_p2(x) !(x & (x - 1)) diff --git a/media-sound/sox/sox-14.3.1.ebuild b/media-sound/sox/sox-14.3.1.ebuild index a9bd8b6e26b8..d19b4cc554cd 100644 --- a/media-sound/sox/sox-14.3.1.ebuild +++ b/media-sound/sox/sox-14.3.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v 1.2 2010/04/29 11:46:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.3.1.ebuild,v 1.3 2011/02/16 15:54:18 aballier Exp $ EAPI=2 inherit eutils flag-o-matic @@ -28,7 +28,7 @@ RDEPEND="sys-devel/libtool ladspa? ( media-libs/ladspa-sdk ) >=media-sound/gsm-1.0.12-r1 id3tag? ( media-libs/libid3tag ) - png? ( media-libs/libpng ) + png? ( media-libs/libpng sys-libs/zlib ) pulseaudio? ( media-sound/pulseaudio ) wavpack? ( media-sound/wavpack )" DEPEND="${RDEPEND} @@ -36,6 +36,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${P}-nomad.patch + epatch "${FILESDIR}"/${P}-libpng15.patch } src_configure() { |