Move patches in FILESDIR to the patch tarball, fix audiofile detection (bug #415981), fix build with gcc 4.7 (bug #425280), fix some autoreconf warnings.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

6 files changed, 20 insertions, 125 deletions

diff --git a/media-sound/rezound/ChangeLog b/media-sound/rezound/ChangeLog
index be88c5c57f6f..bb4391b0895d 100644
--- a/media-sound/rezound/ChangeLog
+++ b/media-sound/rezound/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/rezound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.62 2012/06/08 13:25:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/ChangeLog,v 1.63 2012/07/25 10:58:41 aballier Exp $
+
+  25 Jul 2012; Alexis Ballier <aballier@gentoo.org>
+  rezound-0.12.3_beta-r2.ebuild, -files/rezound-0.12.3_beta-gcc44.patch,
+  -files/rezound-0.12.3_beta-gentoo_bug_334797.patch,
+  -files/rezound-0.12.3_beta-m4.patch:
+  Move patches in FILESDIR to the patch tarball, fix audiofile detection (bug
+  #415981), fix build with gcc 4.7 (bug #425280), fix some autoreconf warnings.
 
   21 May 2012; Lars Wendler <polynomial-c@gentoo.org>
   rezound-0.12.3_beta-r2.ebuild,
diff --git a/media-sound/rezound/Manifest b/media-sound/rezound/Manifest
index 8410ade6a79d..8ac32552e5a7 100644
--- a/media-sound/rezound/Manifest
+++ b/media-sound/rezound/Manifest
@@ -1,29 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX rezound-0.12.3_beta-gcc44.patch 561 RMD160 0cae7d76bc6ba83ed82ca6b492620ee4aa699820 SHA1 9e39115ffd4055354bfd94d8ce73d65758cdc647 SHA256 8b1ce99648e375078d1f38f7ca421b4fef81f40a9cef3242b6dcfdf750738f61
-AUX rezound-0.12.3_beta-gentoo_bug_334797.patch 2358 RMD160 9b44cdfdac8b0912e739acb3bf1005b4d2e3ee36 SHA1 c727d3263df9a1505a7759b6cc8e882c30f35a36 SHA256 b84514a0a7d9fda4b1ca2c5cb7a2ef632ebc52425490133fb66b88a5d028f977
-AUX rezound-0.12.3_beta-m4.patch 737 RMD160 8ba1b65260e9412c5993cb5d5d94bc9cbb50110d SHA1 5b85232cd02c2bb8b2eb2b83959d23d444d959df SHA256 437f53ff7c8e326f63330512d9962a3eb932980c503c2ecd756b6e847af33c60
-AUX undefined-functions.patch 1084 RMD160 4a2086423af2571cfb863ca95ec500a0e627527f SHA1 64a0ba99259e4d6e2b51f71c350c08055eb9ced5 SHA256 3093932261d232f81ca3bccdbccc258e932e85525f1b2d277b4a7b58c752ab27
-DIST rezound-0.12.3_beta-patches-5.tar.bz2 11361 RMD160 a44ee3b5d82bb8d2e7b15e0634d20cb08b723975 SHA1 7fd816e637299ca9ae1d0f1b5b5a4d9e97600b24 SHA256 c2f7d192f05881c46de7a7027b2ef2369e9ac9821f3ddeb57a94389cf3d502c7
-DIST rezound-0.12.3beta.tar.gz 1792882 RMD160 f6ed398f04f9e6707b36e19649a3b173504a542c SHA1 c62c941c16190dccc1ac2f1d588a9c5697f952e0 SHA256 9a895f7011048df3485c9ab29b6abf3c4ac8eb4b8842164c42e34b8f0b76426f
-EBUILD rezound-0.12.3_beta-r2.ebuild 2436 RMD160 44fa1b34e82a905e26d24dc83352fdfd06da2a4c SHA1 6638192afaa2c64ec06bf0768af3c409a2e3e2d0 SHA256 3aa913aba5d8a9e522afeba4cef3a0d4cb8baa9e1e6ac3e497e4a468850ab29f
-MISC ChangeLog 10596 RMD160 3138afbbbe3ea6d85af99d75e84b1c9fb2ba6c06 SHA1 db31ebe95825abf944e32b004643e4b85ffcb0cd SHA256 3f3aba849c0629138faa1475b13820ffe727e78a594b31a42aefbfa3d7550c74
-MISC metadata.xml 361 RMD160 5c4fb022e0b2e1b2b4b6cf6bf19bce95546f8b1a SHA1 c0301d0a80619b866769beb0413a14858268ff70 SHA256 e9f00a91182c20d6737d6cb976c1881c9782b734431b9e4e2947279b35274fe6
+AUX undefined-functions.patch 1084 SHA256 3093932261d232f81ca3bccdbccc258e932e85525f1b2d277b4a7b58c752ab27 SHA512 a200bdaa52308ee776af54896a90550b631c222878c54558972416ac9bc62fe3b355864755235be907084cf9287f01907ac7f3e87171be1b562b2463b8fb66dc WHIRLPOOL 6e12533f0d922591ca6da023428d2478fa6571b884696250454f8a0592fa2755d8f219839a23ab7020896d82098e61cbdeedb5a1439f5ba6f023af105acd3255
+DIST rezound-0.12.3_beta-patches-6.tar.bz2 14673 SHA256 fd395ba49609e1d4c6e54f291dde2d97b6a8f9ea7905c2428b68a0587bf40f89 SHA512 95b8bd8626b10160e3c74ce75f2ffe675a346f64438df7f3be5cf8b61b0e9b61ba92ec8452406993c3c11adba68d4ac0733eaf43171a535db8c0b3fc2ba606c3 WHIRLPOOL ae6fac793430c3d99fccf583ea22ce68e9647bb285e1dd75131376bed3dc3c1c76654b6db599e0b746bbe6c6e683c1a940dd8619e2cc56fd3d9f09cc6a35f7bc
+DIST rezound-0.12.3beta.tar.gz 1792882 SHA256 9a895f7011048df3485c9ab29b6abf3c4ac8eb4b8842164c42e34b8f0b76426f SHA512 6d043d5fd85ad3b3ea021f62eceeb06064d8f1dc00345bccd7a719c445d5798455b2e014812a99dfd015b4c0d2435c690c98b860efd34ccdfcd5a941b54b7202 WHIRLPOOL db69b0e6ff80c34978d6ea784fdadc2756577f493760cab465d86f4f8c9c360e44e32e73d036f05662afee244cf5053ccb26f8e9f6bb74033da2a0ad1d2aa187
+EBUILD rezound-0.12.3_beta-r2.ebuild 2314 SHA256 0e1d317e6cfd480821320ba4518f42e46942f6fdb6acdda4d007dff1fa8357b4 SHA512 a4384c17bbba9d2d45845ae868e7230d223fcc3a37e19a79bd99a0cba951ad5b2309ceceb8d3ab5686632aac63782e9e5a04bbaf37fe6536ee9969e500ad2815 WHIRLPOOL 95b831705b080cdc276a53c84d4fa96d5fb7ca58fafae4221efa7d1cb85ca8d109b000e37a6559d60eb5b820c3bbfdb3fc11c27930ad025487452e1df62f9a15
+MISC ChangeLog 10969 SHA256 ef556b7cab1edea4ce4ab153be9e062e803a4de5faf02d75bf697bfc479e6fba SHA512 4bc2d0e0956ab91e53c9f2fc76a6cd883c20fa4a7d8ec291c958691e9af3af37d79973caf1f1f89654e9fe5872f6081b65d6dad2f9a0399920199804a61bc610 WHIRLPOOL aaf213067fc051b6ca692f4132cf2083cba273dc92a8cede7174122b7be0b9c262531270840d923249a140440109f709a6a172528850f5f649acd382ea748483
+MISC metadata.xml 361 SHA256 e9f00a91182c20d6737d6cb976c1881c9782b734431b9e4e2947279b35274fe6 SHA512 41b65cddd6c8827007ffde5cbad40fee7035807845277a871f437ffa9fee290253ab8db43c6097a6d50908c02ea79cbf0e4c63ffb7f0c7e092836d6c58f58ca6 WHIRLPOOL fe9dbb9cffef2dc23d3095ae5a480f59192e6e4f9ab5d9bab80ec9d5143912da10d22cb61fdd87e536f4a6f49d10387d89cf00da1835ba48efd3896fa556efca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP0f1EAAoJEPiazRVxLXTF5HMP/jr6iu6kaa9jSKgtIagPUwQY
-7WSDsUYjROyN3z2f3iQL0SC/1KdZXAFZeYU8L5AAi9DQPFH342GoxHAObKyXM+Ho
-wn7E8vRQlltbrPlVIwsqnmQKzEDlvxPqJADrSgI/yHJtmBC0pB79Mx2hNKZXR6CR
-+0GXLmXff6ufKeZnFY99nHH91KKHXfB92ZHZ2gGJdoZ1VABx6ITIm/ynF5IpNUMh
-P5e4SgYqJlrzIJXfqOOoTQMN2PsNPGRIzDEscXUxNzuCuS+o3I9H292FMyORStZK
-tzHa5AwMGrmEBEWDUezjkASBqQx1yWDiFAuRLKukIv1eyXqn8xYr7L3+OOlwfjoH
-98Ki5LTyC9VbmJ74LMHQVcUjcu2Xcf9vMemDbHkvIDsOgKUuRnWJw2sdtwfC2Yzv
-v6s2pVageFp3wnzb4hM6I/MdLt75WdlJBgNPRAp6nTH6BQ86oJDHHwRVJqIJhjeU
-6lpkuQFVVFcOmaKkxtNa72pK3DpzISaiuFv9qAzVNNBR4rzbxeOxdX+I7aDa5PWf
-6MPvp34Gw0GoeIUB1oWK85f62KV+6E/pO1wom2VFbOzgImYXyARXRu5pEaZwq9++
-z6IoStnguqM83shQ3mPC9aouhrI2IMfMieoBpka6hHSvOzY6C/4y2DYfeFYYPwz3
-ifA0l4WRHyZpl91Goas5
-=0zqf
+iEUEAREIAAYFAlAP0WcACgkQvFcC4BYPU0qkwgCfZPHtleyttsPrmvREXggwj+MK
+pAIAmNXNJo3vyIYSbMufL+wHgoFKcHg=
+=4QFw
 -----END PGP SIGNATURE-----
diff --git a/media-sound/rezound/files/rezound-0.12.3_beta-gcc44.patch b/media-sound/rezound/files/rezound-0.12.3_beta-gcc44.patch
deleted file mode 100644
index 1aef0943b667..000000000000
--- a/media-sound/rezound/files/rezound-0.12.3_beta-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur rezound-0.12.3beta.orig/src/backend/Remaster/CAdaptiveNormalizeAction.cpp rezound-0.12.3beta/src/backend/Remaster/CAdaptiveNormalizeAction.cpp
---- rezound-0.12.3beta.orig/src/backend/Remaster/CAdaptiveNormalizeAction.cpp	2005-02-15 04:54:44.000000000 +0200
-+++ rezound-0.12.3beta/src/backend/Remaster/CAdaptiveNormalizeAction.cpp	2009-07-12 21:51:43.000000000 +0300
-@@ -18,6 +18,8 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-  */
- 
-+#include <cstdio>
-+
- #include "CAdaptiveNormalizeAction.h"
- 
- #include <utility>
diff --git a/media-sound/rezound/files/rezound-0.12.3_beta-gentoo_bug_334797.patch b/media-sound/rezound/files/rezound-0.12.3_beta-gentoo_bug_334797.patch
deleted file mode 100644
index e986bb8fc864..000000000000
--- a/media-sound/rezound/files/rezound-0.12.3_beta-gentoo_bug_334797.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Let gcc handle template instantiation of TPoolFile.
-
-http://bugs.gentoo.org/334797
-
-2012-05-22 Martin von Gagern <Martin.vGagern@gmx.net>
-
-Index: rezound-0.12.3beta/src/PoolFile/TPoolFile.h
-===================================================================
---- rezound-0.12.3beta.orig/src/PoolFile/TPoolFile.h
-+++ rezound-0.12.3beta/src/PoolFile/TPoolFile.h
-@@ -403,10 +403,8 @@ private:
- 
- };
- 
--/* this would be needed if I were utilizing gcc's implicit instantiation for TPoolFile
- #define __TPoolFile_H__CPP
- #include "TPoolFile.cpp"
- #undef __TPoolFile_H__CPP
--*/
- 
- #endif
-Index: rezound-0.12.3beta/src/PoolFile/TPoolFile.cpp
-===================================================================
---- rezound-0.12.3beta.orig/src/PoolFile/TPoolFile.cpp
-+++ rezound-0.12.3beta/src/PoolFile/TPoolFile.cpp
-@@ -20,11 +20,9 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-  */
- 
--/* this would be needed if I were utilizing gcc's implicit instantiation for TPoolFile
- #ifndef __TPoolFile_H__CPP
- #error this file must be included through TPoolFile.h NOT compiled on its own
- #endif
--*/
- 
- /* ???
-  * There are places that I have to do: container.erase(container.begin+index);  
-Index: rezound-0.12.3beta/src/backend/CSound.cpp
-===================================================================
---- rezound-0.12.3beta.orig/src/backend/CSound.cpp
-+++ rezound-0.12.3beta/src/backend/CSound.cpp
-@@ -2286,7 +2286,7 @@ void CSound::setUserNotes(const string &
- 
- 
- // this is the explicit instantiation of the TPoolFile for CSound's purposes 
--#include <TPoolFile.cpp>
-+// #include <TPoolFile.cpp>
- template class TPoolFile<sample_pos_t,uint64_t>;
- 
- // Some explicit template method instantiations (not sure why some are necessary and some aren't)
-Index: rezound-0.12.3beta/src/backend/CrezSoundTranslator.cpp
-===================================================================
---- rezound-0.12.3beta.orig/src/backend/CrezSoundTranslator.cpp
-+++ rezound-0.12.3beta/src/backend/CrezSoundTranslator.cpp
-@@ -43,7 +43,7 @@ CrezSoundTranslator::~CrezSoundTranslato
- 
- // need to include this I use some of the template *methods* for types that are no where else
- // so the explicit instantation at the bottom of CSound.cpp doesn't instantiate everything
--#include <TPoolFile.cpp>
-+// #include <TPoolFile.cpp>
- 
- struct RFormatInfo1
- {
diff --git a/media-sound/rezound/files/rezound-0.12.3_beta-m4.patch b/media-sound/rezound/files/rezound-0.12.3_beta-m4.patch
deleted file mode 100644
index e2381e23db17..000000000000
--- a/media-sound/rezound/files/rezound-0.12.3_beta-m4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-ajv_CXX_FLAG macro is broken and causes m4 to loop forever, let's just assume g++ supports
-these flags, see http://bugs.gentoo.org/305305
-
---- configure.ac
-+++ configure.ac
-@@ -81,13 +81,9 @@
- 
- 
- ############################################################################
--# Set some compilter flags if they're available                            #
-+# Set some compilter flags                                                 #
- ############################################################################
--ajv_CXX_FLAG(-g)
--ajv_CXX_FLAG(-Wall)
--ajv_CXX_FLAG(-Wno-unused-function)
--ajv_CXX_FLAG(-Wno-unused-variable)
--ajv_CXX_FLAG(-Wno-unused)
-+CXXFLAGS="$CXXFLAGS -g -Wall -Wno-unused-function -Wno-unused-variable -Wno-unused"
- 
- 
- 
diff --git a/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild b/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
index ce1c553862b3..1cc128ea1ec7 100644
--- a/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
+++ b/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild,v 1.7 2012/06/08 13:25:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/rezound/rezound-0.12.3_beta-r2.ebuild,v 1.8 2012/07/25 10:58:41 aballier Exp $
 
 EAPI=4
 MY_P=${P/_/}
-PATCHLEVEL=5
+PATCHLEVEL=6
 
 inherit autotools eutils flag-o-matic
 
@@ -39,9 +39,6 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	epatch "${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-m4.patch \
-		"${FILESDIR}"/${P}-gentoo_bug_334797.patch
 	AT_M4DIR="config/m4" eautoreconf
 }