summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-12 22:43:21 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-05-12 22:43:21 +0000
commit217d434036c55bd53168e9a5b0b10d8ec7d8870a (patch)
tree9cccf91a1a7919897f34f45801c56004ffd9fa27 /media-sound/musepack-tools
parentAdd ~x86-fbsd keyword. (diff)
downloadgentoo-2-217d434036c55bd53168e9a5b0b10d8ec7d8870a.tar.gz
gentoo-2-217d434036c55bd53168e9a5b0b10d8ec7d8870a.tar.bz2
gentoo-2-217d434036c55bd53168e9a5b0b10d8ec7d8870a.zip
Add ~x86-fbsd keyword with a patch to build on FreeBSD.
(Portage version: 2.1_pre10-r5)
Diffstat (limited to 'media-sound/musepack-tools')
-rw-r--r--media-sound/musepack-tools/ChangeLog6
-rw-r--r--media-sound/musepack-tools/files/digest-musepack-tools-1.15v2
-rw-r--r--media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch13
-rw-r--r--media-sound/musepack-tools/musepack-tools-1.15v.ebuild12
4 files changed, 27 insertions, 6 deletions
diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog
index be4538cf6bfa..520ccacdb556 100644
--- a/media-sound/musepack-tools/ChangeLog
+++ b/media-sound/musepack-tools/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/musepack-tools
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.28 2006/04/18 17:46:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.29 2006/05/12 22:43:21 flameeyes Exp $
+
+ 12 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+ +files/musepack-tools-1.15v-fbsd.patch, musepack-tools-1.15v.ebuild:
+ Add ~x86-fbsd keyword with a patch to build on FreeBSD.
18 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+files/musepack-tools-1.15v-execstack.patch, musepack-tools-1.15v.ebuild:
diff --git a/media-sound/musepack-tools/files/digest-musepack-tools-1.15v b/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
index f1d2d76373a6..57f53e19260c 100644
--- a/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
+++ b/media-sound/musepack-tools/files/digest-musepack-tools-1.15v
@@ -1 +1,3 @@
MD5 eb3e6b64b1f7d68aaeb04e39936d87fb mpcsv7-src-1.15v.tar.bz2 416868
+RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 mpcsv7-src-1.15v.tar.bz2 416868
+SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd mpcsv7-src-1.15v.tar.bz2 416868
diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
new file mode 100644
index 000000000000..1171b5785304
--- /dev/null
+++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-fbsd.patch
@@ -0,0 +1,13 @@
+Index: sv7/mppdec.h
+===================================================================
+--- sv7.orig/mppdec.h
++++ sv7/mppdec.h
+@@ -160,7 +160,7 @@
+ # include <sys/time.h>
+ # if defined __linux__ // the standard is that this file is stored somewhere on the hard disk
+ # include <linux/soundcard.h>
+-# elif defined __bsdi__
++# elif defined __bsdi__ || __FreeBSD__ >= 5
+ # include <sys/soundcard.h>
+ # elif defined __FreeBSD__
+ # include <machine/soundcard.h>
diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
index 3897f2377947..df7d070b9946 100644
--- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
+++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.7 2006/04/18 17:46:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.8 2006/05/12 22:43:21 flameeyes Exp $
IUSE="static 16bit esd"
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic flag-o-matic
S="${WORKDIR}/sv7"
@@ -14,13 +14,14 @@ SRC_URI="http://files.musepack.net/source/mpcsv7-src-${PV}.tar.bz2"
SLOT="0"
LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 x86 ~x86-fbsd"
RDEPEND="esd? ( media-sound/esound )
media-libs/id3lib"
DEPEND="${RDEPEND}
x86? ( dev-lang/nasm )
+ x86-fbsd? ( dev-lang/nasm )
amd64? ( dev-lang/nasm )"
src_unpack() {
@@ -39,7 +40,7 @@ src_unpack() {
Makefile
fi
- if ! use x86 ; then
+ if [[ $(tc-arch) != "x86" ]] ; then
sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h
fi
@@ -49,6 +50,7 @@ src_unpack() {
sed -i -e 's/$(LDADD) &> $(LOGFILE)/$(LDADD)/' Makefile
epatch "${FILESDIR}/${P}-execstack.patch"
+ epatch "${FILESDIR}/${P}-fbsd.patch"
}
src_compile() {
@@ -58,7 +60,7 @@ src_compile() {
append-flags -I${S}
- ARCH= emake mppenc mppdec replaygain || die
+ ARCH= emake CC="$(tc-getCC)" mppenc mppdec replaygain || die
}
src_install() {