[proaudio] [1648] ambdec update

[subversion@xxxxxxxxxxxxx]

Revision: 1648
Author:   gavlee
Date:     2010-04-20 19:10:26 +0200 (Tue, 20 Apr 2010)
Log Message:
-----------
ambdec update

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/ambdec/ChangeLog
    trunk/overlays/proaudio/media-sound/ambdec/Manifest
    trunk/overlays/proaudio/media-sound/ambdec/ambdec-0.4.2.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/ambdec/files/
    trunk/overlays/proaudio/media-sound/ambdec/files/ambdec-0.4.2-Makefile.patch

Modified: trunk/overlays/proaudio/media-sound/ambdec/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/ambdec/ChangeLog	2010-04-17 14:44:06 UTC (rev 1647)
+++ trunk/overlays/proaudio/media-sound/ambdec/ChangeLog	2010-04-20 17:10:26 UTC (rev 1648)
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Apr 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> ambdec-0.4.2.ebuild,
+  +files/ambdec-0.4.2-Makefile.patch:
+  include a makefile patch, some tweaks
+
 *ambdec-0.4.2 (07 Apr 2010)
 
   08 Apr 2010; Florian Faber <faber@xxxxxxxxxxx>;

Modified: trunk/overlays/proaudio/media-sound/ambdec/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/ambdec/Manifest	2010-04-17 14:44:06 UTC (rev 1647)
+++ trunk/overlays/proaudio/media-sound/ambdec/Manifest	2010-04-20 17:10:26 UTC (rev 1648)
@@ -1,5 +1,6 @@
+AUX ambdec-0.4.2-Makefile.patch 1591 RMD160 46eea8e901d7e3e4a21ea7a771b0d8380d433c16 SHA1 aa748119ba8377e5cb960c8d8b7a1f8bc89cbdcb SHA256 5014522c2382f052bfc33f557864595988ba9bfbe060c5b0313c918a5248eec1
 DIST ambdec-0.4.2.tar.bz2 44384 RMD160 00309a92a097245353df5d0c936a9f94461d081a SHA1 ea87efca3e8105a0c319ef3cb447359b2ca094e1 SHA256 5b173cc8225bc3b3c18a452a664ba41cef1be844436b2ecc36e37c3e56d035f1
 DIST ambdec-manual.pdf 206659 RMD160 b3254e8694f7e36f6931f4e099b7c0c2409deab5 SHA1 7e6fb3d3d0d3435e8b5f8f99bbd35a6d3cb89df9 SHA256 a536b98ba1c142a9cbea51595b09c6cd44f0ec7e83fccbf113cde49756f85800
-EBUILD ambdec-0.4.2.ebuild 832 RMD160 78e6d5d4ace16fd6fa1eb6911d505ba314c24904 SHA1 e3656bee89e458a3680b8f69ab14da1db1d27250 SHA256 f33c7fd5657f6a136025c5e5c8084cde20f140f5e113a195e93e8d5ef543ddc6
-MISC ChangeLog 316 RMD160 82811fc41b89b069ad5d68a293d5d6a460d54f75 SHA1 6b8e145c283e8c4b6c6c367f742b8ef9974ef7ff SHA256 703535783ec3a8a7fc5be37ff62878a30831114707613b3c9ff4b3d1af7f83b4
+EBUILD ambdec-0.4.2.ebuild 1020 RMD160 a3c4b899a2cdfdc2091b152bb089f80763b595da SHA1 7dc230ba0f9cfc72ab16b196a3b249b49ba699d5 SHA256 28af702b3183faf95d719bd8e3dcf9ec37a877e9c2bccca6404bec9d61d5406e
+MISC ChangeLog 472 RMD160 58a7048dfc0ef148ec86fce9039fad5a33dadd0e SHA1 1ce1ab1fa75dfd3caf8618a41a6361ee3f36eb40 SHA256 78c6814eef208eb8771dd6c6675fafc22cd860c4f44994b4be195291bad4330a
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/ambdec/ambdec-0.4.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/ambdec/ambdec-0.4.2.ebuild	2010-04-17 14:44:06 UTC (rev 1647)
+++ trunk/overlays/proaudio/media-sound/ambdec/ambdec-0.4.2.ebuild	2010-04-20 17:10:26 UTC (rev 1648)
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit exteutils
+inherit exteutils toolchain-funcs multilib
 
