Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libclthreads/ChangeLog10
-rw-r--r--media-libs/libclthreads/files/digest-libclthreads-1.0.01
-rw-r--r--media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch33
-rw-r--r--media-libs/libclthreads/libclthreads-1.0.0.ebuild28
-rw-r--r--media-libs/libclthreads/libclthreads-1.0.2.ebuild22
-rw-r--r--media-libs/libclthreads/metadata.xml8
6 files changed, 41 insertions, 61 deletions
diff --git a/media-libs/libclthreads/ChangeLog b/media-libs/libclthreads/ChangeLog
index 0a3b5295b8d7..cdf1e7f11628 100644
--- a/media-libs/libclthreads/ChangeLog
+++ b/media-libs/libclthreads/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/libclthreads
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/ChangeLog,v 1.7 2005/07/25 12:41:22 dholm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/ChangeLog,v 1.8 2006/03/06 14:41:16 flameeyes Exp $
+
+ 06 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
+ files/libclthreads-1.0.2-makefile.patch, metadata.xml,
+ -libclthreads-1.0.0.ebuild, libclthreads-1.0.2.ebuild:
+ Respect multilib libdir, don't run ldconfig, use CXX to build, drop
+ virtual/libc dependency.
25 Jul 2005; David Holm <dholm@gentoo.org> libclthreads-1.0.2.ebuild:
Added to ~ppc.
diff --git a/media-libs/libclthreads/files/digest-libclthreads-1.0.0 b/media-libs/libclthreads/files/digest-libclthreads-1.0.0
deleted file mode 100644
index 9761c6f73dd7..000000000000
--- a/media-libs/libclthreads/files/digest-libclthreads-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9c9ac7061d5cf99a90ec1b43523710eb clthreads-1.0.0.tar.bz2 5661
diff --git a/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch b/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch
index 4a6eb6e606ad..f4604f34b300 100644
--- a/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch
+++ b/media-libs/libclthreads/files/libclthreads-1.0.2-makefile.patch
@@ -1,26 +1,23 @@
---- clthreads-1.0.0.orig/Makefile 2004-08-24 00:33:18.572183288 +0200
-+++ clthreads-1.0.0/Makefile 2004-08-24 00:35:13.527707392 +0200
-@@ -3,10 +3,8 @@
- LDLIBS +=
+Index: clthreads-1.0.2/Makefile
+===================================================================
+--- clthreads-1.0.2.orig/Makefile
++++ clthreads-1.0.2/Makefile
+@@ -16,14 +16,13 @@ CLTHREADS_H = clthreads.h
--#CLTHREADS_LIBDIR = /usr/local/lib
--#CLTHREADS_INCDIR = /usr/local/include
--CLTHREADS_LIBDIR = /usr/lib
--CLTHREADS_INCDIR = /usr/include
-+CLTHREADS_LIBDIR = ${DESTDIR}/usr/lib
-+CLTHREADS_INCDIR = ${DESTDIR}/usr/include
- CLTHREADS_SO = libclthreads.so
- CLTHREADS_MAJ = $(CLTHREADS_SO).1
- CLTHREADS_MIN = $(CLTHREADS_MAJ).0.0
-@@ -20,8 +18,8 @@
+ $(CLTHREADS_MIN): $(CLTHREADS_O)
+- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP)
install: $(CLTHREADS_MIN)
- cp -f $(CLTHREADS_H) $(CLTHREADS_INCDIR)
- cp -f $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)
-+ install -D $(CLTHREADS_H) $(CLTHREADS_INCDIR)/$(CLTHREADS_H)
-+ install -D $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)/$(CLTHREADS_MIN)
- /sbin/ldconfig -n $(CLTHREADS_LIBDIR)
- ln -sf $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
+- /sbin/ldconfig -n $(CLTHREADS_LIBDIR)
+- ln -sf $(CLTHREADS_MIN) $(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
++ install -D $(CLTHREADS_H) $(DESTDIR)$(CLTHREADS_INCDIR)/$(CLTHREADS_H)
++ install -D $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_MIN)
++ ln -sf $(CLTHREADS_MIN) $(DESTDIR)$(CLTHREADS_LIBDIR)/$(CLTHREADS_SO)
+
+ clean:
diff --git a/media-libs/libclthreads/libclthreads-1.0.0.ebuild b/media-libs/libclthreads/libclthreads-1.0.0.ebuild
deleted file mode 100644
index c0b03d031668..000000000000
--- a/media-libs/libclthreads/libclthreads-1.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/libclthreads-1.0.0.ebuild,v 1.4 2004/11/26 13:59:43 josejx Exp $
-
-IUSE=""
-
-inherit eutils
-
-S="${WORKDIR}/clthreads-${PV}"
-
-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/clthreads-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc x86 ~ppc"
-
-DEPEND="virtual/libc"
-
-src_compile() {
- epatch "${FILESDIR}/${P}-makefile.patch"
- emake || die "emake failed"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/media-libs/libclthreads/libclthreads-1.0.2.ebuild b/media-libs/libclthreads/libclthreads-1.0.2.ebuild
index 0710117e74d6..78c6cb46ccff 100644
--- a/media-libs/libclthreads/libclthreads-1.0.2.ebuild
+++ b/media-libs/libclthreads/libclthreads-1.0.2.ebuild
@@ -1,28 +1,34 @@
-# 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/libclthreads/libclthreads-1.0.2.ebuild,v 1.3 2005/07/25 12:41:22 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libclthreads/libclthreads-1.0.2.ebuild,v 1.4 2006/03/06 14:41:16 flameeyes Exp $
IUSE=""
-inherit eutils
+inherit eutils multilib toolchain-funcs
-S="${WORKDIR}/clthreads-${PV}"
+MY_P="clthreads-${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/clthreads-${PV}.tar.bz2"
+SRC_URI="http://users.skynet.be/solaris/linuxaudio/downloads/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~ppc sparc x86"
-DEPEND="virtual/libc"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch "${FILESDIR}/${P}-makefile.patch"
+}
src_compile() {
- epatch "${FILESDIR}/${P}-makefile.patch"
+ tc-export CC CXX
emake || die "emake failed"
}
src_install() {
- make DESTDIR="${D}" install || die "make install failed"
+ make CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" install || die "make install failed"
}
diff --git a/media-libs/libclthreads/metadata.xml b/media-libs/libclthreads/metadata.xml
index 0edf584ed3a0..d8913263a79e 100644
--- a/media-libs/libclthreads/metadata.xml
+++ b/media-libs/libclthreads/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>