From b5363ddf74b8a065d28bb26281f230bd12e26765 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Tue, 4 Oct 2005 09:50:30 +0000 Subject: [PATCH] Fixed patch for +esd/-esd handling. See bug #104147. Package-Manager: portage-2.0.53_rc3 --- media-sound/musepack-tools/ChangeLog | 6 +++- media-sound/musepack-tools/Manifest | 34 +++++++++---------- .../files/musepack-tools-1.15v-Makefile.patch | 9 ----- .../musepack-tools-1.15v.ebuild | 10 +++--- 4 files changed, 28 insertions(+), 31 deletions(-) diff --git a/media-sound/musepack-tools/ChangeLog b/media-sound/musepack-tools/ChangeLog index 9a30946bc7dc..eec81e00604a 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.25 2005/09/04 10:39:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/ChangeLog,v 1.26 2005/10/04 09:50:30 flameeyes Exp $ + + 04 Oct 2005; Diego Pettenò + files/musepack-tools-1.15v-Makefile.patch, musepack-tools-1.15v.ebuild: + Fixed patch for +esd/-esd handling. See bug #104147. 04 Sep 2005; Diego Pettenò musepack-tools-1.15s-r2.ebuild, musepack-tools-1.15t.ebuild, diff --git a/media-sound/musepack-tools/Manifest b/media-sound/musepack-tools/Manifest index bf9552280986..3c1ab464dd72 100644 --- a/media-sound/musepack-tools/Manifest +++ b/media-sound/musepack-tools/Manifest @@ -1,28 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 c6772fd586092e9a311f2b643eafbf3f musepack-tools-1.15u.ebuild 1506 -MD5 c6851e379402a0001080e9507c4f24b0 ChangeLog 4858 -MD5 2c6f59eed8f1893c3be3699b0d7e19e9 musepack-tools-1.15t.ebuild 1427 -MD5 1bae02184cdfee099296b98e4f09a0ba musepack-tools-1.15s-r2.ebuild 1588 -MD5 faa1d4581f08bf25da8b1b8288048871 musepack-tools-1.15v.ebuild 1499 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750 -MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893 -MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288 -MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748 -MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750 +MD5 9bf92d69bc1243f335bbfd62213f1320 ChangeLog 5041 +MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68 +MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69 MD5 ed58f526be4bbd9e940db917d7821d74 files/digest-musepack-tools-1.15u 69 -MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15v-Makefile.patch 750 MD5 83959d8ebd21d40ec956ac942fa6b9f1 files/digest-musepack-tools-1.15v 69 +MD5 e2b1a42af0b2661239d43baa7204cdf7 files/musepack-tools-1.15r-r1-Makefile.patch 3748 +MD5 cfc4d714a4dc0419ccc7091a89543824 files/musepack-tools-1.15s-Makefile.patch 2893 +MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15t-Makefile.patch 750 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15t-gcc4.patch 288 +MD5 9765f2db5f70d381035134cc86fcf06b files/musepack-tools-1.15u-Makefile.patch 750 +MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15u-gcc4.patch 288 +MD5 22a0f1804346128859f9a99ff9305cf4 files/musepack-tools-1.15v-Makefile.patch 572 MD5 ede8b7ca4902507ed93207bf753b9402 files/musepack-tools-1.15v-gcc4.patch 288 -MD5 b81fa7225bc172daee43e316eba11fa0 files/digest-musepack-tools-1.15s-r2 68 -MD5 d81d9df24aeee0d861392505d4941067 files/digest-musepack-tools-1.15t 69 +MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 +MD5 1bae02184cdfee099296b98e4f09a0ba musepack-tools-1.15s-r2.ebuild 1588 +MD5 2c6f59eed8f1893c3be3699b0d7e19e9 musepack-tools-1.15t.ebuild 1427 +MD5 c6772fd586092e9a311f2b643eafbf3f musepack-tools-1.15u.ebuild 1506 +MD5 7973499cfb5a0111bb91c9e2255e09a3 musepack-tools-1.15v.ebuild 1494 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDGs8Gj5H05b2HAEkRAn7FAJ9f+ts93cNU6GznlPNxl9JIy6S0kACgkySO -mQfciiZn9hAHcuKTgehvLE8= -=wnmg +iD8DBQFDQlCsj5H05b2HAEkRArCLAJ9vmE4YpOQ4vbWywnZw1aG+HhYIOQCgoExG +AzZ/UgKUeFPAHNNsOoBB/F4= +=4C3f -----END PGP SIGNATURE----- diff --git a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch index 4011fdc02959..b6e1d16c5293 100644 --- a/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch +++ b/media-sound/musepack-tools/files/musepack-tools-1.15v-Makefile.patch @@ -9,15 +9,6 @@ endif ifdef MINGW -@@ -97,7 +97,7 @@ - # Name of libraries you need for linking - - ifndef MINGW --LDADD = -lm -+LDADD = `esd-config --libs` - #LDADD += -lesd - else - LDADD = -lwinmm -lws2_32 @@ -176,9 +176,9 @@ -fno-finite-math-only -fno-unsafe-math-optimizations endif diff --git a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild index 927897a04446..8b170f1f8061 100644 --- a/media-sound/musepack-tools/musepack-tools-1.15v.ebuild +++ b/media-sound/musepack-tools/musepack-tools-1.15v.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.4 2005/09/04 10:39:42 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/musepack-tools/musepack-tools-1.15v.ebuild,v 1.5 2005/10/04 09:50:30 flameeyes Exp $ IUSE="static 16bit esd" @@ -34,9 +34,9 @@ src_unpack() { if ! use esd ; then sed -i -e 's/#define USE_ESD_AUDIO/#undef USE_ESD_AUDIO/' mpp.h - sed -i -e 's:esd-config:true:' Makefile else - sed -i -e 's/#LDADD += -lesd/LDADD += -lesd/' Makefile + sed -i -e 's/^LDADD = -lm$/LDADD = $(shell esd-config --libs)/' \ + Makefile fi if ! use x86 ; then @@ -50,7 +50,9 @@ src_compile() { filter-flags "-fprefetch-loop-arrays" filter-flags "-mfpmath=sse" "-mfpmath=sse,387" use static && export BLD_STATIC=1 - ARCH= emake LDADD=-lm mppenc mppdec replaygain || die + + append-flags -I${S} + ARCH= emake mppenc mppdec replaygain || die } src_install() { -- 2.26.2