[proaudio] [2213] media-libs/zita-resampler update

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

To: proaudio@xxxxxxxxxxxxxxxxxxx
Subject: [proaudio] [2213] media-libs/zita-resampler update
From: subversion@xxxxxxxxxxxxx
Date: Fri, 24 Aug 2012 18:02:57 +0200

Revision: 2213
Author:   gavlee
Date:     2012-08-24 18:02:56 +0200 (Fri, 24 Aug 2012)
Log Message:
-----------
media-libs/zita-resampler update

Modified Paths:
--------------
    trunk/overlays/proaudio/media-libs/zita-resampler/ChangeLog
    trunk/overlays/proaudio/media-libs/zita-resampler/Manifest

Added Paths:
-----------
    trunk/overlays/proaudio/media-libs/zita-resampler/files/zita-resampler-1.1.0-Makefile-v2.patch
    trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-1.1.0-r2.ebuild

Removed Paths:
-------------
    trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1-r1.ebuild

Modified: trunk/overlays/proaudio/media-libs/zita-resampler/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/ChangeLog	2012-08-24 16:02:53 UTC (rev 2212)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/ChangeLog	2012-08-24 16:02:56 UTC (rev 2213)
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zita-resampler-1.1.0-r2 (24 Aug 2012)
+
+  24 Aug 2012; Gavin Pryke (gavlee) <gavinlee303@xxxxxxxxxxxxxx>
+  -zita-resampler-0.1.1-r1.ebuild, +zita-resampler-1.1.0-r2.ebuild,
+  +files/zita-resampler-1.1.0-Makefile-v2.patch:
+  revise to fix linking of zresample app on fresh install. add README and
+  install html docs. LICENSE for 1.1.0 is now GPL-3. remove old ebuild.
+
 *zita-resampler-1.1.0-r1 (30 Jul 2012)
 
   30 Jul 2012; Dominique Michel <dominique@xxxxxxxxxxxxx>

Modified: trunk/overlays/proaudio/media-libs/zita-resampler/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/Manifest	2012-08-24 16:02:53 UTC (rev 2212)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/Manifest	2012-08-24 16:02:56 UTC (rev 2213)
@@ -1,10 +1,11 @@
 AUX zita-resampler-0.1.1-apps-Makefile.patch 902 SHA256 f629a055da3317e839483f849a2a58c3c754b507df6e0e5086efe27d290d5eb4 SHA512 cad05bc45c7c82423909e297f37adc854e9855a82f312c52dd0e856b4b75619f16221312a03bc903fc08366460a12e1cc412ed323d6f8abb776f4c551a85ff3a WHIRLPOOL 7c7d3bdbf3f977bfcc3b719a470c2caf8d04b7727429e813ea6a5d05565caa235062f93f6332d418f82d797c198208a7b154a6f47a8b2246c042015c5eaa15ad
 AUX zita-resampler-0.1.1-makefile.patch 1833 SHA256 000f9dc3ee74dd9b19827287970cf1f1705f91d8315b8f5b2784acdb39107e38 SHA512 0d3735b92aa310db1d62a1e0dfbd1b75752a5c5e968cbc93a78c165776b07b577ae496d81fffa8e7576c643055d459277348834860f30c99a90f0dc72df7fbe2 WHIRLPOOL 1eeb4a1900775cbc2c617745961fb96e470ad1a4dcdfe485676fb73820cabd07e2fc9eb625f7eeaf3bcd3cf6b57e606470db6fc0455bf6a8628ecc4fe00f80c2
