diff options
author | Fabian Groffen <grobian@gentoo.org> | 2008-01-17 19:09:51 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2008-01-17 19:09:51 +0000 |
commit | 5f9582d7260cbc5d730f9b9e6cd64e15c07dc58b (patch) | |
tree | c5a466163fb2709e44447c1570c35739dcd9a2a6 | |
parent | Dropped ppc-macos keyword, see you in prefix (diff) | |
download | historical-5f9582d7260cbc5d730f9b9e6cd64e15c07dc58b.tar.gz historical-5f9582d7260cbc5d730f9b9e6cd64e15c07dc58b.tar.bz2 historical-5f9582d7260cbc5d730f9b9e6cd64e15c07dc58b.zip |
Removed osx patch
Package-Manager: portage-2.1.3.19
RepoMan-Options: --force
-rw-r--r-- | media-sound/mpg123/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/mpg123/Manifest | 20 | ||||
-rw-r--r-- | media-sound/mpg123/files/mpg123-osx.diff | 394 | ||||
-rw-r--r-- | media-sound/mpg123/mpg123-0.59s-r11.ebuild | 21 |
4 files changed, 18 insertions, 423 deletions
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog index 0f962e7e96a8..9eaccd01b964 100644 --- a/media-sound/mpg123/ChangeLog +++ b/media-sound/mpg123/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/mpg123 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.132 2008/01/07 14:15:59 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.133 2008/01/17 19:09:51 grobian Exp $ + + 17 Jan 2008; Fabian Groffen <grobian@gentoo.org> -files/mpg123-osx.diff, + mpg123-0.59s-r11.ebuild: + Removed osx patch 07 Jan 2008; Samuli Suominen <drac@gentoo.org> -files/1.0_rc2-no-faltivec.patch, -files/1.0_rc2-pkgconfig.patch, diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest index 9cfe85d62c01..f3f563f9e7ba 100644 --- a/media-sound/mpg123/Manifest +++ b/media-sound/mpg123/Manifest @@ -14,10 +14,6 @@ AUX mpg123-1.0.1-no-faltivec.patch 910 RMD160 09eb29351a62cd8c30d5c5ff642a6bef6f MD5 82a2f89fe8980dcfdbc1c306f1e3c1e4 files/mpg123-1.0.1-no-faltivec.patch 910 RMD160 09eb29351a62cd8c30d5c5ff642a6bef6fcb3deb files/mpg123-1.0.1-no-faltivec.patch 910 SHA256 d6966338621616d470fa9a7160e7f53a078a5b1b23cf14c893955a1f4b2374fb files/mpg123-1.0.1-no-faltivec.patch 910 -AUX mpg123-osx.diff 11227 RMD160 572614f922a288d68f56b66a20d3a9264c92c895 SHA1 11d7c7df1624f35bb17a7d044c21f4924eb316e7 SHA256 2941998aeb4c77d9c7633c6fcf01d37cb1b019f1b3d4dabadfceb152f97d11b8 -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 MD5 083de56193d644c972c2cf5034aaa100 files/mpg123-respectusercflags.patch 854 RMD160 da65d77e7cfa8822c86c04fdcbf0b0024293be48 files/mpg123-respectusercflags.patch 854 @@ -26,10 +22,10 @@ DIST mpg123-0.59s-gentoo-1.6.tar.bz2 7311 RMD160 393f10020bb15a813cc53570926be27 DIST mpg123-0.67.tar.bz2 559725 RMD160 29a8343a08d01ed5ff5462b4a90e95f13db29b89 SHA1 caf70343893a83cf8d9233b50ee67e8bc35cbd96 SHA256 af19eeb8898639491e9d8ebfc14e79cf0dd7f3776d20b4baa03685626882fd54 DIST mpg123-1.0.1.tar.bz2 969331 RMD160 8c4992b741809c329d1f851ced72e8403a31250d SHA1 68bde6dcd05eac9bde63f77f5a6fe27d5bed3d2f SHA256 0c0f82281b60960ae226a210fda1d3a1d088686a79fd0bee79fd5ae40c6f66f3 DIST mpg123-pre0.59s.tar.gz 244899 RMD160 fdc6ba57c67dc890ef5d2f3a05ff9c520ccf407f SHA1 7e521785dc3a9015f4228f0a118bf36856884b67 SHA256 ba0c1db18ffc7ed2250d6718a23a62e0e98d77bbeedb83ca3993f6421b31256a -EBUILD mpg123-0.59s-r11.ebuild 3525 RMD160 b1b6acda09c262d0ad17df5c5c5cfe12fe269fb4 SHA1 fa036af121b62c7c15aa36c031d3516559908dbc SHA256 368a3e2498b7b7197ad42ef697746203434e5f6198e1f22fabb5621b956a0529 -MD5 04781833bd0a31a9b1d4cf4163cef143 mpg123-0.59s-r11.ebuild 3525 -RMD160 b1b6acda09c262d0ad17df5c5c5cfe12fe269fb4 mpg123-0.59s-r11.ebuild 3525 -SHA256 368a3e2498b7b7197ad42ef697746203434e5f6198e1f22fabb5621b956a0529 mpg123-0.59s-r11.ebuild 3525 +EBUILD mpg123-0.59s-r11.ebuild 3330 RMD160 5a4704c2c976a7698efafde85e162cef93273d2a SHA1 23339ecdd5b7bcca49209d171615e81d6802d5bd SHA256 955c3d3395587d7edd6583e6c414fb6fcb15c46f6ac76148785af056c9f6f1fd +MD5 1e204121cd95320b00d51acb50650cbf mpg123-0.59s-r11.ebuild 3330 +RMD160 5a4704c2c976a7698efafde85e162cef93273d2a mpg123-0.59s-r11.ebuild 3330 +SHA256 955c3d3395587d7edd6583e6c414fb6fcb15c46f6ac76148785af056c9f6f1fd mpg123-0.59s-r11.ebuild 3330 EBUILD mpg123-0.67.ebuild 2162 RMD160 55aeb21e50d0944c99cde0cb649b6577adb3ed0f SHA1 ea5b41b6dba50e96491529cebc7a71949b87f002 SHA256 a3fac3a7c355855a6d6d559d38487bdc11722987a9135ee382ec6c8ee935d719 MD5 0daa64d2c7de05d9be71debcb676da52 mpg123-0.67.ebuild 2162 RMD160 55aeb21e50d0944c99cde0cb649b6577adb3ed0f mpg123-0.67.ebuild 2162 @@ -38,10 +34,10 @@ EBUILD mpg123-1.0.1.ebuild 1798 RMD160 3c12b7d028a926f1dd77624f9fdf4f64d40d8d4d MD5 002c984982fc114923664c326972c4a7 mpg123-1.0.1.ebuild 1798 RMD160 3c12b7d028a926f1dd77624f9fdf4f64d40d8d4d mpg123-1.0.1.ebuild 1798 SHA256 c3d2047b79aaa345b8922d84d6ca27b43fb1aa67ac9f01c827d168e8c0b8b53a mpg123-1.0.1.ebuild 1798 -MISC ChangeLog 19963 RMD160 b4a19321b3b1714039bca5bee8ce708231ae04bb SHA1 cf7456f43a5fb88711a5d8878e8b93a1b8335374 SHA256 d8212cb4c3273350d7e3797402ff350194877b856fa74f808e3b44518e809fe9 -MD5 cfafbea8e184505bb38932956f85e9a6 ChangeLog 19963 -RMD160 b4a19321b3b1714039bca5bee8ce708231ae04bb ChangeLog 19963 -SHA256 d8212cb4c3273350d7e3797402ff350194877b856fa74f808e3b44518e809fe9 ChangeLog 19963 +MISC ChangeLog 20089 RMD160 1fdd592783d3059781523f5fd5047439d25e8345 SHA1 9bb6322265da1116f37e27c1d5b3918ef1b8ee6f SHA256 bd410ff5bb69ac652d0f18e712a8867dd52def41e9d15f53ffca001646b834a5 +MD5 224490e70daddce3ee81db104abdf546 ChangeLog 20089 +RMD160 1fdd592783d3059781523f5fd5047439d25e8345 ChangeLog 20089 +SHA256 bd410ff5bb69ac652d0f18e712a8867dd52def41e9d15f53ffca001646b834a5 ChangeLog 20089 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 diff --git a/media-sound/mpg123/files/mpg123-osx.diff b/media-sound/mpg123/files/mpg123-osx.diff deleted file mode 100644 index a58fffd147b7..000000000000 --- a/media-sound/mpg123/files/mpg123-osx.diff +++ /dev/null @@ -1,394 +0,0 @@ -diff -Naur mpg123-orig/Makefile mpg123/Makefile ---- mpg123-orig/Makefile Sun Apr 10 13:35:56 2005 -+++ mpg123/Makefile Sun Apr 10 13:40:03 2005 -@@ -54,6 +54,7 @@ - @echo "make netbsd NetBSD" - @echo "make openbsd OpenBSD" - @echo "make mint MiNT on Atari" -+ @echo "make macos MacOSX - @echo "make generic try this one if your system isn't listed above" - @echo "" - @echo "Please read the file INSTALL for additional information." -@@ -149,6 +150,16 @@ - @echo "Please read the file INSTALL for additional information." - @echo "" - -+macos-help: -+ @echo "" -+ @echo "There are several Mac OS X flavours. Choose one:" -+ @echo "" -+ @echo "make macos" -+ @echo "make macos-esd" -+ @echo "" -+ @echo "Please read the file INSTALL for additional information." -+ @echo "" -+ - linux-devel: - $(MAKE) OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \ - LDFLAGS= \ -@@ -759,6 +770,24 @@ - -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \ - -DDONT_CATCH_SIGNALS -DNAS' \ - mpg123-make -+ -+macos: -+ $(MAKE) CC=cc LDFLAGS='$(LDFLAGS)' AUDIO_LIB='-framework CoreAudio' \ -+ OBJECTS='decode.o dct64.o audio_macosx.o term.o' \ -+ CFLAGS='$(CFLAGS) -DINET6 -DTERM_CONTROL -DMAC_OS_X -Wall -O2 -DPPC_ENDIAN' \ -+ mpg123-make -+ -+macos-generic: -+ $(MAKE) CC=cc LDFLAGS='$(LDFLAGS)' AUDIO_LIB='-framework CoreAudio' \ -+ OBJECTS='decode.o dct64.o audio_macosx.o term.o' \ -+ CFLAGS='$(CFLAGS) -DINET6 -DTERM_CONTROL -DMAC_OS_X -Wall -O2 -DPPC_ENDIAN' \ -+ mpg123-make -+ -+macos-esd: -+ $(MAKE) CC=cc LDFLAGS='$(LDFLAGS)' AUDIO_LIB='-lesd -laudiofile' \ -+ OBJECTS='decode.o dct64.o audio_esd.o' \ -+ CFLAGS='$(CFLAGS) -O -DDARWIN -Wall -O2 -DPPC_ENDIAN -DUSE_ESD' \ -+ mpg123-make - - mint: - $(MAKE) LDFLAGS= \ -diff -Naur mpg123-orig/audio_macosx.c mpg123/audio_macosx.c ---- mpg123-orig/audio_macosx.c Wed Dec 31 19:00:00 1969 -+++ mpg123/audio_macosx.c Sun Apr 10 13:47:14 2005 -@@ -0,0 +1,337 @@ -+/*- This is a 80 chars line, to have pretty formatted comments ---------------*/ -+ -+/* audio_macosx.c, originally written by Guillaume Outters -+ * to contact the author, please mail to: guillaume.outters@free.fr -+ * -+ * This file is some quick pre-alpha patch to allow me to have some music for my -+ * long working days, and it does it well. But it surely isn't a final version; -+ * as Mac OS X requires at least a G3, I'm not sure it will be useful to -+ * implement downsampling. -+ * -+ * Mac OS X audio works by asking you to fill its buffer, and, to complicate a -+ * bit, you must provide it with floats. In order not to patch too much mpg123, -+ * we'll accept signed short (mpg123 "approved" format) and transform them into -+ * floats as soon as received. Let's say this way calculations are faster. -+ * -+ * As we don't have some /dev/audio device with blocking write, we'll have to -+ * stop mpg123 before it does too much work, while we are waiting our dump proc -+ * to be called. I wanted to use semaphores, but they still need an -+ * implementation from Apple before I can do anything. So we'll block using a -+ * sleep and wake up on SIGUSR2. -+ * Version 0.2: now I use named semaphores (which are implemented AND work). -+ * Preprocessor flag MOSX_USES_SEM (defined at the beginning of this file) -+ * enables this behaviour. -+ * -+ * In order always to have a ready buffer to be dumped when the routine gets -+ * called, we have a "buffer loop" of NUMBER_BUFFERS buffers. mpg123 fills it -+ * on one extremity ('to'), playProc reads it on another point ('from'). 'to' -+ * blocks when it arrives on 'from' (having filled the whole circle of buffers) -+ * and 'from' blocks when no data is available. As soon as it has emptied a -+ * buffer, if mpg123 is sleeping, it awakes it quite brutaly (SIGUSR2) to tell -+ * it to fill the buffer. */ -+ -+#ifndef MOSX_USES_SEM -+#define MOSX_USES_SEM 1 /* Semaphores or sleep()/kill()? I would say semaphores, but this is just my advice, after all */ -+#endif -+#ifndef MOSX_SEM_V2 -+#define MOSX_SEM_V2 1 -+#endif -+ -+#include "mpg123.h" -+#include <CoreAudio/AudioHardware.h> -+#include <stdio.h> -+#include <stdlib.h> -+#include <errno.h> -+#if MOSX_USES_SEM -+#include <semaphore.h> -+#endif -+ -+struct aBuffer -+{ -+ float * buffer; -+ long size; -+ -+ float * ptr; /* Where in the buffer are we? */ -+ long remaining; -+ -+ struct aBuffer * next; -+}; -+typedef struct aBuffer aBuffer; -+ -+struct anEnv -+{ -+ long size; -+ short * debut; -+ short * ptr; -+ AudioDeviceID device; -+ char play; -+ -+ /* Intermediate buffers */ -+ -+ #if MOSX_USES_SEM -+ sem_t * semaphore; -+ #else -+ char wait; /* mpg123 is waiting (due to the semaphore) to show the world its power; let's free him! */ -+ pid_t pid; -+ #endif -+ aBuffer * from; /* Current buffers */ -+ aBuffer * to; -+}; -+ -+static struct anEnv env; -+ -+#define ENV ((struct anEnv *)inClientData) -+#define NUMBER_BUFFERS 16 /* Tried with 3 buffers, but then any little window move is sufficient to stop the sound. Here we have 1.5 seconds music buffered */ -+ -+void destroyBuffers() -+{ -+ aBuffer * ptr; -+ aBuffer * ptr2; -+ -+ ptr = env.to->next; -+ env.to->next = NULL; -+ while(ptr) -+ { -+ ptr2 = ptr->next; -+ if(ptr->buffer) free(ptr->buffer); -+ free(ptr); -+ ptr = ptr2; -+ } -+} -+ -+void initBuffers() -+{ -+ long m; -+ aBuffer ** ptrptr; -+ -+ ptrptr = &env.to; -+ for(m = 0; m < NUMBER_BUFFERS; m++) -+ { -+ *ptrptr = malloc(sizeof(aBuffer)); -+ (*ptrptr)->size = 0; -+ (*ptrptr)->remaining = 0; -+ (*ptrptr)->buffer = NULL; -+ ptrptr = &(*ptrptr)->next; -+ #if MOSX_USES_SEM -+ sem_post(env.semaphore); /* This buffer is ready for filling (of course, it is empty!) */ -+ #endif -+ } -+ *ptrptr = env.from = env.to; -+} -+ -+int fillBuffer(aBuffer * b, short * source, long size) -+{ -+ float * dest; -+ -+ if(b->remaining) /* Non empty buffer, must still be playing */ -+ return(-1); -+ if(b->size != size) /* Hey! What's that? Coudn't this buffer size be fixed once (well, perhaps we just didn't allocate it yet) */ -+ { -+ if(b->buffer) free(b->buffer); -+ b->buffer = malloc(size * sizeof(float)); -+ b->size = size; -+ } -+ -+ dest = b->buffer; -+ while(size--) -+ //*dest++ = ((*source++) + 32768) / 65536.0; -+ *dest++ = (*source++) / 32768.0; -+ -+ b->ptr = b->buffer; -+ b->remaining = b->size; /* Do this at last; we shouldn't show the buffer is full before it is effectively */ -+ -+ #ifdef DEBUG_MOSX -+ printf("."); fflush(stdout); -+ #endif -+ -+ return(0); -+} -+ -+OSStatus playProc(AudioDeviceID inDevice, const AudioTimeStamp * inNow, const AudioBufferList * inInputData, const AudioTimeStamp * inInputTime, AudioBufferList * outOutputData, const AudioTimeStamp * inOutputTime, void * inClientData) -+{ -+ long m, n, o; -+ float * dest; -+ -+ for(o = 0; o < outOutputData->mNumberBuffers; o++) -+ { -+ m = outOutputData->mBuffers[o].mDataByteSize / sizeof(float); /* What we have to fill */ -+ dest = outOutputData->mBuffers[o].mData; -+ -+ while(m > 0) -+ { -+ if( (n = ENV->from->remaining) <= 0 ) /* No more bytes in the current read buffer! */ -+ { -+ while( (n = ENV->from->remaining) <= 0) -+ usleep(2000); /* Let's wait a bit for the results... */ -+ } -+ -+ /* We dump what we can */ -+ -+ if(n > m) n = m; /* In fact, just the necessary should be sufficient (I think) */ -+ -+ memcpy(dest, ENV->from->ptr, n * sizeof(float)); -+ -+ /* Let's remember all done work */ -+ -+ m -= n; -+ ENV->from->ptr += n; -+ if( (ENV->from->remaining -= n) <= 0) /* ... and tell mpg123 there's a buffer to fill */ -+ { -+ #if MOSX_USES_SEM -+ sem_post(ENV->semaphore); -+ #else -+ if(ENV->wait) -+ { -+ kill(ENV->pid, SIGUSR2); -+ ENV->wait = 0; -+ } -+ #endif -+ ENV->from = ENV->from->next; -+ } -+ } -+ } -+ -+ return (0); -+} -+ -+#if ! MOSX_USES_SEM -+void start(int n) -+{ -+ signal(SIGUSR2, start); -+} -+#endif -+ -+int audio_open(struct audio_info_struct *ai) -+{ -+ long size; -+ AudioStreamBasicDescription format; -+ #if MOSX_USES_SEM -+ char s[10]; -+ long m; -+ #endif -+ /*float vol; -+ OSStatus e;*/ -+ -+ /* Where did that default audio output go? */ -+ -+ size = sizeof(env.device); -+ if(AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, &size, &env.device)) return(-1); -+ -+ /* Hmmm, let's choose PCM format */ -+ -+ size = sizeof(format); -+ if(AudioDeviceGetProperty(env.device, 0, 0, kAudioDevicePropertyStreamFormat, &size, &format)) return(-1); -+ if(format.mFormatID != kAudioFormatLinearPCM) return(-1); -+ -+ /* Let's test volume, which doesn't seem to work (but this is only an alpha, remember?) */ -+ -+ /*vol = 0.5; -+ size = sizeof(vol); -+ if(e = AudioDeviceSetProperty(env.device, NULL, 0, 0, 'volm', size, &vol)) { printf("Didn't your mother ever tell you not to hear music so loudly?\n"); return(-1); } */ -+ -+ /* Let's init our environment */ -+ -+ env.size = 0; -+ env.debut = NULL; -+ env.ptr = NULL; -+ env.play = 0; -+ -+ #if MOSX_USES_SEM -+ strcpy(s, "/mpg123-0000"); -+ do -+ { -+ for(m = 10;; m--) -+ if( (s[m]++) <= '9') -+ break; -+ else -+ s[m] = '0'; -+ } while( (env.semaphore = sem_open(s, O_CREAT | O_EXCL, 0644, 0)) == (sem_t *)SEM_FAILED); -+ #else -+ env.pid = getpid(); -+ env.wait = 0; -+ signal(SIGUSR2, start); -+ #endif -+ -+ initBuffers(); -+ -+ /* And prepare audio launching */ -+ -+ if(AudioDeviceAddIOProc(env.device, playProc, &env)) return(-1); -+ -+ return(0); -+} -+ -+int audio_reset_parameters(struct audio_info_struct *ai) -+{ -+ return 0; -+} -+ -+int audio_rate_best_match(struct audio_info_struct *ai) -+{ -+ return 0; -+} -+ -+int audio_set_rate(struct audio_info_struct *ai) -+{ -+ return 0; -+} -+ -+int audio_set_channels(struct audio_info_struct *ai) -+{ -+ return 0; -+} -+ -+int audio_set_format(struct audio_info_struct *ai) -+{ -+ return 0; -+} -+ -+int audio_get_formats(struct audio_info_struct *ai) -+{ -+ return AUDIO_FORMAT_SIGNED_16; -+} -+ -+int audio_play_samples(struct audio_info_struct *ai,unsigned char *buf,int len) -+{ -+ /* We have to calm down mpg123, else he wouldn't hesitate to drop us another buffer (which would be the same, in fact) */ -+ -+ #if MOSX_USES_SEM && MOSX_SEM_V2 /* Suddenly, I have some kind of doubt: HOW COULD IT WORK??? */ -+ while(sem_wait(env.semaphore)){} /* We just have to wait a buffer fill request */ -+ fillBuffer(env.to, (short *)buf, len / sizeof(short)); -+ #else -+ while(fillBuffer(env.to, (short *)buf, len / sizeof(short)) < 0) /* While the next buffer to write is not empty, we wait a bit... */ -+ { -+ #ifdef DEBUG_MOSX -+ printf("|"); fflush(stdout); -+ #endif -+ #if MOSX_USES_SEM -+ sem_wait(env.semaphore); /* This is a bug. I should wait for the semaphore once per empty buffer (and not each time fillBuffers() returns -1). See MOSX_SEM_V2; this was a too quickly modified part when I implemented MOSX_USES_SEM. */ -+ #else -+ env.wait = 1; -+ sleep(3600); /* This should be sufficient, shouldn't it? */ -+ #endif -+ } -+ #endif -+ env.to = env.to->next; -+ -+ /* And we lauch action if not already done */ -+ -+ if(!env.play) -+ { -+ if(AudioDeviceStart(env.device, playProc)) return(-1); -+ env.play = 1; -+ } -+ -+ return len; -+} -+ -+int audio_close(struct audio_info_struct *ai) -+{ -+ AudioDeviceStop(env.device, playProc); /* No matter the error code, we want to close it (by brute force if necessary) */ -+ AudioDeviceRemoveIOProc(env.device, playProc); -+ destroyBuffers(); -+ #if MOSX_USES_SEM -+ sem_close(env.semaphore); -+ #endif -+ return 0; -+} diff --git a/media-sound/mpg123/mpg123-0.59s-r11.ebuild b/media-sound/mpg123/mpg123-0.59s-r11.ebuild index 3c796fbef121..c5e8d4d76535 100644 --- a/media-sound/mpg123/mpg123-0.59s-r11.ebuild +++ b/media-sound/mpg123/mpg123-0.59s-r11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r11.ebuild,v 1.14 2008/01/07 14:15:59 drac Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-0.59s-r11.ebuild,v 1.15 2008/01/17 19:09:51 grobian Exp $ inherit eutils toolchain-funcs @@ -45,12 +45,6 @@ src_unpack() { # Bug #87539; user CFLAGS are not respected on amd64 epatch "${FILESDIR}/${PN}-respectusercflags.patch" - if use ppc-macos; - then - einfo "Patching for OSX build" - epatch "${FILESDIR}/${PN}-osx.diff" - fi - sed -i "s:${PV}-mh4:${PVR}:" version.h epatch "${FILESDIR}/${P}-gmake-3.81.patch" @@ -78,15 +72,10 @@ src_compile() { [[ -z "${styles}" ]] && styles="-ppc64" ;; ppc) - if use ppc-macos; then - [ -z "${styles}" ] && styles="macos" - atype="" - else - use esd && styles="${styles} -ppc-esd" - use oss && styles="${styles} -ppc" - - [ -z "${styles}" ] && styles="-ppc" - fi + use esd && styles="${styles} -ppc-esd" + use oss && styles="${styles} -ppc" + + [ -z "${styles}" ] && styles="-ppc" ;; x86) use esd && styles="${styles} -esd" |