diff options
| -rw-r--r-- | media-libs/libclalsadrv/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/libclalsadrv/Manifest | 26 | ||||
| -rw-r--r-- | media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch | 33 | ||||
| -rw-r--r-- | media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild | 20 | ||||
| -rw-r--r-- | media-libs/libclalsadrv/metadata.xml | 8 |
5 files changed, 56 insertions, 41 deletions
diff --git a/media-libs/libclalsadrv/ChangeLog b/media-libs/libclalsadrv/ChangeLog index f72d299308dc..c1a42d816ed0 100644 --- a/media-libs/libclalsadrv/ChangeLog +++ b/media-libs/libclalsadrv/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libclalsadrv -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/ChangeLog,v 1.8 2005/09/04 12:22:36 flameeyes Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/ChangeLog,v 1.9 2006/03/06 14:46:58 flameeyes Exp $ + + 06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + files/libclalsadrv-1.0.1-makefile.patch, metadata.xml, + libclalsadrv-1.0.1.ebuild: + Respect multilib libdir, don't run ldconfig, use CXX to build, drop + virtual/libc dependency. 04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> libclalsadrv-1.0.1.ebuild: diff --git a/media-libs/libclalsadrv/Manifest b/media-libs/libclalsadrv/Manifest index 830ae375a896..e5d7c6d69e43 100644 --- a/media-libs/libclalsadrv/Manifest +++ b/media-libs/libclalsadrv/Manifest @@ -1,15 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 2547491cc6f5da33625b6301b934fcbb ChangeLog 1285 -MD5 5ac4e3b976f112a57c7b37bba525b201 libclalsadrv-1.0.1.ebuild 858 -MD5 ae2f0ce6b633cd6e8ea199bdabb85098 metadata.xml 227 +MD5 46f3cb781d58c5a61c4e52a63bf156c0 ChangeLog 1522 +RMD160 c3a0706a83d0bdb28d563a11c6442a6d43198305 ChangeLog 1522 +SHA256 7e52f4f7d3a291eac4be3594ac0d1b36a6b1147777d1a7c0fff22eac84feecb1 ChangeLog 1522 MD5 d29b1e298284031cdb5a92b68c064972 files/digest-libclalsadrv-1.0.1 67 -MD5 bd13c609cd92e6c5da76125ed0f70e97 files/libclalsadrv-1.0.1-makefile.patch 892 +RMD160 1baaf12e026239c71591cc53e12c9cd7916e2cc9 files/digest-libclalsadrv-1.0.1 67 +SHA256 4858933e67e934125c11604823eb1cc449a418062967c4af871cd042f74c4ec1 files/digest-libclalsadrv-1.0.1 67 +MD5 813545a0c6104ec4da0f68c52d8ff6f4 files/libclalsadrv-1.0.1-makefile.patch 932 +RMD160 ec2a1ac63ba1a05fefd66629b251a9da5df16456 files/libclalsadrv-1.0.1-makefile.patch 932 +SHA256 d9c1e084fe4fd3707995df9c0cc45aca9c8742a874d855a7d8d0c3969d83c5a8 files/libclalsadrv-1.0.1-makefile.patch 932 +MD5 f791dcc8bf325869a95c99d9cec50492 libclalsadrv-1.0.1.ebuild 949 +RMD160 9b58c55310fe77ce40661bc643b3561389b44b84 libclalsadrv-1.0.1.ebuild 949 +SHA256 29d1ad470d59a5c2cb09f730fa5501a6276fea9f52a25d3774ed65e0f2581728 libclalsadrv-1.0.1.ebuild 949 +MD5 2f758c82434233f84f01f80f850a1112 metadata.xml 217 +RMD160 906a4752f7a779a157215dc1c5f05e8de62aeb4a metadata.xml 217 +SHA256 cbd33766e3d30e5e0112ad6c57ffc10052659ebb132a0a16fb3462ea8c5a2789 metadata.xml 217 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.1 (GNU/Linux) -iD8DBQFDGuclj5H05b2HAEkRAjs8AJwPYNv83LBvpwYBQg0zwhieq7JXRQCfe4dE -rfMmmVnUuQT7z1e/itScbf8= -=D6xl +iD8DBQFEDEtRAiZjviIA2XgRAnq/AJ9LFhUTA3SMaIrEzqzShv3FSUBINgCg56o2 +KB4mqEZcYG02NcSh/4biuI4= +=i7Su -----END PGP SIGNATURE----- diff --git a/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch b/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch index 57ee29a20748..74b6d5debf12 100644 --- a/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch +++ b/media-libs/libclalsadrv/files/libclalsadrv-1.0.1-makefile.patch @@ -1,26 +1,23 @@ ---- clalsadrv-1.0.1.orig/Makefile 2004-08-24 01:22:35.904600424 +0200 -+++ clalsadrv-1.0.1/Makefile 2004-08-24 01:25:40.084600808 +0200 -@@ -3,10 +3,8 @@ - LDLIBS += -lclalsadrv -lclthreads -lrt +Index: clalsadrv-1.0.1/Makefile +=================================================================== +--- clalsadrv-1.0.1.orig/Makefile ++++ clalsadrv-1.0.1/Makefile +@@ -16,14 +16,13 @@ CLALSADRV_H = clalsadrv.h --#CLALSADRV_LIBDIR = /usr/local/lib --#CLALSADRV_INCDIR = /usr/local/include --CLALSADRV_LIBDIR = /usr/lib --CLALSADRV_INCDIR = /usr/include -+CLALSADRV_LIBDIR = ${DESTDIR}/usr/lib -+CLALSADRV_INCDIR = ${DESTDIR}/usr/include - CLALSADRV_SO = libclalsadrv.so - CLALSADRV_MAJ = $(CLALSADRV_SO).1 - CLALSADRV_MIN = $(CLALSADRV_MAJ).0.1 -@@ -20,8 +18,8 @@ + $(CLALSADRV_MIN): $(CLALSADRV_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLALSADRV_MAJ) -o $(CLALSADRV_MIN) $(CLALSADRV_O) $(CLALSADRV_DEP) install: $(CLALSADRV_MIN) - cp -f $(CLALSADRV_H) $(CLALSADRV_INCDIR) - cp -f $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR) -+ install -D $(CLALSADRV_H) $(CLALSADRV_INCDIR)/$(CLALSADRV_H) -+ install -D $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)/$(CLALSADRV_MIN) - /sbin/ldconfig -n $(CLALSADRV_LIBDIR) - ln -sf $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)/$(CLALSADRV_SO) +- /sbin/ldconfig -n $(CLALSADRV_LIBDIR) +- ln -sf $(CLALSADRV_MIN) $(CLALSADRV_LIBDIR)/$(CLALSADRV_SO) ++ install -D $(CLALSADRV_H) $(DESTDIR)$(CLALSADRV_INCDIR)/$(CLALSADRV_H) ++ install -D $(CLALSADRV_MIN) $(DESTDIR)$(CLALSADRV_LIBDIR)/$(CLALSADRV_MIN) ++ ln -sf $(CLALSADRV_MIN) $(DESTDIR)$(CLALSADRV_LIBDIR)/$(CLALSADRV_SO) + + loopback: loopback.cc diff --git a/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild b/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild index 6b42dcd74348..ab2c9350fa54 100644 --- a/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild +++ b/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild @@ -1,23 +1,24 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild,v 1.9 2005/09/04 12:22:36 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libclalsadrv/libclalsadrv-1.0.1.ebuild,v 1.10 2006/03/06 14:46:58 flameeyes Exp $ IUSE="" -inherit eutils +inherit eutils multilib toolchain-funcs -S="${WORKDIR}/clalsadrv-${PV}" +MY_P="clalsadrv-${PV}" + +S="${WORKDIR}/${MY_P}" DESCRIPTION="An audio library by Fons Adriaensen <fons.adriaensen@skynet.be>" HOMEPAGE="http://users.skynet.be/solaris/linuxaudio" -SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/clalsadrv-${PV}.tar.bz2" +SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 sparc x86 ~ppc" -DEPEND="virtual/libc - >=media-libs/libclthreads-1.0.0 +DEPEND=">=media-libs/libclthreads-1.0.0 media-libs/alsa-lib" src_unpack() { @@ -27,10 +28,11 @@ src_unpack() { } src_compile() { - emake || die + tc-export CC CXX + emake || die "emake failed" } src_install() { - make DESTDIR="${D}" install || die "make install failed" + make CLALSADRV_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS } diff --git a/media-libs/libclalsadrv/metadata.xml b/media-libs/libclalsadrv/metadata.xml index 0edf584ed3a0..d8913263a79e 100644 --- a/media-libs/libclalsadrv/metadata.xml +++ b/media-libs/libclalsadrv/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>sound</herd> - <maintainer> - <email>sound@gentoo.org</email> - </maintainer> +<herd>sound</herd> +<maintainer> +<email>sound@gentoo.org</email> +</maintainer> </pkgmetadata> |