[proaudio] [1632] aliki update

[ Thread Index | Date Index | More lists.tuxfamily.org/proaudio Archives ]


Revision: 1632
Author:   gavlee
Date:     2010-04-12 17:05:29 +0200 (Mon, 12 Apr 2010)
Log Message:
-----------
aliki update

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/aliki/ChangeLog
    trunk/overlays/proaudio/media-sound/aliki/Manifest
    trunk/overlays/proaudio/media-sound/aliki/aliki-0.0.3.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/aliki/files/
    trunk/overlays/proaudio/media-sound/aliki/files/aliki-0.0.3-makefile.patch

Modified: trunk/overlays/proaudio/media-sound/aliki/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/aliki/ChangeLog	2010-04-11 18:57:11 UTC (rev 1631)
+++ trunk/overlays/proaudio/media-sound/aliki/ChangeLog	2010-04-12 15:05:29 UTC (rev 1632)
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Apr 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx> aliki-0.0.3.ebuild,
+  +files/aliki-0.0.3-makefile.patch:
+  add makefile patch and some tweaks
+
 *aliki-0.0.3 (07 Apr 2010)
 
   12 Jan 2009; Florian Faber <faber@xxxxxxxxxxx>;

Modified: trunk/overlays/proaudio/media-sound/aliki/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/aliki/Manifest	2010-04-11 18:57:11 UTC (rev 1631)
+++ trunk/overlays/proaudio/media-sound/aliki/Manifest	2010-04-12 15:05:29 UTC (rev 1632)
@@ -1,5 +1,6 @@
+AUX aliki-0.0.3-makefile.patch 1480 RMD160 413f72621c3e5bf94625b34c973093da156164fd SHA1 eb2c4f2ff5c27cbe118c2eaffe96ef1cda0767cf SHA256 ede3e5b9d41908c8ec288d090558198230cdbae7e81440e80b2aee4b9a474646
 DIST aliki-0.0.3.tar.bz2 41464 RMD160 f70451f5afd32da9bb323c72da3f7ca332d09b4b SHA1 21156d292c3265dcc7d1c3d93c4f60947ab6f873 SHA256 ec1b39ddc631137d862077d1c51a3d372e8fd0bc533d43ebb26aafd056172dc5
 DIST aliki-manual.pdf 279777 RMD160 a21f1a553fb465b84fa3e4e0fdefe36c0cae5566 SHA1 d9f9dd12220f4497cdb57e67b8e9a63d091b987b SHA256 18d8cf4eb74a600fe4694543cd65263954f1c9411ec1fdc2f01bde9fb3027b68
-EBUILD aliki-0.0.3.ebuild 826 RMD160 8ddc6864755a156e6d7212efd167bdc95f28a6b5 SHA1 f68722eee5cbefb78b5515f8bd8e96c49d487978 SHA256 9267b87874897304563d2d678e3e47a776e545c75b40c45b127add69b30cae4d
-MISC ChangeLog 237 RMD160 21487a1acc8d404ac2b2206db9c4a4f42062f7b2 SHA1 3f788961c487279224d1a809a7b1f5910065db49 SHA256 3c911fbcb68a27e9da6aecc2342139d1fd529f1941a28eb13bfed6571e30861d
+EBUILD aliki-0.0.3.ebuild 1018 RMD160 11326bb864315217334e4beda50283170ba8c617 SHA1 10c76d4bac45a61f27bc9cac45dbf297bdc81ec6 SHA256 fc34f2bbbc1a13b9785b7132f7c80dec71b83f420e603174c09659d70163aac9
+MISC ChangeLog 388 RMD160 d04ad1a5c3ee5e0106e54f59eedb8e44cb37db4e SHA1 d0367796dbdb3bce6996532b9c8c2c64e74b403b SHA256 8e858aafed8f08c3138acfff38dd64fe1b66471f073069b1d430d1ad67e8cbf3
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/aliki/aliki-0.0.3.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/aliki/aliki-0.0.3.ebuild	2010-04-11 18:57:11 UTC (rev 1631)
+++ trunk/overlays/proaudio/media-sound/aliki/aliki-0.0.3.ebuild	2010-04-12 15:05:29 UTC (rev 1632)
@@ -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="Aliki is an integrated system for Impulse Response measurements"
 HOMEPAGE="http://www.kokkinizita.net/linuxaudio";
 SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${P}.tar.bz2
