diff options
| -rw-r--r-- | media-sound/mpg123/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/mpg123/Manifest | 21 | ||||
| -rw-r--r-- | media-sound/mpg123/files/mpg123-respectusercflags.patch | 29 | ||||
| -rw-r--r-- | media-sound/mpg123/mpg123-0.59s-r10.ebuild | 5 |
4 files changed, 50 insertions, 12 deletions
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog index 212bdc1676f1..4962061c3a18 100644 --- a/media-sound/mpg123/ChangeLog +++ b/media-sound/mpg123/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mpg123 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.90 2005/09/02 12:55:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.91 2005/10/17 11:53:51 flameeyes Exp $ + + 17 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/mpg123-respectusercflags.patch, mpg123-0.59s-r10.ebuild: + Added patch to respect user-defined CFLAGS on amd64. Patch by Simon + Strandman in bug #87539. 02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> mpg123-0.59s-r8.ebuild, mpg123-0.59s-r9.ebuild, mpg123-0.59s-r10.ebuild: diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index 43582ccf03af..6ade7041fe37 100644 --- a/media-sound/mpg123/Manifest +++ b/media-sound/mpg123/Manifest @@ -1,20 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 e54064d490f53255a6f0ab99bbace5c8 ChangeLog 13856 -MD5 f0035c0fdcb5496afb587c41ea83c1a3 mpg123-0.59s-r8.ebuild 2875 -MD5 05675bb6e6c4d77cf959c767dfa1eaf9 mpg123-0.59s-r9.ebuild 3101 -MD5 354bd2e62bcf98d94e96b67e79e50640 mpg123-0.59s-r10.ebuild 3279 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r9 141 -MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r10 141 +MD5 dbf0274154aae330c7a1c46aa462beda ChangeLog 14073 MD5 a147137fdcd756dd021b9807a2fae2b6 files/0.59s-set-terminal-line-settings-once.patch 767 +MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r10 141 MD5 12a16d9aafab05a0ad9eace12cf3596a files/digest-mpg123-0.59s-r8 141 +MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r9 141 MD5 154058014fa42867a57faa57b857521a files/mpg123-osx.diff 11227 +MD5 083de56193d644c972c2cf5034aaa100 files/mpg123-respectusercflags.patch 854 +MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 +MD5 c7bd4d6de9a930e986e8c396f2459e04 mpg123-0.59s-r10.ebuild 3384 +MD5 f0035c0fdcb5496afb587c41ea83c1a3 mpg123-0.59s-r8.ebuild 2875 +MD5 05675bb6e6c4d77cf959c767dfa1eaf9 mpg123-0.59s-r9.ebuild 3101 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDGEvrj5H05b2HAEkRArKgAJ0ZLin9Z5vMIdgu9VYu6t6oF/IWlACfe7og -0obgfqd/SDuXUQQ0eUKBvIY= -=0ziw +iD8DBQFDU5Dmj5H05b2HAEkRAsmnAJ9bizjoSwQidexc00WvniF/DpSb+wCdFKbB +DiJ68kET8anFRNLMAUW2MpI= +=eq1X -----END PGP SIGNATURE----- diff --git a/media-sound/mpg123/files/mpg123-respectusercflags.patch b/media-sound/mpg123/files/mpg123-respectusercflags.patch new file mode 100644 index 000000000000..6d3c1edf1779 --- /dev/null +++ b/media-sound/mpg123/files/mpg123-respectusercflags.patch @@ -0,0 +1,29 @@ +--- Makefile 2005-04-01 13:35:32.000000000 +0200 ++++ Makefile.fix 2005-04-01 13:35:45.000000000 +0200 +@@ -330,7 +330,7 @@ + linux-x86_64: + $(MAKE) LDFLAGS= \ + OBJECTS='decode.o dct64.o audio_oss.o' \ +- CFLAGS=' -Wall -DLINUX -DOSS -DUSE_MMAP \ ++ CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \ + $(RPM_OPT_FLAGS)' \ + mpg123-make + +@@ -338,7 +338,7 @@ + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lesd -laudiofile' \ + OBJECTS='decode.o dct64.o audio_esd.o' \ +- CFLAGS=' -Wall -DLINUX -DOSS -DUSE_MMAP \ ++ CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \ + $(RPM_OPT_FLAGS)' \ + mpg123-make + +@@ -346,7 +346,7 @@ + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lasound' \ + OBJECTS='decode.o dct64.o audio_alsa.o' \ +- CFLAGS=' -Wall -DLINUX -DOSS -DUSE_MMAP \ ++ CFLAGS='$(CFLAGS) -Wall -DLINUX -DOSS -DUSE_MMAP \ + $(RPM_OPT_FLAGS)' \ + mpg123-make + diff --git a/media-sound/mpg123/mpg123-0.59s-r10.ebuild b/media-sound/mpg123/mpg123-0.59s-r10.ebuild index 2f26d0310265..163347e3600d 100644 --- a/media-sound/mpg123/mpg123-0.59s-r10.ebuild +++ b/media-sound/mpg123/mpg123-0.59s-r10.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/mpg123/mpg123-0.59s-r10.ebuild,v 1.2 2005/09/02 12:55:47 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.3 2005/10/17 11:53:51 flameeyes Exp $ inherit eutils @@ -42,6 +42,9 @@ src_unpack() { # Bug #70592; terminal line settings should only be set once; not everytime a new song starts epatch ${FILESDIR}/${PV}-set-terminal-line-settings-once.patch + # Bug #87539; user CFLAGS are not respected on amd64 + epatch ${FILESDIR}/${PN}-respectusercflags.patch + if use ppc-macos; then einfo "Patching for OSX build" |