diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-11 12:30:33 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-05-11 12:30:33 +0000 |
commit | 6d246c5cec38693e555ccc839a30a972ff0c713b (patch) | |
tree | 03809dbe5a0dd8a2204104a3a060fd1a386240fb /media-sound | |
parent | ppc stable, bug #132838 (diff) | |
download | historical-6d246c5cec38693e555ccc839a30a972ff0c713b.tar.gz historical-6d246c5cec38693e555ccc839a30a972ff0c713b.tar.bz2 historical-6d246c5cec38693e555ccc839a30a972ff0c713b.zip |
Add patch from Guilherme Amadio <amadio@cns.s.u-tokyo.ac.jp> to build with gmake 3.81. Also give the right compiler to make process.
Package-Manager: portage-2.1_pre10-r5
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/mpg123/ChangeLog | 7 | ||||
-rw-r--r-- | media-sound/mpg123/Manifest | 51 | ||||
-rw-r--r-- | media-sound/mpg123/files/digest-mpg123-0.59s-r10 | 6 | ||||
-rw-r--r-- | media-sound/mpg123/files/digest-mpg123-0.59s-r9 | 6 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-0.59s-gmake-3.81.patch | 196 | ||||
-rw-r--r-- | media-sound/mpg123/mpg123-0.59s-r10.ebuild | 11 |
6 files changed, 264 insertions, 13 deletions
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog index 08aef2841a34..2d3ca1725c2a 100644 --- a/media-sound/mpg123/ChangeLog +++ b/media-sound/mpg123/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mpg123 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.93 2006/05/08 04:31:16 tcort Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.94 2006/05/11 12:30:33 flameeyes Exp $ + + 11 May 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/mpg123-0.59s-gmake-3.81.patch, mpg123-0.59s-r10.ebuild: + Add patch from Guilherme Amadio <amadio@cns.s.u-tokyo.ac.jp> to build with + gmake 3.81. Also give the right compiler to make process. 08 May 2006; <tcort@gentoo.org> mpg123-0.59s-r9.ebuild: Removed COPYING from dodoc. diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index 3ec20c16edab..d8c7ac9f933e 100644 --- a/media-sound/mpg123/Manifest +++ b/media-sound/mpg123/Manifest @@ -1,9 +1,50 @@ -MD5 693de3a49ed6cca8a9af23f0920cfb38 ChangeLog 14417 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 0.59s-set-terminal-line-settings-once.patch 767 RMD160 7fe4d8c799ff633511b825d6cf624aba73900efa SHA1 c53183f5581e20cb267b77fe0e2f9da9db495051 SHA256 b4c350475b6392a6fdc1b54141665112c829e02111e3080eb0c49f4edaf7a412 size 767 MD5 a147137fdcd756dd021b9807a2fae2b6 files/0.59s-set-terminal-line-settings-once.patch 767 -MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r10 141 -MD5 31d9204617f76bd0b55e6f1c7242886a files/digest-mpg123-0.59s-r9 141 +RMD160 7fe4d8c799ff633511b825d6cf624aba73900efa files/0.59s-set-terminal-line-settings-once.patch 767 +SHA256 b4c350475b6392a6fdc1b54141665112c829e02111e3080eb0c49f4edaf7a412 files/0.59s-set-terminal-line-settings-once.patch 767 +AUX mpg123-0.59s-gmake-3.81.patch 7489 RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 SHA1 e3e6604a85202bf572d317332ad8c3f8071d064d SHA256 cadb1ad75b36efd853ad0e1637db3d88ec37b6bb4e1726e025e21676c7507438 size 7489 +MD5 1afa21b956e382825339b141255014eb files/mpg123-0.59s-gmake-3.81.patch 7489 +RMD160 698ffe24b926ffb6de7afe50b0e2ba8d7928f4d8 files/mpg123-0.59s-gmake-3.81.patch 7489 +SHA256 cadb1ad75b36efd853ad0e1637db3d88ec37b6bb4e1726e025e21676c7507438 files/mpg123-0.59s-gmake-3.81.patch 7489 +AUX mpg123-osx.diff 11227 RMD160 572614f922a288d68f56b66a20d3a9264c92c895 SHA1 11d7c7df1624f35bb17a7d044c21f4924eb316e7 SHA256 2941998aeb4c77d9c7633c6fcf01d37cb1b019f1b3d4dabadfceb152f97d11b8 size 11227 MD5 154058014fa42867a57faa57b857521a files/mpg123-osx.diff 11227 +RMD160 572614f922a288d68f56b66a20d3a9264c92c895 files/mpg123-osx.diff 11227 +SHA256 2941998aeb4c77d9c7633c6fcf01d37cb1b019f1b3d4dabadfceb152f97d11b8 files/mpg123-osx.diff 11227 +AUX mpg123-respectusercflags.patch 854 RMD160 da65d77e7cfa8822c86c04fdcbf0b0024293be48 SHA1 d9edc5cafcd27b81b110d958881666ab5e8f5b8c SHA256 4d5fc7650687f3c7aeb3e82622bde477f24412d914e5ceb30000725d654185dd size 854 MD5 083de56193d644c972c2cf5034aaa100 files/mpg123-respectusercflags.patch 854 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 c924b307abfa6ad61afe07867d9c2fb1 mpg123-0.59s-r10.ebuild 3343 +RMD160 da65d77e7cfa8822c86c04fdcbf0b0024293be48 files/mpg123-respectusercflags.patch 854 +SHA256 4d5fc7650687f3c7aeb3e82622bde477f24412d914e5ceb30000725d654185dd files/mpg123-respectusercflags.patch 854 +DIST mpg123-0.59s-gentoo-1.5.tar.bz2 7207 RMD160 75bc91d354e665c424afa1a3beab202f7a60441c SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116 size 7207 +DIST mpg123-pre0.59s.tar.gz 244899 RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a size 244899 +EBUILD mpg123-0.59s-r10.ebuild 3408 RMD160 d5d5e10ca30b2ca204d5ea12b2794f6144bbb753 SHA1 2c1746232dd156979deea107566393f8eaa62a97 SHA256 1fc09ee792d335ba266b559288ba4d3ddcedb8521cb85c1baaa30a75812d9e67 size 3408 +MD5 021b53f3a169597cb551aee8531ba66f mpg123-0.59s-r10.ebuild 3408 +RMD160 d5d5e10ca30b2ca204d5ea12b2794f6144bbb753 mpg123-0.59s-r10.ebuild 3408 +SHA256 1fc09ee792d335ba266b559288ba4d3ddcedb8521cb85c1baaa30a75812d9e67 mpg123-0.59s-r10.ebuild 3408 +EBUILD mpg123-0.59s-r9.ebuild 3048 RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 SHA1 3ff99127488fa3fbf4283d0d86d0651698d8c915 SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8 size 3048 MD5 15087675c7f8776c29b28cd3b42a9ed7 mpg123-0.59s-r9.ebuild 3048 +RMD160 47f49b6b4fb13f3a95dd3afd0ca7f082afdd8802 mpg123-0.59s-r9.ebuild 3048 +SHA256 d96b73bcd2a237e6bbd994add3a2aa180b30a6e6c0d36c6bdc4eb983cac7feb8 mpg123-0.59s-r9.ebuild 3048 +MISC ChangeLog 14677 RMD160 eadd4d04649e86aeff88559a67ecd41e6e885569 SHA1 712372dd48bb3a2fecd9595e4f185e59036bc070 SHA256 afb33fe3768cf111ab9e0f2e9d6aa104115e8073b9e257b099ce8ad2a3e7c838 size 14677 +MD5 ca44a53f4dcbc8881b4a478a5950853d ChangeLog 14677 +RMD160 eadd4d04649e86aeff88559a67ecd41e6e885569 ChangeLog 14677 +SHA256 afb33fe3768cf111ab9e0f2e9d6aa104115e8073b9e257b099ce8ad2a3e7c838 ChangeLog 14677 +MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b size 158 +MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 +RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 +SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158 +MD5 c220bf3c48aa40e0d5fb9d34736446cf files/digest-mpg123-0.59s-r10 515 +RMD160 7019be2a37f82fb900d0590729b9004b555aef74 files/digest-mpg123-0.59s-r10 515 +SHA256 1d2ba827a81e29b4a69c92e515b3e963829396119a8239da7e194204efb849ae files/digest-mpg123-0.59s-r10 515 +MD5 c220bf3c48aa40e0d5fb9d34736446cf files/digest-mpg123-0.59s-r9 515 +RMD160 7019be2a37f82fb900d0590729b9004b555aef74 files/digest-mpg123-0.59s-r9 515 +SHA256 1d2ba827a81e29b4a69c92e515b3e963829396119a8239da7e194204efb849ae files/digest-mpg123-0.59s-r9 515 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.3 (GNU/Linux) + +iD8DBQFEYy5vAiZjviIA2XgRApACAJ9D6c/rVQ5I+DI2YzwNb97Pvv5/UgCbBI0g +S1fMbgCt0S1m3bKocajy/CQ= +=kA/J +-----END PGP SIGNATURE----- diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r10 b/media-sound/mpg123/files/digest-mpg123-0.59s-r10 index 36b99f70c718..98b641bcd984 100644 --- a/media-sound/mpg123/files/digest-mpg123-0.59s-r10 +++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r10 @@ -1,2 +1,6 @@ -MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 MD5 e7ec309a2108b53f03ef1c32f1111538 mpg123-0.59s-gentoo-1.5.tar.bz2 7207 +RMD160 75bc91d354e665c424afa1a3beab202f7a60441c mpg123-0.59s-gentoo-1.5.tar.bz2 7207 +SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116 mpg123-0.59s-gentoo-1.5.tar.bz2 7207 +MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 +RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f mpg123-pre0.59s.tar.gz 244899 +SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a mpg123-pre0.59s.tar.gz 244899 diff --git a/media-sound/mpg123/files/digest-mpg123-0.59s-r9 b/media-sound/mpg123/files/digest-mpg123-0.59s-r9 index 36b99f70c718..98b641bcd984 100644 --- a/media-sound/mpg123/files/digest-mpg123-0.59s-r9 +++ b/media-sound/mpg123/files/digest-mpg123-0.59s-r9 @@ -1,2 +1,6 @@ -MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 MD5 e7ec309a2108b53f03ef1c32f1111538 mpg123-0.59s-gentoo-1.5.tar.bz2 7207 +RMD160 75bc91d354e665c424afa1a3beab202f7a60441c mpg123-0.59s-gentoo-1.5.tar.bz2 7207 +SHA256 2c2495ce9bd029b01d94c4c4ca930653d174d4a3e6d11488e2e669692835b116 mpg123-0.59s-gentoo-1.5.tar.bz2 7207 +MD5 a63675b0ea7990d4a7d7e7e14f23a3e4 mpg123-pre0.59s.tar.gz 244899 +RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f mpg123-pre0.59s.tar.gz 244899 +SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a mpg123-pre0.59s.tar.gz 244899 diff --git a/media-sound/mpg123/files/mpg123-0.59s-gmake-3.81.patch b/media-sound/mpg123/files/mpg123-0.59s-gmake-3.81.patch new file mode 100644 index 000000000000..5056a1ab5d80 --- /dev/null +++ b/media-sound/mpg123/files/mpg123-0.59s-gmake-3.81.patch @@ -0,0 +1,196 @@ +--- Makefile.old 2006-05-11 14:52:27.000000000 +0900 ++++ Makefile 2006-05-11 14:48:48.000000000 +0900 +@@ -167,10 +167,9 @@ + + linux: + $(MAKE) LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ +- audio_oss.o term.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o term.o' \ + CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \ +- -DOSS -DTERM_CONTROL\ ++ -DOSS -DTERM_CONTROL \ + -Wall \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math' \ +@@ -187,10 +186,9 @@ + + linux-pentium: + $(MAKE) LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ +- audio_oss.o term.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o term.o' \ + CFLAGS='$(CFLAGS) -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \ +- -DOSS -DTERM_CONTROL\ ++ -DOSS -DTERM_CONTROL \ + -Wall -mpentium \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math' \ +@@ -198,10 +196,9 @@ + + linux-mmx: + $(MAKE) LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o \ +- audio_oss.o term.o' \ ++ OBJECTS='decode_i386.o dct64_MMX.o tabinit_MMX.o decode_MMX.o audio_oss.o term.o' \ + CFLAGS='-DUSE_MMX -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT \ +- -DLINUX -DOSS -DTERM_CONTROL\ ++ -DLINUX -DOSS -DTERM_CONTROL \ + -Wall \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math' \ +@@ -209,11 +206,9 @@ + + linux-3dnow: + $(MAKE) LDFLAGS= \ +- OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \ +- dct64_i386.o dct36_3dnow.o getcpuflags.o \ +- equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \ ++ OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o dct64_i386.o dct36_3dnow.o getcpuflags.o equalizer_3dnow.o decode_i586.o audio_oss.o term.o' \ + CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \ +- -DUSE_3DNOW -DOSS -DTERM_CONTROL\ ++ -DUSE_3DNOW -DOSS -DTERM_CONTROL \ + -Wall \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math' \ +@@ -222,11 +217,9 @@ + + linux-i486: + $(MAKE) LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ +- decode_i486.o audio_oss.o term.o \ +- dct64_i486-a.o dct64_i486-b.o ' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o decode_i486.o audio_oss.o term.o dct64_i486-a.o dct64_i486-b.o ' \ + CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DI486_OPT -DLINUX \ +- -DOSS -DTERM_CONTROL\ ++ -DOSS -DTERM_CONTROL \ + -Wall \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math' \ +@@ -235,8 +228,7 @@ + linux-esd: + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lesd -laudiofile' \ +- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ +- audio_esd.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_esd.o' \ + CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \ + -DOSS -DUSE_ESD \ + -Wall \ +@@ -248,10 +240,9 @@ + linux-alsa: + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lasound' \ +- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ +- audio_alsa.o term.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_alsa.o term.o' \ + CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \ +- -DALSA -DTERM_CONTROL\ ++ -DALSA -DTERM_CONTROL \ + -Wall \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math \ +@@ -261,11 +252,9 @@ + linux-3dnow-alsa: + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lasound' \ +- OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \ +- dct64_i386.o dct36_3dnow.o getcpuflags.o \ +- equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \ ++ OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o dct64_i386.o dct36_3dnow.o getcpuflags.o equalizer_3dnow.o decode_i586.o audio_alsa.o term.o' \ + CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \ +- -DUSE_3DNOW -DALSA -DTERM_CONTROL\ ++ -DUSE_3DNOW -DALSA -DTERM_CONTROL \ + -Wall \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math' \ +@@ -274,9 +263,7 @@ + linux-3dnow-esd: + $(MAKE) LDFLAGS= \ + AUDIO_LIB='-lesd -laudiofile' \ +- OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o \ +- dct64_i386.o dct36_3dnow.o getcpuflags.o \ +- equalizer_3dnow.o decode_i586.o audio_esd.o' \ ++ OBJECTS='decode_i386.o decode_3dnow.o dct64_3dnow.o dct64_i386.o dct36_3dnow.o getcpuflags.o equalizer_3dnow.o decode_i586.o audio_esd.o' \ + CFLAGS='-DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DLINUX \ + -DUSE_3DNOW -DUSE_ESD \ + -Wall \ +@@ -309,7 +296,7 @@ + AUDIO_LIB='-lasound' \ + OBJECTS='decode.o dct64.o audio_alsa.o term.o' \ + CFLAGS='-DLINUX \ +- -DALSA -DTERM_CONTROL\ ++ -DALSA -DTERM_CONTROL \ + -DUSE_MMAP -O6 \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math \ +@@ -445,8 +432,7 @@ + + linux-frontend: + $(MAKE) LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ +- control_sajber.o control_tk3play.o audio_oss.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o control_sajber.o control_tk3play.o audio_oss.o' \ + CFLAGS='$(CFLAGS) -DFRONTEND -DOSS -DI386_ASSEM -DREAL_IS_FLOAT \ + -DPENTIUM_OPT -DLINUX -Wall \ + -fomit-frame-pointer -funroll-all-loops \ +@@ -480,8 +466,7 @@ + + freebsd-i486: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o \ +- decode_i486.o dct64_i486.o audio_oss.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i486.o dct64_i486.o audio_oss.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DOPT_ARCH=i486 \ +@@ -512,8 +497,7 @@ + + freebsd-frontend: + $(MAKE) CC=cc LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \ +- control_sajber.o control_tk3play.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_oss.o control_sajber.o control_tk3play.o' \ + CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DFRONTEND \ +@@ -587,8 +571,7 @@ + + solaris-x86-gcc-oss: + $(MAKE) LDFLAGS='-lsocket -lnsl' \ +- OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \ +- audio_oss.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o' \ + CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DPENTIUM_OPT -DUSE_MMAP \ + -DOSS \ + -Wall \ +@@ -698,8 +681,7 @@ + @ $(MAKE) FRONTEND=mpg123m-make aix-frontend + + aix-frontend: +- $(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o \ +- control_sajber.o control_tk3play.o' \ ++ $(MAKE) LDFLAGS= OBJECTS='decode.o dct64.o audio_aix.o control_sajber.o control_tk3play.o' \ + CFLAGS='$(CFLAGS) -DAIX -Wall -O6 -DUSE_MMAP -DFRONTEND \ + -fomit-frame-pointer -funroll-all-loops \ + -finline-functions -ffast-math' \ +@@ -732,8 +714,7 @@ + + bsdos: + $(MAKE) CC=shlicc2 LDFLAGS= \ +- OBJECTS='decode_i386.o dct64_i386.o \ +- audio_oss.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \ + CFLAGS='$(CFLAGS) -Wall -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \ +@@ -752,8 +733,7 @@ + bsdos-nas: + $(MAKE) CC=shlicc2 LDFLAGS= \ + AUDIO_LIB='-laudio -lXau -L/usr/X11R6/lib' \ +- OBJECTS='decode_i386.o dct64_i386.o \ +- audio_nas.o' \ ++ OBJECTS='decode_i386.o dct64_i386.o audio_nas.o' \ + CFLAGS='$(CFLAGS) -Wall -O4 -fomit-frame-pointer \ + -funroll-all-loops -ffast-math -DROT_I386 \ + -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \ diff --git a/media-sound/mpg123/mpg123-0.59s-r10.ebuild b/media-sound/mpg123/mpg123-0.59s-r10.ebuild index 2605df64cf62..d6023d8a010c 100644 --- a/media-sound/mpg123/mpg123-0.59s-r10.ebuild +++ b/media-sound/mpg123/mpg123-0.59s-r10.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 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.4 2006/03/08 15:46:03 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r10.ebuild,v 1.5 2006/05/11 12:30:33 flameeyes Exp $ -inherit eutils +inherit eutils toolchain-funcs PATCH_VER=1.5 S="${WORKDIR}/${PN}" @@ -23,8 +23,7 @@ RDEPEND="esd? ( media-sound/esound ) # alsa-1 b0rks and it's not a simple fix # alsa? ( media-libs/alsa-lib )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" +DEPEND="${RDEPEND}" PROVIDE="virtual/mpg123" @@ -51,6 +50,8 @@ src_unpack() { fi sed -i "s:${PV}-mh4:${PVR}:" version.h + + epatch "${FILESDIR}/${P}-gmake-3.81.patch" } src_compile() { @@ -123,7 +124,7 @@ src_compile() { for style in ${styles}; do - make clean ${atype}${style} CFLAGS="${CFLAGS}" || die + emake -j1 clean ${atype}${style} CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die mv mpg123 gentoo-bin/mpg123${style} [[ -L "gentoo-bin/mpg123" ]] && rm gentoo-bin/mpg123 ln -s mpg123${style} gentoo-bin/mpg123 |