[proaudio] [1633] tetraproc update

[subversion@xxxxxxxxxxxxx]

Revision: 1633
Author:   gavlee
Date:     2010-04-12 18:17:58 +0200 (Mon, 12 Apr 2010)
Log Message:
-----------
tetraproc update

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/tetraproc/ChangeLog
    trunk/overlays/proaudio/media-sound/tetraproc/Manifest
    trunk/overlays/proaudio/media-sound/tetraproc/tetraproc-0.6.2.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/tetraproc/files/
    trunk/overlays/proaudio/media-sound/tetraproc/files/tetraproc-0.6.2-makefile.patch

Modified: trunk/overlays/proaudio/media-sound/tetraproc/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/tetraproc/ChangeLog	2010-04-12 15:05:29 UTC (rev 1632)
+++ trunk/overlays/proaudio/media-sound/tetraproc/ChangeLog	2010-04-12 16:17:58 UTC (rev 1633)
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Apr 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
+  tetraproc-0.6.2.ebuild, +files/tetraproc-0.6.2-makefile.patch:
+  add makefile patch and some tweaks
+
 *tetraproc-0.6.2 (08 Apr 2010)
 
   08 Apr 2010; Florian Faber <faber@xxxxxxxxxxx>

Modified: trunk/overlays/proaudio/media-sound/tetraproc/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/tetraproc/Manifest	2010-04-12 15:05:29 UTC (rev 1632)
+++ trunk/overlays/proaudio/media-sound/tetraproc/Manifest	2010-04-12 16:17:58 UTC (rev 1633)
@@ -1,4 +1,5 @@
+AUX tetraproc-0.6.2-makefile.patch 1323 RMD160 b5b21374359a90b6ee8abe18a8e89ce52eeb8093 SHA1 0ea54dd70a89a7d4cc0b7494da16d621a163c34c SHA256 9056077c79b4afc53d141cfb7388372e87e8efb9287dd0692ef533aa659a0886
 DIST tetraproc-0.6.2.tar.bz2 41616 RMD160 81bd5db742df4aae9db34d4723a96f0f735b6627 SHA1 be488ff4a5ce879db4e7260841405a143665a621 SHA256 0ae33012a80f8dfa4b9773e27fafa1557e71dbf776eca721d0fd55aa25948789