@@ -16,16 +16,20 @@
 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
 	>=media-libs/libsndfile-1.0.18"
 
 S="${WORKDIR}/${PN}"
+
 src_compile() {
-	emake || die "make failed"
+	tc-export CC CXX
+	epatch "${FILESDIR}/${P}-makefile.patch"
+	esed_check -i -e '/^CPPFLAGS/ s/-O3//' "${S}/Makefile"
+	emake PREFIX="/usr" LIBDIR="$(get_libdir)" || die "make failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	use doc && dodoc ${DISTDIR}/aliki-manual.pdf
+	emake PREFIX="/usr" DESTDIR="${D}" install || die "install failed"
+	use doc && dodoc "${DISTDIR}/aliki-manual.pdf"
 }

Added: trunk/overlays/proaudio/media-sound/aliki/files/aliki-0.0.3-makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/aliki/files/aliki-0.0.3-makefile.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/aliki/files/aliki-0.0.3-makefile.patch	2010-04-12 15:05:29 UTC (rev 1632)
@@ -0,0 +1,43 @@
+--- aliki/Makefile.old	2010-04-12 14:40:41.000000000 +0100
++++ aliki/Makefile	2010-04-12 14:53:03.000000000 +0100
+@@ -22,9 +22,10 @@
+ # Modify as required.
+ #
+ #PREFIX = /usr/local
+-PREFIX = /usr
++CXX ?= g++
++PREFIX ?= /usr
+ SUFFIX := $(shell uname -m | sed -e 's/^unknown/$//' -e 's/^i.86/$//' -e 's/^x86_64/$/64/')
+-LIBDIR = lib$(SUFFIX)
++LIBDIR ?= lib$(SUFFIX)
+ VERSION = 0.0.3
+ DISTDIR = aliki-$(VERSION)
+ CPPFLAGS += -O3 -Wall -MMD -MP -DVERSION=\"$(VERSION)\" -DPREFIX=\"$(PREFIX)\" -I/usr/include/freetype2
+@@ -44,7 +45,7 @@
+ aliki:	LDLIBS += -lclxclient -lclthreads -lpthread -lsndfile -lfftw3f -lXft -lX11 -lrt
+ aliki:	LDFLAGS += -L$(PREFIX)/$(LIBDIR) -L/usr/X11R6/$(LIBDIR)
+ aliki:	$(ALIKI_O)
+-	g++ $(LDFLAGS) -o $@ $(ALIKI_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(ALIKI_O) $(LDLIBS)
+ $(ALIKI_O):
+ -include $(ALIKI_O:%.o=%.d)
+ 
+@@ -54,15 +55,15 @@
+ aliki-rt:	LDLIBS += -lclalsadrv -lclthreads -lsndfile -ljack -lasound -lpthread -lrt
+ aliki-rt:	LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+ aliki-rt:	 $(ALIKI_RT_O) $(LIBCLX)
+-	g++ $(LDFLAGS) -o $@ $(ALIKI_RT_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(ALIKI_RT_O) $(LDLIBS)
+ $(ALIKI_RT_O):
+ -include $(ALIKI_RT_O:%.o=%.d)
+ 
+ 
+ 
+ install:	aliki aliki-rt
+-	/usr/bin/install -m 755 aliki    $(PREFIX)/bin
+-	/usr/bin/install -m 755 aliki-rt $(PREFIX)/bin
++	/usr/bin/install -D -m 755 aliki    $(DESTDIR)$(PREFIX)/bin/aliki
++	/usr/bin/install -D -m 755 aliki-rt $(DESTDIR)$(PREFIX)/bin/aliki-rt
+ 
+ clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so


Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/