| [proaudio] [2215] media-sound/jmeters bump thx to Reuben Martin |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/proaudio Archives
]
Revision: 2215
Author: gavlee
Date: 2012-08-24 18:03:01 +0200 (Fri, 24 Aug 2012)
Log Message:
-----------
media-sound/jmeters bump thx to Reuben Martin
Modified Paths:
--------------
trunk/overlays/proaudio/media-sound/jmeters/ChangeLog
trunk/overlays/proaudio/media-sound/jmeters/Manifest
trunk/overlays/proaudio/media-sound/jmeters/metadata.xml
Added Paths:
-----------
trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.1-makefile.patch
trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.1.ebuild
Removed Paths:
-------------
trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.0-makefile.patch
trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.0.ebuild
Modified: trunk/overlays/proaudio/media-sound/jmeters/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/jmeters/ChangeLog 2012-08-24 16:02:58 UTC (rev 2214)
+++ trunk/overlays/proaudio/media-sound/jmeters/ChangeLog 2012-08-24 16:03:01 UTC (rev 2215)
@@ -1,7 +1,14 @@
# ChangeLog for media-sound/jmeters
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*jmeters-0.2.1 (24 Aug 2012)
+
+ 24 Aug 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+ -jmeters-0.2.0.ebuild, -files/jmeters-0.2.0-makefile.patch,
+ +jmeters-0.2.1.ebuild, +files/jmeters-0.2.1-makefile.patch, metadata.xml:
+ bump fix for libpng build failure thanks to Reuben Martin for reporting
+
01 May 2011; Gavin Pryke <gavinlee303@xxxxxxxxxxxxxx>
jmeters-0.2.0.ebuild:
update HOMEPAGE and SRC_URI
Modified: trunk/overlays/proaudio/media-sound/jmeters/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/jmeters/Manifest 2012-08-24 16:02:58 UTC (rev 2214)
+++ trunk/overlays/proaudio/media-sound/jmeters/Manifest 2012-08-24 16:03:01 UTC (rev 2215)
@@ -1,5 +1,5 @@
-AUX jmeters-0.2.0-makefile.patch 1694 RMD160 829ce222dc3a02fc635e2269607fa85bcbb16c52 SHA1 1f7a956c2555e8e6750e5143f263014f08a37ccf SHA256 bf941fa689cb1b3f36a29e4ad0049772244fe900ee90aae3c71fadf0a9138d23
-DIST jmeters-0.2.0.tar.bz2 101817 RMD160 0066491cfadb805af6f40c6656239d0c59932491 SHA1 47553b30200734cbbdc4bc91743d65510dbdd3fe SHA256 0d8b1037fdba968051fb61c6711c4f782816215cc09e2170f16cf5dae0afbf68
-EBUILD jmeters-0.2.0.ebuild 895 RMD160 da777bcfd6b08ff9aa7d1cc365873f17131b6fae SHA1 45a0fba76d8afb9f2ac5a0c7a4a923a479d60550 SHA256 2fbd7dca9f7dcdbf0e717cc9258fa4c48b51e8bf1d0d0d675149b9493436beec
-MISC ChangeLog 413 RMD160 88f2d59c6d826d99c8d44ac2978c51412230df5b SHA1 867fb46e53eb2a340bceb1c931425ff4e31f9238 SHA256 48acb08bac518d9c9a08995eb23de359e4a8c7ba676ad10ccce7de95a4752e18
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+AUX jmeters-0.2.1-makefile.patch 1450 SHA256 1a9f12cd74ceb36300abc5a97ca141d27eec31fe11b28483384a727afcb1b28e SHA512 e0c2b0c6bfd96751c39f2a9d06a46ae00496650e6782c4fa080f5f78b7e12ea13cf5c63975c065b4cad6f6146cd335c0a68f103d31ab3a3094bcdaf9ec2e0c72 WHIRLPOOL 0dabd2a9fd8c0a9465702ae4c899902a85ab209429f283a1399f8f35fed0bc7ff5ab817a693f3c57b09524a105f7821b4117611929fb9b310834b04994876ec2
+DIST jmeters-0.2.1.tar.bz2 102142 SHA256 d053156bf9038e21d550a06ea0b87fb320f00c28924b6bfbc3d359cd07466fad SHA512 5419f7da21ca4070beae72230cf2696f5367e38366ed8ffef78087e5b74ff37779b1f228139943fb766dd68230f7c8102e5dcfa1ae178a6a19ea678ef2b2cfe3 WHIRLPOOL 44055d1d60c16a9fd3d3b1501fcf1d920493a337c50e8604da33d4ac389241f39216425cf1912f88a39af1493e6a97eac3dbeb9badbd14ef804813fb68e2bfde
+EBUILD jmeters-0.2.1.ebuild 935 SHA256 24caacc5e15591710b8cfea2bb3fae31127a5c92717a1ae186044a0d6439a232 SHA512 9b06ffe69ac138dbee421181f65f55acc85f466115450a69e86404f0cb57a050066048022182525ca4a2e3293a91df581ff319e6929ad2d83ee2c64e1fc3ba9e WHIRLPOOL 617dd7927a33d5f505bb0d33ac7ae50787744357a87d7f17e183b2b3fbba61af2a8f1c620dbe5477adce5a4bbac4b103f5640ef0e0ddded96c4dedcadddd3886
+MISC ChangeLog 721 SHA256 6ef46bea761aa1683ff85fe43d64e05f2206f6522ef07d0fa861dcfc8785943c SHA512 555d8f0fc9bc6516952d32e31e03da1f8735ce64d5187a09b36e95eebb03dc63cd5d84413fe0b3986c20e79a5fd078e15953ebf98ac063258a26a37a935557c8 WHIRLPOOL f9a22d47fabfa484236b2de18f89106f4c1c6da76d8971c8110f68fb0ba8d53770c1f335565027fc3b54460dfaa69f508b2d3fe35bb30d8eb246921dfc9154c8
+MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f
Deleted: trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.0-makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.0-makefile.patch 2012-08-24 16:02:58 UTC (rev 2214)
+++ trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.0-makefile.patch 2012-08-24 16:03:01 UTC (rev 2215)
@@ -1,46 +0,0 @@
---- jmeters-0.2.0/source/Makefile.old 2010-10-28 11:09:55.000000000 +0100
-+++ jmeters-0.2.0/source/Makefile 2010-10-28 11:13:46.000000000 +0100
-@@ -14,15 +14,16 @@
- # 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
- PROGRAM = jmeters
- VERSION = 0.2.0
- DISTDIR = jmeters-$(VERSION)
--CPPFLAGS += -O3 -Wall -MMD -MP -DPROGRAM=\"$(PROGRAM)\" -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
-+#CPPFLAGS += -O3 -Wall -MMD -MP -DPROGRAM=\"$(PROGRAM)\" -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
-+CPPFLAGS += -Wall -MMD -MP -DPROGRAM=\"$(PROGRAM)\" -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
- #CPPFLAGS += -march=pentium4
-
-
-@@ -35,17 +36,17 @@
- jmeters: LDLIBS += -lsndfile -lclxclient -lclthreads -ljack -lpng -lXft -lX11 -lrt
- jmeters: LDFLAGS += -L/usr/X11R6/lib
- jmeters: $(JMETERS_O)
-- g++ $(LDFLAGS) -o $@ $(JMETERS_O) $(LDLIBS)
-+ $(CXX) $(LDFLAGS) -o $@ $(JMETERS_O) $(LDLIBS)
-
- $(JMETERS_O):
- -include $(JMETERS_O:%.o=%.d)
-
-
- install: all
-- /usr/bin/install -d $(PREFIX)/bin
-- /usr/bin/install -m 755 jmeters $(PREFIX)/bin
-- /usr/bin/install -d $(SHARED)/jmeters
-- /usr/bin/install -m 644 ../share/* $(SHARED)/jmeters
-+ /usr/bin/install -d $(DESTDIR)$(PREFIX)/bin
-+ /usr/bin/install -m 755 jmeters $(DESTDIR)$(PREFIX)/bin
-+ /usr/bin/install -d $(DESTDIR)$(SHARED)/jmeters
-+ /usr/bin/install -m 644 ../share/* $(DESTDIR)$(SHARED)/jmeters
-
- clean:
- /bin/rm -f *~ *.o *.a *.d *.so
Added: trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.1-makefile.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.1-makefile.patch (rev 0)
+++ trunk/overlays/proaudio/media-sound/jmeters/files/jmeters-0.2.1-makefile.patch 2012-08-24 16:03:01 UTC (rev 2215)
@@ -0,0 +1,47 @@
+--- source/Makefile.orig 2012-08-24 14:52:59.286902592 +0100
++++ source/Makefile 2012-08-24 14:57:25.503645465 +0100
+@@ -14,17 +14,16 @@
+ # 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
+ PROGRAM = jmeters
+ VERSION = 0.2.1
+ DISTDIR = jmeters-$(VERSION)
+ CPPFLAGS += -DPROGRAM=\"$(PROGRAM)\" -DVERSION=\"$(VERSION)\" -DSHARED=\"$(SHARED)\"
+-CXXFLAGS += -O3 -Wall -MMD -MP
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -MMD -MP
+
+
+ all: jmeters
+@@ -36,17 +35,17 @@
+ jmeters: LDLIBS += -lsndfile -lclxclient -lclthreads -ljack -lpthread -lpng -lXft -lX11 -lrt
+ jmeters: LDFLAGS += -L/usr/X11R6/lib
+ jmeters: $(JMETERS_O)
+- g++ $(LDFLAGS) -o $@ $(JMETERS_O) $(LDLIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(JMETERS_O) $(LDLIBS)
+
+ $(JMETERS_O):
+ -include $(JMETERS_O:%.o=%.d)
+
+
+ install: all
+- install -d $(PREFIX)/bin
+- install -m 755 jmeters $(PREFIX)/bin
+- install -d $(SHARED)/jmeters
+- install -m 644 ../share/* $(SHARED)/jmeters
++ install -d $(DESTDIR)$(PREFIX)/bin
++ install -m 755 jmeters $(DESTDIR)$(PREFIX)/bin
++ install -d $(DESTDIR)$(SHARED)/jmeters
++ install -m 644 ../share/* $(DESTDIR)$(SHARED)/jmeters
+
+ clean:
+ /bin/rm -f *~ *.o *.a *.d *.so
Deleted: trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.0.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.0.ebuild 2012-08-24 16:02:58 UTC (rev 2214)
+++ trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.0.ebuild 2012-08-24 16:03:01 UTC (rev 2215)
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A jack multichannel audio level meter app featuring correct ballistics for both the VU and the PPM"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/";
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2";
-
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libclthreads-2.2.1
- >=media-libs/libclxclient-3.3.2
- media-sound/jack-audio-connection-kit"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/source"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
- tc-export CXX
- emake PREFIX=/usr || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" PREFIX=/usr install || die "make install failed"
- cd ..
- dodoc AUTHORS README
-}
Copied: trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.1.ebuild (from rev 2214, trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.0.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.1.ebuild (rev 0)
+++ trunk/overlays/proaudio/media-sound/jmeters/jmeters-0.2.1.ebuild 2012-08-24 16:03:01 UTC (rev 2215)
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A jack multichannel audio level meter app featuring correct ballistics for both the VU and the PPM"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/";
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2";
+
+RESTRICT="mirror"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/libclthreads-2.2.1
+ >=media-libs/libclxclient-3.3.2
+ media-sound/jack-audio-connection-kit"
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}/source"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_compile() {
+ CXX="$(tc-getCXX)" emake PREFIX="${EPREFIX}/usr" || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${ED}" PREFIX="${EPREFIX}/usr" install || \
+ die "make install failed"
+ cd ..
+ dodoc AUTHORS README
+}
Modified: trunk/overlays/proaudio/media-sound/jmeters/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-sound/jmeters/metadata.xml 2012-08-24 16:02:58 UTC (rev 2214)
+++ trunk/overlays/proaudio/media-sound/jmeters/metadata.xml 2012-08-24 16:03:01 UTC (rev 2215)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
- <herd>no-herd</herd>
<maintainer>
<email>proaudio@xxxxxxxxxxxxx</email>
<name>pro-audio overlay team</name>