@@ -2,6 +2,9 @@ # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.33 2007/05/14 21:21:37 beandog Exp $ + 08 Dec 2008; Daniel Robbins <drobbins@funtoo.org> musepack-tools-1.15v-r1.ebuild: + fixing for amd64 as per bug 188160. + 14 May 2007; Steve Dibb <beandog@gentoo.org> musepack-tools-1.15v-r1.ebuild: Only patch Makefile if use esd, bug 178569 media-sound/musepack-tools/ChangeLog @@ -4,7 +4,7 @@ AUX musepack-tools-1.15v-execstack.patch 1256 RMD160 a4d15a6640db2dedf2790e398c2 AUX musepack-tools-1.15v-fbsd.patch 469 RMD160 e969a4896ec14ca7a02a8b36f616f00977e0bd72 SHA1 0ce936e217d51a878450c7570905a8ca43324d72 SHA256 71b17ca4f444ca08685f3e0838b86b1c252cf6374a054884c6cc13c9809200e3 AUX musepack-tools-1.15v-gcc4.patch 288 RMD160 6ab9a05d263c628e138f98a9ad72532f7a472543 SHA1 9232afeeab2e8f9ae5175275af3650ff7f71f048 SHA256 9e52b4d1b93538e6525d63aae2ea30fcad8e046f276419b4a2e0f30d714282ff DIST mpcsv7-src-1.15v.tar.bz2 416868 RMD160 11b28faab8e23b22366ddd6a7b93aace257838e7 SHA1 4fb6b1a45858638eb6b854b910038baa1b410146 SHA256 ca602ea9d41038bdf7c04371d6f12d0eca5b71c29433633732d607e1b410a4bd -EBUILD musepack-tools-1.15v-r1.ebuild 1868 RMD160 c527450f0a392d029bd40c6272225b50b88bd89a SHA1 83cc68c26b1d48f8e381a51a27937cfa85935722 SHA256 cd6776ecc39d8ec6f95f0f59d823061ae1ac0c8b9e9d9fccaa17ae8e14ae6857 +EBUILD musepack-tools-1.15v-r1.ebuild 1998 RMD160 8c94cb3c8d0f6e05eaf9ff22fb4489a52fa4d5db SHA1 6c6d8e3c754774a7e11704b7646edb0a9ce71a32 SHA256 ce10a7f0a7440fb60b808fcc08c7c79150fa2cdae1112415c8c1acd89414ab4c EBUILD musepack-tools-1.15v.ebuild 1809 RMD160 69820ea8b2700c94b33ad4b2c43d60e43cf5a579 SHA1 bb1ef8e143dec042fa0b32caa50e535d91092ac6 SHA256 5495da2fdef82ff7eabb5ac30eefa2a1d72a41b0e44444a80880ba6e93934431 -MISC ChangeLog 6611 RMD160 8f07204deac4810b7d8074f511a9d4a9b6fb29c8 SHA1 4a5e7b8a3fc950f8f25d82a9382d7dbb4855a496 SHA256 347a3495623a2955709c1352a110e5450ed4245c2eef0ed3677cb7a3e6f33662 +MISC ChangeLog 6734 RMD160 ef7976f9505cd2f886a52282b9fffed974046761 SHA1 389a292abe37bd07125288fe7db9340719745fab SHA256 1a6df4241be170504736ea97c2ff58ad2c5aea9d788f813d4d5e0d9a6034ca01 MISC metadata.xml 269 RMD160 62382443b3292829e595043c71f5bd6d4402ad26 SHA1 22bb640da7fa718622c95863ce62f2e67a49191d SHA256 cac43becfa1a17ab8a8fc4250f7c67f7400b00d0651c3c75698ca48f040694bd media-sound/musepack-tools/Manifest @@ -23,7 +23,7 @@ RDEPEND="esd? ( media-sound/esound ) DEPEND="${RDEPEND} x86? ( dev-lang/nasm ) x86-fbsd? ( dev-lang/nasm ) - amd64? ( dev-lang/nasm )" + amd64? ( >=dev-lang/nasm-2.0 )" src_unpack() { unpack ${A} @@ -46,6 +46,10 @@ src_unpack() { sed -i 's/#define USE_ASM/#undef USE_ASM/' mpp.h fi + if [[ "$(tc-arch)" == "amd64" ]] ; then + sed -i 's/-f elf$/-f elf64/' Makefile + fi + use 16bit && sed -i 's|//#define MAKE_16BIT|#define MAKE_16BIT|' mpp.h # Bug #109699; console redirection to /dev/tty makes no sense @@ -62,6 +66,8 @@ src_compile() { append-flags "-I${S}" + emake CC="$(tc-getCC)" clean || die + ARCH= emake CC="$(tc-getCC)" mppenc mppdec replaygain || die } media-sound/musepack-tools/musepack-tools-1.15v-r1.ebuild 835160587a326e30deb5a1edde92f59c2caf1065 Daniel Robbins drobbins@funtoo.org http://github.com/funtoo/portage/commit/8c111eead306d421341e9aa9c55f0b8024ed418d 8c111eead306d421341e9aa9c55f0b8024ed418d 2008-12-08T15:29:44-08:00 2008-12-08T15:29:44-08:00 fix for gentoo bug 188160 f978d1fcdd8568d55c7773939ad24efacfff5f65 Daniel Robbins drobbins@funtoo.org