-EBUILD tetraproc-0.6.2.ebuild 1147 RMD160 6e1637444084813b91c410d1854631cecdd5ba1a SHA1 0d7bee26d9016c675513c3f141811ae70e7321c1 SHA256 6500e8580b5ea0e7afadb39c25cf296676128f52d6a6cd46f299d51a6b1660c2
-MISC ChangeLog 262 RMD160 b23c30ce08764d09da8409c1a8f1d8d4179731ab SHA1 0ad47d1b3e5bea8d3863a8892687a983ddf5a380 SHA256 430d83c39227cb74b1738f5729bee087a9f70ae77bf63ee18f81d244c02a1085
+EBUILD tetraproc-0.6.2.ebuild 945 RMD160 17b7586c8911d2d236270211b38fa5dfb99924e1 SHA1 66239ab283623f01c02e93fd54055c980827daa4 SHA256 4c789cf3fe805d0836a01bab6a304894677b164cb8b0aabe3f31af95421de336
+MISC ChangeLog 421 RMD160 1b055f2a931fe85a3ff564259c3473dd7361edda SHA1 32c40079dc1318aebf81cd1901cf972fde7d64f5 SHA256 c60066219d66614b080217ed688f4c8c9ee4595a4dc075d47ef2f93ba5670dfd
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Added: trunk/overlays/proaudio/media-sound/tetraproc/files/tetraproc-0.6.2-makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/tetraproc/files/tetraproc-0.6.2-makefile.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/tetraproc/files/tetraproc-0.6.2-makefile.patch	2010-04-12 16:17:58 UTC (rev 1633)
@@ -0,0 +1,38 @@
+--- tetraproc-0.6.2/source/Makefile.old	2010-04-12 17:11:36.000000000 +0100
++++ tetraproc-0.6.2/source/Makefile	2010-04-12 17:11:11.000000000 +0100
+@@ -14,11 +14,11 @@
+ #  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/')
+ SHARED = $(PREFIX)/share/tetraproc
+-LIBDIR = lib$(SUFFIX)
++LIBDIR ?= lib$(SUFFIX)
+ VERSION = 0.6.2
+ DISTDIR = tetraproc-$(VERSION)
+ CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
+@@ -42,16 +42,16 @@
+ tetraproc:	LDLIBS += -lsndfile -lfftw3f -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt 
+ tetraproc:	LDFLAGS += -L/usr/X11R6/lib
+ tetraproc:	$(TETRAPROC_O)
+-	g++ $(LDFLAGS) -o $@ $(TETRAPROC_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(TETRAPROC_O) $(LDLIBS)
+ 
+ $(TETRAPROC_O):
+ -include $(TETRAPROC_O:%.o=%.d)
+ 
+ 
+ install:	all
+-	/usr/bin/install -m 755 tetraproc $(PREFIX)/bin
+-	/usr/bin/install -d $(SHARED)
+-	/usr/bin/install -m 644 ../share/* $(SHARED)
++	/usr/bin/install -D -m 755 tetraproc $(DESTDIR)$(PREFIX)/bin/tetraproc
++	/usr/bin/install -d $(DESTDIR)$(SHARED)
++	/usr/bin/install -m 644 ../share/* $(DESTDIR)$(SHARED)
+ 
+ 
+ clean:

Modified: trunk/overlays/proaudio/media-sound/tetraproc/tetraproc-0.6.2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/tetraproc/tetraproc-0.6.2.ebuild	2010-04-12 15:05:29 UTC (rev 1632)
+++ trunk/overlays/proaudio/media-sound/tetraproc/tetraproc-0.6.2.ebuild	2010-04-12 16:17:58 UTC (rev 1633)
@@ -4,37 +4,37 @@
 
 inherit exteutils multilib toolchain-funcs
 
-RESTRICT="nomirror"
-DESCRIPTION="TetraProc converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording."
+RESTRICT="mirror"
+DESCRIPTION="A-format to B-format signal converter for tetrahedral Ambisonic
+microphones"
 HOMEPAGE="http://www.kokkinizita.net/linuxaudio";
 SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${P}.tar.bz2";
 
-
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
+IUSE=""
 
 DEPEND=">=media-sound/jack-audio-connection-kit-0.100
-        >=media-libs/libclthreads-2.4.0	
-        >=media-libs/libclxclient-3.6.1"
+	>=media-libs/libclthreads-2.4.0
+	>=media-libs/libclxclient-3.6.1"
 
 S="${S}/source"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	esed_check -i -e 's@g++@\$(CXX) \$(LDFLAGS)@g' -e '/^CPPFLAGS/ s/-O2//' \
-		-e "/^LIBDIR/ s/lib\$(SUFFIX)/$(get_libdir)/" \
-		-e '/\/usr\/bin\/install/ s@\(\$(SHARED)\)@\$(DESTDIR)/\1@g' \
-		-e '/\/usr\/bin\/install/ s@\(\$(PREFIX)\)@\$(DESTDIR)/\1@g' Makefile
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	esed_check -i -e '/^CPPFLAGS/ s/-O3//' Makefile
 }
 
 src_compile() {
 	tc-export CC CXX
-	emake || die "make failed"
+	emake PREFIX="/usr" LIBDIR="$(get_libdir)" || die "make failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${D}/usr" install || die "make install failed"
+	emake DESTDIR="${D}" PREFIX="/usr" install || die "make install failed"
 	cd ..
-	dodoc AUTHORS COPYING README
+	dodoc AUTHORS README
 }