Revision: 2057
Author:   gavlee
Date:     2012-01-06 14:47:56 +0100 (Fri, 06 Jan 2012)
Log Message:
-----------
media-libs/zita-resampler install resample application

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

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

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

Modified: trunk/overlays/proaudio/media-libs/zita-resampler/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/ChangeLog 2012-01-04 
15:31:44 UTC (rev 2056)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/ChangeLog 2012-01-06 
13:47:56 UTC (rev 2057)
@@ -1,7 +1,14 @@
 # ChangeLog for media-libs/zita-resampler
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zita-resampler-0.1.1-r2 (06 Jan 2012)
+
+  06 Jan 2012; Gavin Pryke <[email protected]>
+  -zita-resampler-0.1.1.ebuild, +zita-resampler-0.1.1-r2.ebuild,
+  +files/zita-resampler-0.1.1-apps-Makefile.patch, metadata.xml:
+  install resample application
+
   01 May 2011; Gavin Pryke <[email protected]>
   zita-resampler-0.1.1.ebuild, zita-resampler-0.1.1-r1.ebuild:
   update HOMEPAGE and SRC_URI

Modified: trunk/overlays/proaudio/media-libs/zita-resampler/Manifest
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/Manifest  2012-01-04 
15:31:44 UTC (rev 2056)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/Manifest  2012-01-06 
13:47:56 UTC (rev 2057)
@@ -1,6 +1,7 @@
+AUX zita-resampler-0.1.1-apps-Makefile.patch 902 RMD160 
23663abdb28d11bca46ee6f2f146b8bcd02abd1e SHA1 
b808776c2a6b1575ffb2a8282dd3013518abbdeb SHA256 
f629a055da3317e839483f849a2a58c3c754b507df6e0e5086efe27d290d5eb4
 AUX zita-resampler-0.1.1-makefile.patch 1833 RMD160 
7ee1ac29fdb15092736dbfc3447dc37d83a6beb4 SHA1 
bbd49b2fc02716d54090ccd8ee78e2801e7f54e9 SHA256 
000f9dc3ee74dd9b19827287970cf1f1705f91d8315b8f5b2784acdb39107e38
 DIST zita-resampler-0.1.1.tar.bz2 34734 RMD160 
3d42d2aebf47589d7e81de47f5b2ef1a9692b1be SHA1 
8399756db6b90be8a89552f16b1dab3dd70dd511 SHA256 
b86f8b4b2d69a63bcf343a3beb142e1bee26e200da5cb0167828701d682de848
 EBUILD zita-resampler-0.1.1-r1.ebuild 846 RMD160 
281cd98421d8a5c51619c458342de9e57262ec44 SHA1 
84cea758b2023902006ad46676ae9dc561887848 SHA256 
ca593e8a5d7d82e87145fcdad35694c21d8f2ff5f1c4b1dbb2cb78deb5b0b68f
-EBUILD zita-resampler-0.1.1.ebuild 850 RMD160 
6b4a4cf6acde39d8dcc1d0b089db3afc38df3f30 SHA1 
3e2c8ec076ad8a36a742040c341732dad8424e08 SHA256 
20b887a5f366b135179da34490501751a0696da637d1f12af3d4beaf285e53fa
-MISC ChangeLog 685 RMD160 e2239c0c80894878bfa91b9a7a3c2ba00e8690c9 SHA1 
a322bc46331aa6ad1384a7af1e484ce5c3b6c73c SHA256 
7fdf0a53f8647e4eb4406e7f83207e0ac609e4389ec0e39ffa1c32377360e192
-MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89
+EBUILD zita-resampler-0.1.1-r2.ebuild 1284 RMD160 
b771bf49c5210dae8faaa88164b9dbf58b53f4ff SHA1 
70fe9c3b62dca2bbed299bcff730a6c976615cf2 SHA256 
7a53994386a397220ad76fccba12f55175ab2b5ade0d228177c4552d2f884877
+MISC ChangeLog 943 RMD160 073a31116717325a8c135d73c55965be7cbd3eee SHA1 
ac62f156e01fb8950d795a9e861d005dfd09433f SHA256 
bcc040c8cf61c8ac1fc10f7bb5f62b04724e12f8fb3df753ff07024cfae001b8
+MISC metadata.xml 246 RMD160 cdd725771833663c8cfa684c4c71e57d86d9993d SHA1 
973be5799e631fd26fb4abcfc8da942f2f759d06 SHA256 
f32f31abe9dcc1f9a5dc9b6a36996d773abd006d92c13c4df48f8d7d1061060f

