[proaudio] [1799] media-sound/jack_oscrolloscope respect LDFLAGS

[subversion@xxxxxxxxxxxxx]

Revision: 1799
Author:   gavlee
Date:     2010-11-09 19:42:27 +0100 (Tue, 09 Nov 2010)
Log Message:
-----------
media-sound/jack_oscrolloscope respect LDFLAGS

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/jack_oscrolloscope/ChangeLog
    trunk/overlays/proaudio/media-sound/jack_oscrolloscope/Manifest
    trunk/overlays/proaudio/media-sound/jack_oscrolloscope/jack_oscrolloscope-0.6.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/jack_oscrolloscope/files/jack_oscrolloscope-0.6-Makefile.patch

Modified: trunk/overlays/proaudio/media-sound/jack_oscrolloscope/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_oscrolloscope/ChangeLog	2010-11-09 17:52:48 UTC (rev 1798)
+++ trunk/overlays/proaudio/media-sound/jack_oscrolloscope/ChangeLog	2010-11-09 18:42:27 UTC (rev 1799)
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Nov 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
+  jack_oscrolloscope-0.6.ebuild,
+  +files/jack_oscrolloscope-0.6-Makefile.patch:
+  respect LDFLAGS
+
   23 Oct 2010; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
   jack_oscrolloscope-0.6.ebuild:
   add RESTRICT=mirror, add die to dobin, add IUSE="" for repoman.

Modified: trunk/overlays/proaudio/media-sound/jack_oscrolloscope/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_oscrolloscope/Manifest	2010-11-09 17:52:48 UTC (rev 1798)
+++ trunk/overlays/proaudio/media-sound/jack_oscrolloscope/Manifest	2010-11-09 18:42:27 UTC (rev 1799)
@@ -1,4 +1,5 @@
+AUX jack_oscrolloscope-0.6-Makefile.patch 875 RMD160 a082fb27c110d2ba3f6b6fc9505ad4c4e23a1c96 SHA1 22c23049768373b4e03d10ec2ea0979410c325aa SHA256 2dbbaff9d6b177103fd4a033746e7e66adef8dff10a43f30076a2a4b3b8a526a
 DIST jack_oscrolloscope-0.6.tar.gz 15704 RMD160 7f87e77360868ae1ed16bf7f33a63ae82eb39385 SHA1 cc2b7c87388f9d7931d7d411bd0ce013f8dbbcf4 SHA256 de669ee421de4768dee8c1894f02870102612d00ac35cb24b38a25eedad35800
-EBUILD jack_oscrolloscope-0.6.ebuild 540 RMD160 ce607d4fd04dbfb4a183d6e8226d270b2c94f4f9 SHA1 c88b47f9e5a4c4dfdd4cbb28c805b412fefe4cb5 SHA256 a7701154cf6e604c6c35019a4f75ffda0aab229ee0163bc12fc901bb2baabef0
-MISC ChangeLog 624 RMD160 39452807474b0403da9cf8142a9b0bbc3bc5bded SHA1 6d095f69f4f6f5084702862fe94d3b83085b8a7a SHA256 34d3726b564b182728510e5a060ab6cacdf40af7bb108ebb552d42509dd2e4a7
+EBUILD jack_oscrolloscope-0.6.ebuild 715 RMD160 ddc736d393380b8dad94a215f8cc7ad04dc33966 SHA1 a408800a056d376c83ee61b6d35a985833b8cf05 SHA256 d296bea871aefaff5c78310678a50dadfd17bedd7605b64bd8b4bf7589bee794
+MISC ChangeLog 780 RMD160 bf4ad57a404fb41c0f2566f7c007b4ba92f96590 SHA1 b323bff87d65ea58062ffe18550f82145ffc8545 SHA256 5a1babdac7fdb61cc98c07bc30fd292280c6b4cc3a520116c3ef7b585c68b4a1
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Added: trunk/overlays/proaudio/media-sound/jack_oscrolloscope/files/jack_oscrolloscope-0.6-Makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_oscrolloscope/files/jack_oscrolloscope-0.6-Makefile.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/jack_oscrolloscope/files/jack_oscrolloscope-0.6-Makefile.patch	2010-11-09 18:42:27 UTC (rev 1799)
@@ -0,0 +1,35 @@
+--- jack_oscrolloscope-0.6/Makefile.old	2010-11-09 18:24:34.000000000 +0000
++++ jack_oscrolloscope-0.6/Makefile	2010-11-09 18:36:01.000000000 +0000
+@@ -1,9 +1,10 @@
+-PREFIX =	/usr/local
++CC ?= gcc
++PREFIX ?=	/usr/local
+ 
+ CFLAGS +=	$(shell sdl-config --cflags) $(shell pkg-config --cflags jack) -Wall -std=gnu99
+ LIBS =		$(shell sdl-config --libs) $(shell pkg-config --libs jack) -lGL
+ 
+-CFLAGS +=	-O2
++#CFLAGS +=	-O2
+ 
+ OBJS =		main.o video.o audio.o waves.o
+ BIN =		jack_oscrolloscope
+@@ -12,16 +13,16 @@
+ all:		$(BIN)
+ 
+ $(BIN): $(OBJS)
+-		gcc -o $(BIN) $(OBJS) $(LIBS)
++		$(CC) $(LDFLAGS) -o $(BIN) $(OBJS) $(LIBS)
+ 
+ %.o: %.c
+-		gcc -c -o $@ $(CFLAGS) $*.c
++		$(CC) -c -o $@ $(CFLAGS) $*.c
+ 
+ clean:
+ 		rm -f $(BIN) $(OBJS) .dep
+ 
+ install: $(BIN)
+-	/usr/bin/install -m 755 $(BIN) $(PREFIX)/bin
++	/usr/bin/install -Dm 755 $(BIN) $(DESTDIR)$(PREFIX)/bin/$(BIN)
+ 
+ 
+ dep:

Modified: trunk/overlays/proaudio/media-sound/jack_oscrolloscope/jack_oscrolloscope-0.6.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jack_oscrolloscope/jack_oscrolloscope-0.6.ebuild	2010-11-09 17:52:48 UTC (rev 1798)
+++ trunk/overlays/proaudio/media-sound/jack_oscrolloscope/jack_oscrolloscope-0.6.ebuild	2010-11-09 18:42:27 UTC (rev 1799)
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+inherit eutils toolchain-funcs
+
 DESCRIPTION="Simple waveform viewer for JACK"
 HOMEPAGE="http://das.nasophon.de/jack_oscrolloscope/";
 SRC_URI="http://das.nasophon.de/download/${P}.tar.gz";
@@ -10,7 +12,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-sound/jack-audio-connection-kit-0.109.0
@@ -18,7 +20,12 @@
 	>=media-libs/libsdl-1.2.13"
 RDEPEND="${DEPEND}"
 
+src_compile() {
+	tc-export CC
+	epatch "${FILESDIR}/${P}-Makefile.patch"
+	emake || die "emake failed"
+}
 src_install() {
-	dobin "${PN}" || die
+	einstall DESTDIR="${D}" PREFIX=/usr || die "einstall failed"
 	dodoc README NEWS
 }