+AUX zita-resampler-1.1.0-Makefile-v2.patch 2633 SHA256 31c28eb9b6c921da930b975fb639af45b86f4eab50f8f4ce4274276df01de0ca SHA512 0c8db40e7ae3b0f62e4e8a55093522adbcf7ed63fe4d4adc77ef4a90e4d5840450b0e292b973da9b741bd136768f94bea07144b89ed0f48490cc7b79ffbbcf01 WHIRLPOOL 59deef7329565db23f0299e7fd084e73992a875fbb7bbc341123ff2ce48a12d4bcf063e68cc4cb2e628455e30596eaf96f33ea2fea28084dd85f5155e4cb143b
 AUX zita-resampler-1.1.0-Makefile.patch 1676 SHA256 be84e2965c86b54a0cee5807a396b437310c8ae15424c82db4e0df438de6dfcd SHA512 0821629e0363a1219c2769362c9df6a3ccac0f36486e2aec0554d6c40aecf91b1e58b37fbcb8cef68aaa92778096f22d6fd4d63993f53a6b9ad119d5592a9055 WHIRLPOOL e4be668a37065626b43d8eb5c291fd38ae8c91373c6fdd8aa4e872363e8108f57ab5cf417db46084a9b466d3e779ace8f3b89b57e8248735da9bab037ecffb8e
 DIST zita-resampler-0.1.1.tar.bz2 34734 SHA256 b86f8b4b2d69a63bcf343a3beb142e1bee26e200da5cb0167828701d682de848 SHA512 d59bfb5bc31e37ef2b5589fc5c879e3cdb951d1afe5082cbae1459f18b96d3537debcb102a65eff18b46d60b34becfedee7303097ff9ab06f70b877a2cecfaa1 WHIRLPOOL f8e39ae94fe8f385c0433b6913e00cee4b8efc350cac68e098b34f9b8daf60dbf064e0c20f9d5fc1746309f61d14d2e221c23f2904df9d53a9104cba1e799bf7
 DIST zita-resampler-1.1.0.tar.bz2 123224 SHA256 c8e1b7ce7915340cc63b8590518caa45f737fc6e43799389854bab9badcd2803 SHA512 4a31e780e61591717042e7bf2583a3252eb6686e89c8931b7786fea7903a07785eb09094f9f1524cfb539b398881f21cc50eef59bfedb1f7d9c74961f4a0e572 WHIRLPOOL 6bc3cf88eaa85a9e0ccf4ee90d5216aca1ff29f4d2b227350501f88356f1c45402969fd2b790c60644e2f4a3df75f985ee3d45fff4b72d510440d35ed9c673b4
-EBUILD zita-resampler-0.1.1-r1.ebuild 846 SHA256 ca593e8a5d7d82e87145fcdad35694c21d8f2ff5f1c4b1dbb2cb78deb5b0b68f SHA512 ff9626c13cd6b19e75b56d5a8b37789f1085a7af84a67bae96e609eda37c5d47c234022e9b761236a442e972ac959ee879fc81832d774ddc95ce32f4fab62906 WHIRLPOOL 0623c8ffc550fc890cd3c611d9ea26a4b8ed0a2ca92d4aed2bbf5a1da8442e8ad282328312f92575f458d1e0a64a83286b39af0b99082c3ac6813cd5f74e39e4
 EBUILD zita-resampler-0.1.1-r2.ebuild 1284 SHA256 7a53994386a397220ad76fccba12f55175ab2b5ade0d228177c4552d2f884877 SHA512 4feeb20bd5a218b46741d883bd6008eac5cdf00f49d69c8c42e0ff766259a18e3d7af4801e9ea9cf9a2cd15f256891a365692adf4374a5e81cbec1dbc975525e WHIRLPOOL 2e7e61f376984d3ec274814375def99059b44c60966a8b549f750c6d5ad278829b21fe5e82dcf609ea1860310d2c2a76e0841f325b8d4c7c8d30354412db6787
 EBUILD zita-resampler-1.1.0-r1.ebuild 1149 SHA256 2586a50da2e3af985131ecbb8497e2a1f83b463cea560ba5fd97ccdfdc1d0c18 SHA512 93430fb9ddae5dac62041a1d9d82f50f3e852ff2a521baf62351c4c3c7a910438641e56e3d2a9cc7cdc4d4e19da1109f88dce6c5952a55510a1429736959d6bc WHIRLPOOL eac286d1ce8583e1dc25345e2f59ed2e84665a58e0304ffacf541cab108519b2fc71a208f392a7e3c0e194f538e82c892bb4abeab892b5e82d63c07847c49847