Added: 
trunk/overlays/proaudio/media-libs/zita-resampler/files/zita-resampler-0.1.1-apps-Makefile.patch
===================================================================
--- 
trunk/overlays/proaudio/media-libs/zita-resampler/files/zita-resampler-0.1.1-apps-Makefile.patch
                            (rev 0)
+++ 
trunk/overlays/proaudio/media-libs/zita-resampler/files/zita-resampler-0.1.1-apps-Makefile.patch
    2012-01-06 13:47:56 UTC (rev 2057)
@@ -0,0 +1,28 @@
+--- apps/Makefile.orig 2012-01-06 06:00:00.000000000 +0000
++++ apps/Makefile      2012-01-06 06:01:00.000000000 +0000
+@@ -18,14 +18,14 @@
+ #
+ # --------------------------------------------------------------------------
+ 
+-
++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)
+ DISTDIR = resample-$(VERSION)
+ VERSION = 0.4.0
+ LDFLAGS += -L$(PREFIX)/$(LIBDIR)
+-CPPFLAGS += -O3 -ffast-math -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
++CPPFLAGS += -Wall -MMD -MP -DVERSION=\"$(VERSION)\"
+ #CPPFLAGS += -march=native
+ 
+ 
+@@ -35,7 +35,7 @@
+ RESAMPLE_O = resample.o audiofile.o dither.o
+ resample:     LDLIBS += -lzita-resampler -lsndfile -lpthread -lrt
+ resample:     $(RESAMPLE_O)
+-      g++ $(LDFLAGS) -o $@ $(RESAMPLE_O) $(LDLIBS)
++      $(CXX) $(LDFLAGS) -o $@ $(RESAMPLE_O) $(LDLIBS)
+ $(RESAMPLE_O):
+ -include $(RESAMPLE_O:%.o=%.d)
+ 

Modified: trunk/overlays/proaudio/media-libs/zita-resampler/metadata.xml
===================================================================
--- trunk/overlays/proaudio/media-libs/zita-resampler/metadata.xml      
2012-01-04 15:31:44 UTC (rev 2056)
+++ trunk/overlays/proaudio/media-libs/zita-resampler/metadata.xml      
2012-01-06 13:47:56 UTC (rev 2057)
@@ -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>[email protected]</email>
                <name>pro-audio overlay team</name>

Added: 
trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1-r2.ebuild
===================================================================
--- 
trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1-r2.ebuild
                            (rev 0)
+++ 
trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1-r2.ebuild
    2012-01-06 13:47:56 UTC (rev 2057)
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+inherit eutils toolchain-funcs flag-o-matic 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="media-libs/libsndfile"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+       epatch "${FILESDIR}/${P}-makefile.patch"
+       epatch "${FILESDIR}/${P}-apps-Makefile.patch"
+       # maybe there's a better way to do this. we need to find the library
+       # to link the resample app but it's not installed to the system yet
+       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
+
+       cd ../apps
+       append-cppflags -I../libs
+       CXX="$(tc-getCXX)" emake LIBDIR=$(get_libdir) || die
+}
+
+src_install() {
+       cd libs
+       emake DESTDIR="${D}" PREFIX=/usr LIBDIR=$(get_libdir) install || die
+
+       cd ../apps
+       emake DESTDIR="${D}" PREFIX=/usr LIBDIR=$(get_libdir) install || die
+       cd ..
+
+       dodoc AUTHORS
+
+       if use doc ; then
+               cd docs
+               dohtml -r *
+       fi
+}

Deleted: 
trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1.ebuild
===================================================================
--- 
trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1.ebuild   
    2012-01-04 15:31:44 UTC (rev 2056)
+++ 
trunk/overlays/proaudio/media-libs/zita-resampler/zita-resampler-0.1.1.ebuild   
    2012-01-06 13:47:56 UTC (rev 2057)
@@ -1,46 +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 multilib
-
-MY_P=${P/lib/}
-
-DESCRIPTION="C++ library for real-time resampling of audio signals"
-HOMEPAGE="http://kokkinizita.linuxaudio.org/linuxaudio/";
-SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2";
-
-RESTRICT="mirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}/libs"
-
-src_prepare() {
-       epatch "${FILESDIR}/${P}-makefile.patch"
-}
-
-src_compile() {
-       tc-export CXX
-       emake || die "emake failed"
-}
-
-src_install() {
-       make DESTDIR="${D}" PREFIX=/usr \
-               LIBDIR=$(get_libdir) install || die "make install failed"
-
-       dodoc ../AUTHORS
-
-       if use doc ; then
-               cd ../docs || die "cd ../docs failed"
-               dohtml -r *
-       fi
-}

Reply via email to