[proaudio] [1286] fixup lash support for meterbridge

[subversion@xxxxxxxxxxxxx]

Revision: 1286
Author:   evermind
Date:     2008-08-09 13:41:56 +0200 (Sat, 09 Aug 2008)

Log Message:
-----------
fixup lash support for meterbridge

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/meterbridge/ChangeLog
    trunk/overlays/proaudio/media-sound/meterbridge/Manifest
    trunk/overlays/proaudio/media-sound/meterbridge/files/meterbridge-lash.patch
    trunk/overlays/proaudio/media-sound/meterbridge/meterbridge-0.9.2-r2.ebuild


Modified: trunk/overlays/proaudio/media-sound/meterbridge/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/meterbridge/ChangeLog	2008-08-09 10:44:56 UTC (rev 1285)
+++ trunk/overlays/proaudio/media-sound/meterbridge/ChangeLog	2008-08-09 11:41:56 UTC (rev 1286)
@@ -2,6 +2,14 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
+
+  09 Aug 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
+  files/meterbridge-lash.patch:
+  changed include mb_lash.c -> mb_lash.h
+  meterbridge-0.9.2-r2.ebuild:
+  KEEP: lash support
+
   01 Jan 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx> ChangeLog:
   fixed missing dependency closes bug#29
   removed old ebuild 

Modified: trunk/overlays/proaudio/media-sound/meterbridge/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/meterbridge/Manifest	2008-08-09 10:44:56 UTC (rev 1285)
+++ trunk/overlays/proaudio/media-sound/meterbridge/Manifest	2008-08-09 11:41:56 UTC (rev 1286)
@@ -1,7 +1,7 @@
-AUX meterbridge-lash.patch 12285 RMD160 b81917a0c4515adf9e2daaa706e95133cd8e3d5e SHA1 7f48951b6f89ad1cf437748961a55e8d88aa0b5e SHA256 633cc72cb660c23d5397d2701b98498eb3c00564c5175de2860a43a86583c59f
+AUX meterbridge-lash.patch 12285 RMD160 d1a0f80a9efae40d41c8ff306763f254a5a3d272 SHA1 1939b576b2aeeb275019dc5cfa25cdf22096b2db SHA256 01cd734f4bdcfc7eeacebc34d519e98d3dc076aca232fde6e5ea9d3390a3b012
 AUX meterbridge.1.gz 1016 RMD160 8e4a9fdd788c69daa89d2abf5187503e9b106332 SHA1 740a2dac0d74f79e14634f2a40d55a68e29d184c SHA256 16ed60bcc27f7a4d9618a360c111bfba55be7b0f4f704c18d140fe4ff3e18164
 AUX meterbridge_0.9.2-4.0.0.1.gcc4.patch 490 RMD160 a7202e0730986f3d7a20fc2cb1678f329dd85aeb SHA1 6e16134e2e505d9b2dab54e08ec10c2b0e87dfec SHA256 3c112824a5eea44fae1e6607f9aad2efeab37e8cbffccd1c180fe968ed078190
 DIST meterbridge-0.9.2.tar.gz 607742 RMD160 c4b78b337a65bb2b61a9f512d15ddff390c0d0f0 SHA1 cf683c623b12342a951f541c9e674cd162a9ad91 SHA256 b3c887e2ab381f9183a8a1e42b6300ac2ea1766496ae5d91f3257bb7e6786649
-EBUILD meterbridge-0.9.2-r2.ebuild 987 RMD160 99e0b3b246ef330aa72bf481c9bda4f7c979c2cf SHA1 990dbe4a34f558e46a250dd85cfbd0503c869828 SHA256 954549d9846a8aca305abc6518e9461a23111e84db7bcc8b5b1a766535261d1f
-MISC ChangeLog 343 RMD160 21e36c9b33f38f4106f8aaf606544bb1d9a7130a SHA1 82ef96cd629295b1587960156f7cfb74db2b7a87 SHA256 7f6eafe568e33864d24706d1333360f33e5a159c56b33a8138e6fb8b0ec77b7a
+EBUILD meterbridge-0.9.2-r2.ebuild 1138 RMD160 b5821271bda3f8e38aaee10965b83ac3e3b98c16 SHA1 08ed764db52a72fbebe1c90f0652964620bb535c SHA256 0bce16033e062ea2797f5d09738820ea539441fcf16249b2c82189cbafdc150f
+MISC ChangeLog 586 RMD160 daf07f1a591e4ac96bcbd95c71f2fe8bf2ac7115 SHA1 598a94858b7ce3d6526dc93e6c90516aeca412aa SHA256 d885d8d6e990f9ef3f3be7092d50e83ab8feea88cd846dc3544575c8f68f4b6e
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/meterbridge/files/meterbridge-lash.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/meterbridge/files/meterbridge-lash.patch	2008-08-09 10:44:56 UTC (rev 1285)
+++ trunk/overlays/proaudio/media-sound/meterbridge/files/meterbridge-lash.patch	2008-08-09 11:41:56 UTC (rev 1286)
@@ -255,7 +255,7 @@
  
 +#ifdef HAVE_LASH
 +SDL_Thread  *lash_thread = NULL;
-+#include <mb_lash.c>
++#include <mb_lash.h>
 +#endif
 +
  SDL_Thread *gt;

Modified: trunk/overlays/proaudio/media-sound/meterbridge/meterbridge-0.9.2-r2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/meterbridge/meterbridge-0.9.2-r2.ebuild	2008-08-09 10:44:56 UTC (rev 1285)
+++ trunk/overlays/proaudio/media-sound/meterbridge/meterbridge-0.9.2-r2.ebuild	2008-08-09 11:41:56 UTC (rev 1286)
@@ -2,8 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit autotools exteutils
+
 IUSE="lash"
-inherit eutils
+
 DESCRIPTION="Software meterbridge for the UNIX based JACK audio system."
 HOMEPAGE="http://plugin.org.uk/meterbridge/";
 SRC_URI="http://plugin.org.uk/meterbridge/${P}.tar.gz";
@@ -12,31 +14,35 @@
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 
-DEPEND="media-sound/jack-audio-connection-kit
+RDEPEND="media-sound/jack-audio-connection-kit
 	media-libs/sdl-image
-	lash? ( >=media-sound/lash-0.5.0 )
-	=sys-devel/automake-1.6*"
+	lash? ( >=media-sound/lash-0.5.0 )"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/meterbridge_0.9.2-4.0.0.1.gcc4.patch"
 	use lash && epatch "${FILESDIR}/meterbridge-lash.patch"
-}
+	local olddir="$PWD"
+	cd src/
+	# asneeded and cflags fix
+	esed_check -i -e "s@^\(meterbridge_LD\)FLAGS\(.*\)@\1ADD\2@g" \
+		-e "s@^\(CFLAGS\)@AM_\1@g" Makefile.am
+	cd "$olddir"
 
-src_compile() {
 	export WANT_AUTOCONF=2.5
 	#export WANT_AUTOMAKE=1.6
+	eautoreconf
+}
 
-	autoconf || die "autoconf failed"
-	autoreconf
-
+src_compile() {
 	econf $(use_enable lash) || die "econf failed"
 		emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	doman "${FILESDIR}/meterbridge.1.gz"
 	dodoc AUTHORS ChangeLog
 }