-RESTRICT="nomirror"
+RESTRICT="mirror"
 DESCRIPTION="An Ambisonic decoder for first and second order"
 HOMEPAGE="http://www.kokkinizita.net/linuxaudio";
 SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${P}.tar.bz2
@@ -16,18 +16,21 @@
 IUSE="doc"
 
 DEPEND=">=media-sound/jack-audio-connection-kit-0.100
-	>=media-libs/libclthreads-2.4.0	
+	>=media-libs/libclthreads-2.4.0
 	>=media-libs/libclxclient-3.6.1"
 
 src_compile() {
+	tc-export CC CXX
 	cd "${S}/source"
-	emake || die "make failed"
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	esed_check -i -e "/^CPPFLAGS/ s/-O2//" "${S}/source/Makefile"
+	emake PREFIX="/usr" LIBDIR="$(get_libdir)" || die "make failed"
 }
 
 src_install() {
 	cd "${S}/source"
-	emake DESTDIR="${D}" install || die "install failed"
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "install failed"
 	cd ..
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 	use doc && dodoc "$DISTDIR"/ambdec-manual.pdf
 }

Added: trunk/overlays/proaudio/media-sound/ambdec/files/ambdec-0.4.2-Makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/ambdec/files/ambdec-0.4.2-Makefile.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/ambdec/files/ambdec-0.4.2-Makefile.patch	2010-04-20 17:10:26 UTC (rev 1648)
@@ -0,0 +1,49 @@
+--- ambdec-0.4.2/source/Makefile.old	2010-04-20 17:26:16.000000000 +0100
++++ ambdec-0.4.2/source/Makefile	2010-04-20 17:28:52.000000000 +0100
+@@ -14,10 +14,10 @@
+ #  along with this program; if not, write to the Free Software
+ #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-
+-PREFIX = /usr/local
++CXX ?= g++
++PREFIX ?= /usr/local
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+-LIBDIR = lib$(SUFFIX)
++LIBDIR ?= lib$(SUFFIX)
+ SHARED = $(PREFIX)/share
+ VERSION = 0.4.2
+ DISTDIR = ambdec-$(VERSION)
+@@ -36,7 +36,7 @@
+ ambdec:	LDLIBS += -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
+ ambdec:	LDFLAGS += -L/usr/X11R6/lib
+ ambdec:	$(AMBDEC_O)
+-	g++ $(LDFLAGS) -o $@ $(AMBDEC_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(AMBDEC_O) $(LDLIBS)
+ 
+ $(AMBDEC_O):
+ -include $(AMBDEC_O:%.o=%.d)
+@@ -47,7 +47,7 @@
+ 
+ ambdec_cli:	LDLIBS += -lclthreads -ljack -lrt
+ ambdec_cli:	$(AMBDEC_CLI_O)
+-	g++ $(LDFLAGS) -o $@ $(AMBDEC_CLI_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(AMBDEC_CLI_O) $(LDLIBS)
+ 
+ $(AMBDEC_CLI_O):
+ -include $(AMBDEC_CLI_O:%.o=%.d)
+@@ -55,10 +55,10 @@
+ 
+ 
+ install:	all
+-	/usr/bin/install -m 755 ambdec $(PREFIX)/bin
+-	/usr/bin/install -m 755 ambdec_cli $(PREFIX)/bin
+-	/usr/bin/install -d $(SHARED)/ambdec
+-	/usr/bin/install -m 644 ../share/* $(SHARED)/ambdec
++	/usr/bin/install -D -m 755 ambdec $(DESTDIR)$(PREFIX)/bin/ambdec
++	/usr/bin/install -m 755 ambdec_cli $(DESTDIR)$(PREFIX)/bin/ambdec_cli
++	/usr/bin/install -d $(DESTDIR)$(SHARED)/ambdec
++	/usr/bin/install -m 644 ../share/* $(DESTDIR)$(SHARED)/ambdec
+ 
+ 
+ clean: