From 976bf212983ba8b60bd2501ab2691889d9cafbb9 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 7 Oct 2011 15:17:40 +0000 Subject: [PATCH] USE="static-libs" and empty dependency_libs in libtool files wrt #386029. Respect environment CFLAGS with USE="debug" wrt #386027. Thanks to Agostino Sarubbo for reporting. Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64 --- media-sound/guayadeque/Manifest | 18 +++---- media-sound/sox/ChangeLog | 9 +++- media-sound/sox/Manifest | 15 ++++-- media-sound/sox/sox-14.3.2-r1.ebuild | 79 ++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+), 16 deletions(-) create mode 100644 media-sound/sox/sox-14.3.2-r1.ebuild diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest index 1879bb162c36..ad112fbdfed2 100644 --- a/media-sound/guayadeque/Manifest +++ b/media-sound/guayadeque/Manifest @@ -1,20 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 DIST guayadeque-0.2.7.tar.bz2 2374622 RMD160 197a92e4983f2ae00625edad17b6c3d9aa6318f1 SHA1 cf96c39c5731477ce8adb2aa72ce3cbc9f23ca47 SHA256 96da48e3d0701cd09882b39feb67d0fdb3bff6771a37bbbf4802058d80897c5b DIST guayadeque-0.2.9.tar.bz2 2827923 RMD160 a5ed371d74c1d224839bc5f30f993fc5efd52ca5 SHA1 0b7178aff051b77e8bee5e4e442c36e75af7c17b SHA256 9e472f6034e13d9027c918260a412050d18fdd79b029577d982736bd31441774 DIST guayadeque-0.3.1.tar.bz2 2927564 RMD160 80f3895202622f2e0e556164db1afe440e460be5 SHA1 01d7c238af9846d46ffdd6d7b2cedb6d0d647e7c SHA256 547e2f629772f36808c58fad02d97bd4f959c146db251da3d5a0f73c807dfc04 -EBUILD guayadeque-0.2.7.ebuild 1282 RMD160 189c71d66381075dfe17ebc19ec42b2a9b2944bc SHA1 8ee7b8a839d1e214224b9aee835ba89be348ef20 SHA256 43de2d26024dcf6dab19c2ffb40c0d9e44ec27fb025360bad7e1253708f9f302 -EBUILD guayadeque-0.2.9.ebuild 1609 RMD160 54b30cc3ca85caca9b315b35c9c477af0d29bbec SHA1 ac225b959636f94804404e2876195feaa820e17d SHA256 9dec1a7f65ee3730f910b813f2c54315f58ec84d140d2014d6a41bf6b00e8a52 -EBUILD guayadeque-0.3.1.ebuild 1609 RMD160 2ac087b9aabf392f008da9987b39f7a6dcfe5ec2 SHA1 a4f0b001827321b91ff89bfb25d9c6e39015798c SHA256 c04499a320e978eac35913bc515f206d0b94fc39f9397028a0cd0893dcc0c912 -MISC ChangeLog 1210 RMD160 84852ffc36599cbe894abcc857004dc0c0defdb9 SHA1 c820d5b0628d950f8b894f875ad34e7ae97f482e SHA256 d9021e5e39795c33d6738e200c08c7f6f3659ddecf09e2893545a83ab442c790 +EBUILD guayadeque-0.2.7.ebuild 1274 RMD160 4b856ed1705642ed102017e336dad158ee62a656 SHA1 1d29c6ed4c3f91c665d581ac3ba7c786c4a9a33c SHA256 567fc49e4c64d5cdebb64268c20bf60dc005fc0d0ee94c686169af42000fde54 +EBUILD guayadeque-0.2.9.ebuild 1599 RMD160 3d7a4d539f56e57f0512631794c23bd52d98519b SHA1 9bbd12cb929ade9d0f94ea6e579e2814e3f23ee6 SHA256 85d7afabb52cb8eefb21fef341c89cb4603916c2ce06fb82585cf611b111091d +EBUILD guayadeque-0.3.1.ebuild 1599 RMD160 1a2aa171a7fd1935553c6a3b5d87248c03be0861 SHA1 a5985d8fac50e88c2dfa6b52b7b029ce84a59ff1 SHA256 5506ebdeeed29ec08adbc33457ad726c101ba344aee96779be1f4893c93ee38a +MISC ChangeLog 1391 RMD160 d8ab17e518cefa6f0f60f1e3d37a0fab4ec496bb SHA1 2afb655b514729a3ff8054ce8b04b139e9bd250e SHA256 7a185b5948a2dae684b383c3268392f265310aa141758cadbdbf4d51c900ade1 MISC metadata.xml 323 RMD160 829268b464e39c273ba100dc992d41a040f594b6 SHA1 2db02055fb2384abf37252f2d91bdc4486dee4a1 SHA256 440f3e3620d14930edc495bb98cf5f0ec739bfd94a5fca3682defa383d97a02e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59o9AACgkQfXuS5UK5QB0KkAP9FYeaYU1VYFKF3YbEybIZBwIN -MGNq11clFK74FGe+3H0Qn8mGQBNPgy1d2ssfwU8dLeh/ySzIld2YlYODVtYbZGb2 -yGDRcSpkYCTLobHY1EI/5Ft9gsPyaZRpu09SIx4AJsU6AXYbbF3dgdEnAfaxa5zC -HKgXKTWavokMPPVCoAs= -=Fj4E +iEYEAREKAAYFAk6PGHMACgkQgAnW8HDreRaUmACfW4pflbQPHxMvzRUiTc5/g1dI +mNwAnRBnDt8BlqTzwrczMvYUBk5Zoe29 +=pbwU -----END PGP SIGNATURE----- diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog index 7b293d3b6017..3f91a1dca930 100644 --- a/media-sound/sox/ChangeLog +++ b/media-sound/sox/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/sox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.127 2011/08/18 20:43:52 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.128 2011/10/07 15:17:40 ssuominen Exp $ + +*sox-14.3.2-r1 (07 Oct 2011) + + 07 Oct 2011; Samuli Suominen +sox-14.3.2-r1.ebuild: + USE="static-libs" and empty dependency_libs in libtool files wrt #386029. + Respect environment CFLAGS with USE="debug" wrt #386027. Thanks to Agostino + Sarubbo for reporting. 18 Aug 2011; Matt Turner sox-14.3.0.ebuild, sox-14.3.1.ebuild, sox-14.3.2.ebuild: diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest index 02c01d4e4d36..c8f05d80cd3b 100644 --- a/media-sound/sox/Manifest +++ b/media-sound/sox/Manifest @@ -10,13 +10,18 @@ DIST sox-14.3.1.tar.gz 1044595 RMD160 d5c44ccb3acbe686af4bd434ce8cb9a7bf3e2dc7 S DIST sox-14.3.2.tar.gz 1110175 RMD160 5b8e86bd64ade2d9534993317474c33b41090183 SHA1 ad462114ff47b094078f18148bc9e29e31b42b92 SHA256 0668cc087c346f7c4084ae294c676a11ddefb462974bc3f67be30d789c850e8f EBUILD sox-14.3.0.ebuild 1835 RMD160 18a44764b61f98a12e536e8540b3ec5fd579e4a9 SHA1 39927da7e713e1f47ce5803bc3c6bf925d3c6d51 SHA256 d60ef5ec3729c4e8d329361a2c2132111d9d8a3b2da3b693932af183dbedce20 EBUILD sox-14.3.1.ebuild 2020 RMD160 244573d94640c82aee0e644b7f72b5b3b650481f SHA1 8c26db0f577022417efb90718ed5cf1609c32ea0 SHA256 34ef450a8d0a0b9e91a4d8e10e5775cbbf094af3e5a000719d50bd7a3750f124 +EBUILD sox-14.3.2-r1.ebuild 2348 RMD160 1df800077d866e18558e3c3c7c1667a93bfdf8cf SHA1 17a5b7a701d8aad843b12321e4d9fde717d57dcd SHA256 eae311c2fc41697e1cf453543d73fb86a360737f76ef63cd0ebcd14b29bd12fa EBUILD sox-14.3.2.ebuild 2025 RMD160 9f111ad8215af40558b0031bf42a1dbf527b50a0 SHA1 6ff1dc8b72aa80062e42b327cceeb18013797c70 SHA256 80aa068ed99ec69856dcd7c022a30d3385b33971b3db255e50eaf99a42c2e24c -MISC ChangeLog 16826 RMD160 66fa31b78fd4afe73ae96263f1b9609ec3b55cc6 SHA1 7c6284cfd1c20bd03f02270b6536f35fb882aa22 SHA256 9ec3de92d92dcb1aba26553105e9a10317dc1b3f65434634af693c33eda4035d +MISC ChangeLog 17114 RMD160 a355bcbae2de44fd9a1e5eabcda697b85e1908df SHA1 b23505238c7371b30da58746b03ad7ad2dcf1c83 SHA256 105364b5f18e67de7128f637cdbd60b31c196cf0c1231b7a08591a5e00a99477 MISC metadata.xml 318 RMD160 9ed7f56a243d795af858a8269ef4aa6c0b12de10 SHA1 77351e7231619c84672be1f9407a91268c728043 SHA256 cbacb312c7d857414aacc7c5c44d7f0c6c617cc8475feb8371c7174ee5b04f5c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5NeY0ACgkQTVUdg23rv50WbQCfRDoGykm1KVgyDlnl7QsdeSiu -M18AnjeYLtxANMzjrBG2wtYoJs5Em/63 -=iuQz +iQEcBAEBAgAGBQJOjxg4AAoJEEdUh39IaPFNKdsH/RkRBjoorFUFRhV3UGXAMZCj +HV/wJt1/QoXN1JsjZuWIpY+3iPt4q9HIVeM+6VWZqy70TariLKxYMtfZkVPdAt+a +O+rZxXxvc5OPDPLbOdeBYa6LtPDU91O2VP+bWWyz4MZmx59kYnsiS3igTAykCBtJ +uw2JBZG0c+WuWY0FMlqWezJVB7/JRkT+i+n6PqZUOZnj1mF5kw9jE1w4T30IlpVF +PCYDAcyxiHoWO0Dyb6K8nFZYvvHIDC/7xIz67IzySmbxzMGXrVL3FIxDlewuWQSZ +ewIAO7N68gV8/M2w7GB3k4vkjgaSEc+iU5MPyU47sd/NHnKbwFGPnFbOLP7Pom4= +=3/S8 -----END PGP SIGNATURE----- diff --git a/media-sound/sox/sox-14.3.2-r1.ebuild b/media-sound/sox/sox-14.3.2-r1.ebuild new file mode 100644 index 000000000000..10ab3ded68a5 --- /dev/null +++ b/media-sound/sox/sox-14.3.2-r1.ebuild @@ -0,0 +1,79 @@ +# 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.2-r1.ebuild,v 1.1 2011/10/07 15:17:40 ssuominen Exp $ + +EAPI=4 +inherit eutils flag-o-matic + +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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" +IUSE="alsa amr ao debug encode ffmpeg flac id3tag ladspa mad ogg openmp oss png pulseaudio sndfile static-libs wavpack" + +# libtool required for libltdl +RDEPEND=">=sys-devel/libtool-2.2.6b + alsa? ( media-libs/alsa-lib ) + amr? ( media-libs/opencore-amr ) + encode? ( media-sound/lame ) + flac? ( media-libs/flac ) + mad? ( media-libs/libmad ) + sndfile? ( media-libs/libsndfile ) + ogg? ( media-libs/libvorbis media-libs/libogg ) + ao? ( media-libs/libao ) + ffmpeg? ( virtual/ffmpeg ) + ladspa? ( media-libs/ladspa-sdk ) + >=media-sound/gsm-1.0.12-r1 + id3tag? ( media-libs/libid3tag ) + png? ( media-libs/libpng sys-libs/zlib ) + pulseaudio? ( media-sound/pulseaudio ) + wavpack? ( media-sound/wavpack )" +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS README ) + +src_prepare() { + sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure || die #386027 + + epatch \ + "${FILESDIR}"/${P}-uclibc.patch \ + "${FILESDIR}"/${P}-ffmpeg.patch +} + +src_configure() { + # Fixes wav segfaults. See Bug #35745. + append-flags -fsigned-char + + econf \ + $(use_enable static-libs static) \ + $(use_with alsa) \ + $(use_enable debug) \ + $(use_enable openmp gomp) \ + $(use_with ao) \ + $(use_with oss) \ + $(use_with encode lame) \ + $(use_with mad) \ + $(use_with sndfile) \ + $(use_with flac) \ + $(use_with ogg oggvorbis) \ + $(use_with ffmpeg) \ + $(use_with ladspa) \ + $(use_with id3tag) \ + $(use_with amr amrwb) \ + $(use_with amr amrnb) \ + $(use_with png) \ + $(use_with pulseaudio) \ + $(use_with wavpack) \ + --with-distro="Gentoo" +} + +src_install() { + default + # libltdl is used for loading plugins, keeping libtool files with empty + # dependency_libs what otherwise would be -exec rm -f {} + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + +} -- 2.26.2