-MISC ChangeLog 1443 SHA256 e9d1c114c4839ec21503c2e2addea6978ef1720d383fbcc98651d74e82ccb20c SHA512 af40bbf01f1b3ac4650d293c27aa5dbfebe49fa5687d4abd51e4c62d69f4f186b0e82f0a68a6339b33ab947f73462caf016d8eb61de05b51fd1b4a21eaab1b77 WHIRLPOOL c4c6f6b7b064dfb9a80b18366894afe7798d9c8841b23af624be835aad4849d9b32b9d6997c436d15433d9c0f634414af27afd6ba290293494b2edb75c587f3c
+EBUILD zita-resampler-1.1.0-r2.ebuild 1205 SHA256 7745de4bcc52f8b4ad917cb491a6b0779192ce7d07bce0c639fffae3288d5907 SHA512 4a6703c4d95d4de0dec3fd60ce6df398b5cf5859d077f898bf180cd60a915818cdea272b19a8c70e3893dbc41cd7fc846f6e94b4acef49d8321382899d0b6a09 WHIRLPOOL f15c9e88a0c175731abe54cfadc1171f88bc417eae3551b93f9761fc7483998d5dd07ecd5d5e285930bc8cb9494ccd268b96efab14cca9f03a7bc005d70b5401
+MISC ChangeLog 1812 SHA256 ed0dcc7b7a1a573b19c825168bbcd84e8f54526a404ea59fdb19d8a85221f628 SHA512 dd6aca01447b36050dbfafa9feab7dacbc67b4f0e21fa18bd86263af4c12c52c881d43b240e59738a0fedc672c7675d1c4833824d749c81fdcf94b3eb1aea9ea WHIRLPOOL 9a3da80de478055e2b0bfcc361308ab04f9296b0e75af597435f44224788c7e9c6c3e229d001b554e93a995babfe19b1211df09b765f04a6164ad7606facfc1b
 MISC metadata.xml 246 SHA256 f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f SHA512 327022589c637a14219eb603a62050fbb93b980f4693960c0ac4117b6b483d9f0d9fe1366d8e18227b34373a399aef339f49c16df8ca57b9ec870568a4d394f4 WHIRLPOOL e55381a9a9fd1d0efbe87da1c3aa302efdcf4734827f56273faeb55b17361c529518fcf16ac0946102e26165e8eedba81ab0cd07c7b08ce6bad001e944e43a0f

Added: trunk/overlays/proaudio/media-libs/zita-resampler/files/zita-resampler-1.1.0-Makefile-v2.patch
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/files/zita-resampler-1.1.0-Makefile-v2.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/files/zita-resampler-1.1.0-Makefile-v2.patch	2012-08-24 16:02:56 UTC (rev 2213)
@@ -0,0 +1,84 @@
+--- libs/Makefile.orig	2012-07-30 15:34:40.521258855 +0100
++++ libs/Makefile	2012-07-31 17:11:18.251349371 +0100
+@@ -20,9 +20,9 @@
+ 
+ # Modify as required.
+ #
+-PREFIX = /usr/local
++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)
+ 
+ MAJVERS = 1
+ MINVERS = 1.0
+@@ -31,8 +31,7 @@
+ 
+ 
+ CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
+-CXXFLAGS += -Wall -fPIC -O2 -ffast-math
+-CXXFLAGS += -march=native
++CXXFLAGS += -Wall -fPIC -ffast-math
+ LDFLAGS += 
+ LDLIBS +=
+ 
+@@ -46,7 +45,7 @@
+ 
+ 
+ $(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O)
+-	g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP)
++	$(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP)
+ 
+ $(ZITA-RESAMPLER_O):	$(ZITA-RESAMPLER_H)
+ 
+@@ -57,7 +56,7 @@
+ 	install -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(PREFIX)/include/zita-resampler
+ 	install -m 644 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 	ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-RESAMPLER_SO)
+-	ldconfig
++	/sbin/ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR)
+ 
+ uninstall:
+ 	/bin/rm -rf $(DESTDIR)$(PREFIX)/include/zita-resampler
+--- apps/Makefile.orig	2012-07-30 15:34:32.997490816 +0100
++++ apps/Makefile	2012-07-31 17:14:45.243965955 +0100
+@@ -18,16 +18,15 @@
+ # ----------------------------------------------------------------------------
+ 
+ 
+-PREFIX = /usr/local
++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)
+ DISTDIR = zresample-$(VERSION)
+ VERSION = 0.4.0
+-MANDIR = /usr/share/man/man1
++MANDIR = $(PREFIX)/share/man/man1
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+-CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\"
+-CXXFLAGS += -O3  -ffast-math -Wall
+-CXXFLAGS += -march=native
++CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -I../libs
++CXXFLAGS += -ffast-math -Wall
+ 
+ 
+ all:	zresample zresample.1.gz
+@@ -36,7 +35,7 @@
+ ZRESAMPLE_O = zresample.o audiofile.o dither.o
+ zresample:	LDLIBS += -lzita-resampler -lsndfile -lrt
+ zresample:	$(ZRESAMPLE_O)
+-	g++ $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS)
+ $(ZRESAMPLE_O):
+ -include $(ZRESAMPLE_O:%.o=%.d)
+ 
+@@ -51,7 +50,7 @@
+ 
+ uninstall: 
+ 	/bin/rm -f $(DESTDIR)$(PREFIX)/bin/zresample
+-	/bin/rm -f $(MANDIR)/zresample.1.gz
++	/bin/rm -f $(DESTDIR)$(MANDIR)/zresample.1.gz
+ 
+ clean:
+ 	/bin/rm -f *~ *.o *.a *.d *.so *.gz zresample

Deleted: trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1-r1.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1-r1.ebuild	2012-08-24 16:02:53 UTC (rev 2212)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1-r1.ebuild	2012-08-24 16:02:56 UTC (rev 2213)
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="C++ library for real-time resampling of audio signals"
-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="doc"
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-	pushd libs
-	CXX="$(tc-getCXX)" emake LIBDIR=$(get_libdir) || die
-	# TODO: compile cli resampler app that's inside tarball
-}
-
-src_install() {
-	pushd libs
-	make DESTDIR="${D}" PREFIX=/usr LIBDIR=$(get_libdir) install || die
-	popd
-
-	dodoc AUTHORS
-
-	if use doc ; then
-		cd docs
-		dohtml -r *
-	fi
-}

Added: trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-1.1.0-r2.ebuild
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-1.1.0-r2.ebuild	                        (rev 0)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-1.1.0-r2.ebuild	2012-08-24 16:02:56 UTC (rev 2213)
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="C++ library for real-time resampling of audio signals"
+HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/";
+SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2";
+
+RESTRICT="mirror"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libsndfile"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-Makefile-v2.patch"
+	# link directly by path to work around failure with zresample application
+	sed -i -e "s|-lzita-resampler|../libs/libzita-resampler.so.${PV}|" \
+		apps/Makefile || die
+}
+
+src_compile() {
+	cd libs
+	CXX="$(tc-getCXX)" emake LIBDIR=$(get_libdir) || die "make libs failed"
+
+	cd ../apps
+	CXX="$(tc-getCXX)" emake LIBDIR=$(get_libdir) || die "make apps failed"
+}
+
+src_install() {
+	cd libs
+	emake DESTDIR="${D}" PREFIX=/usr \
+		LIBDIR=$(get_libdir) install || die "install libs failed"
+
+	cd ../apps
+	emake DESTDIR="${D}" PREFIX=/usr \
+		LIBDIR=$(get_libdir) install || die "install apps failed"
+	cd ..
+
+	dodoc AUTHORS README
+
+	cd docs
+	dohtml -r *
+}

Messages sorted by: [ date | thread ]
Prev by Date: [proaudio] [2212] replace png with xpm in FILESDIR for tutka
Next by Date: [proaudio] [2214] import media-sound/sfxr
Previous by thread: [proaudio] [2212] replace png with xpm in FILESDIR for tutka
Next by thread: [proaudio] [2214] import media-sound/sfxr

Mail converted by MHonArc 2.6.19+

http://listengine.tuxfamily.org/