diff options
author | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-11-19 20:08:22 +0000 |
---|---|---|
committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-11-19 20:08:22 +0000 |
commit | 40709101acec89c705f1bfef933b7b27f98775b5 (patch) | |
tree | dad573a05846805a1b7b626faad4af4ed79ec136 /media-sound | |
parent | old (diff) | |
download | gentoo-2-40709101acec89c705f1bfef933b7b27f98775b5.tar.gz gentoo-2-40709101acec89c705f1bfef933b7b27f98775b5.tar.bz2 gentoo-2-40709101acec89c705f1bfef933b7b27f98775b5.zip |
Cleanup old ebuilds and patches.
(Portage version: 2.1.3.19)
Diffstat (limited to 'media-sound')
14 files changed, 13 insertions, 1164 deletions
diff --git a/media-sound/jack-audio-connection-kit/ChangeLog b/media-sound/jack-audio-connection-kit/ChangeLog index 632b90bf26d4..e4e49e766703 100644 --- a/media-sound/jack-audio-connection-kit/ChangeLog +++ b/media-sound/jack-audio-connection-kit/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for media-sound/jack-audio-connection-kit # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.100 2007/10/08 06:07:42 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/ChangeLog,v 1.101 2007/11/19 20:08:22 flameeyes Exp $ + + 19 Nov 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch, + -files/jack-audio-connection-kit-0.100.0-coreaudio.patch, + -files/jack-audio-connection-kit-0.100.0-driver_interface.patch, + -files/jack-audio-connection-kit-doc-option.patch, + -files/jack-audio-connection-kit-mmap_complex.patch, + -jack-audio-connection-kit-0.99.0-r1.ebuild, + -jack-audio-connection-kit-0.99.0-r2.ebuild, + -jack-audio-connection-kit-0.101.1-r1.ebuild, + -jack-audio-connection-kit-0.102.20.ebuild: + Cleanup old ebuilds and patches. 08 Oct 2007; Tom Gall <tgall@gentoo.org> +jack-audio-connection-kit-0.103.0-ppc64fix.patch: diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.101.1-r1 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.101.1-r1 deleted file mode 100644 index fa4f3dc91e2e..000000000000 --- a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.101.1-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 bb25f7c1da5d488b70edcf39ff5a39b2 jack-audio-connection-kit-0.101.1.tar.gz 724598 -RMD160 54bcb565419f032715a90ff79b056003e2fe7fef jack-audio-connection-kit-0.101.1.tar.gz 724598 -SHA256 4f0e89a83aaaf5b125389135ee4f321b22ffef19003749c138eb54974e2f5533 jack-audio-connection-kit-0.101.1.tar.gz 724598 -MD5 0f09c9f641609c71ca24a3b9b337a017 netjack-0.12rc1.tar.bz2 25634 -RMD160 4d41929aedb80a64964641f0de1e6a806b071015 netjack-0.12rc1.tar.bz2 25634 -SHA256 631ffe87f3631495bde730069b2529da668ab5993d6574dafbb60e50b5b9497e netjack-0.12rc1.tar.bz2 25634 diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.102.20 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.102.20 deleted file mode 100644 index 6248a6fc8f25..000000000000 --- a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.102.20 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 d6881555a8b4c923b4ec706832f0d776 jack-audio-connection-kit-0.102.20.tar.gz 761792 -RMD160 5a343fa8c54f629418f3e21165870d7e8a75a4a6 jack-audio-connection-kit-0.102.20.tar.gz 761792 -SHA256 e4506a9f46cd6fa4896e76482f17b7bddeeda3eb35add176d6db479e5c4f8530 jack-audio-connection-kit-0.102.20.tar.gz 761792 -MD5 0f09c9f641609c71ca24a3b9b337a017 netjack-0.12rc1.tar.bz2 25634 -RMD160 4d41929aedb80a64964641f0de1e6a806b071015 netjack-0.12rc1.tar.bz2 25634 -SHA256 631ffe87f3631495bde730069b2529da668ab5993d6574dafbb60e50b5b9497e netjack-0.12rc1.tar.bz2 25634 diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r1 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r1 deleted file mode 100644 index 1a3e49953aa6..000000000000 --- a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a891a699010452258d77e59842ebe4a0 jack-audio-connection-kit-0.99.0.tar.gz 722399 -RMD160 7d32d77dc58497436d30f6782d0214b26854bb8a jack-audio-connection-kit-0.99.0.tar.gz 722399 -SHA256 2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e jack-audio-connection-kit-0.99.0.tar.gz 722399 diff --git a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r2 b/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r2 deleted file mode 100644 index 1a3e49953aa6..000000000000 --- a/media-sound/jack-audio-connection-kit/files/digest-jack-audio-connection-kit-0.99.0-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a891a699010452258d77e59842ebe4a0 jack-audio-connection-kit-0.99.0.tar.gz 722399 -RMD160 7d32d77dc58497436d30f6782d0214b26854bb8a jack-audio-connection-kit-0.99.0.tar.gz 722399 -SHA256 2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e jack-audio-connection-kit-0.99.0.tar.gz 722399 diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-coreaudio.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-coreaudio.patch deleted file mode 100644 index 0a77c8e42726..000000000000 --- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-coreaudio.patch +++ /dev/null @@ -1,389 +0,0 @@ ---- jack-audio-connection-kit-0.100.0/drivers/coreaudio/coreaudio_driver.c 2005-06-09 13:14:45 -0500 -+++ jack-cvs/drivers/coreaudio/coreaudio_driver.c 2005-09-10 18:47:27 -0500 -@@ -37,10 +37,10 @@ - May 20, 2005: S.Letz: Add "systemic" latencies management. - Jun 06, 2005: S.Letz: Remove the "-I" parameter, change the semantic of "-n" parameter : -n (driver name) now correctly uses the PropertyDeviceUID - (persistent accross reboot...) as the identifier for the used coreaudio driver. -+ Jun 14, 2005: S.Letz: Since the "-I" parameter is not used anymore, rename the "systemic" latencies management parametes "-I" and "-O" like for the ALSA driver. -+ Aug 16, 2005: S.Letz: Remove get_device_id_from_num, use get_default_device instead. If the -n option is not used or the device name cannot -+ be found, the default device is used. Note: the default device can be used only if both default input and default output are the same. - -- TODO: -- - fix cpu load behavior. -- - multiple-device processing. - */ - - #include <stdio.h> -@@ -98,15 +98,15 @@ - JCALog("error code : kAudioDevicePermissionsError\n"); - break; - default: -- JCALog("error code : unknown\n"); -+ JCALog("error code : unknown %ld\n", err); - break; - } - #endif - } - --static OSStatus get_device_name_from_id(AudioDeviceID id, char name[60]) -+static OSStatus get_device_name_from_id(AudioDeviceID id, char name[256]) - { -- UInt32 size = sizeof(char) * 60; -+ UInt32 size = sizeof(char) * 256; - OSStatus res = AudioDeviceGetProperty(id, 0, false, - kAudioDevicePropertyDeviceName, - &size, -@@ -124,27 +124,35 @@ - } else { - OSStatus res = AudioHardwareGetProperty(kAudioHardwarePropertyDeviceForUID, &size, &value); - CFRelease(inIUD); -- return res; -+ JCALog("get_device_id_from_uid %s %ld \n", UID, *id); -+ return (*id == kAudioDeviceUnknown) ? kAudioHardwareBadDeviceError : res; - } - } - --static OSStatus get_device_id_from_num(int i, AudioDeviceID * id) -+static OSStatus get_default_device(AudioDeviceID * id) - { -- OSStatus theStatus; -- UInt32 theSize; -- int nDevices; -- AudioDeviceID* theDeviceList; -- -- theStatus = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, -- &theSize, NULL); -- nDevices = theSize / sizeof(AudioDeviceID); -- theDeviceList = -- (AudioDeviceID*) malloc(nDevices * sizeof(AudioDeviceID)); -- theStatus = AudioHardwareGetProperty(kAudioHardwarePropertyDevices, -- &theSize, theDeviceList); -- -- *id = theDeviceList[i]; -- return theStatus; -+ OSStatus res; -+ UInt32 theSize = sizeof(UInt32); -+ AudioDeviceID inDefault; -+ AudioDeviceID outDefault; -+ -+ if ((res = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultInputDevice, -+ &theSize, &inDefault)) != noErr) -+ return res; -+ -+ if ((res = AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice, -+ &theSize, &outDefault)) != noErr) -+ return res; -+ -+ JCALog("get_default_device: input %ld output %ld\n", inDefault, outDefault); -+ -+ // Get the device only if default input and ouput are the same -+ if (inDefault == outDefault) { -+ *id = inDefault; -+ return noErr; -+ } else { -+ return kAudioHardwareBadDeviceError; -+ } - } - - static OSStatus render(void *inRefCon, -@@ -257,8 +265,6 @@ - */ - - for (chn = 0; chn < driver->capture_nchannels; chn++) { -- //snprintf (buf, sizeof(buf) - 1, "capture_%lu", chn+1); -- - err = AudioDeviceGetPropertyInfo(driver->device_id, chn + 1, true, kAudioDevicePropertyChannelName, &size, &isWritable); - if (err == noErr && size > 0) { - err = AudioDeviceGetProperty(driver->device_id, chn + 1, true, kAudioDevicePropertyChannelName, &size, channel_name); -@@ -293,8 +299,6 @@ - port_flags = JackPortIsInput | JackPortIsPhysical | JackPortIsTerminal; - - for (chn = 0; chn < driver->playback_nchannels; chn++) { -- //snprintf (buf, sizeof(buf) - 1, "playback_%lu", chn+1); -- - err = AudioDeviceGetPropertyInfo(driver->device_id, chn + 1, false, kAudioDevicePropertyChannelName, &size, &isWritable); - if (err == noErr && size > 0) { - err = AudioDeviceGetProperty(driver->device_id, chn + 1, false, kAudioDevicePropertyChannelName, &size, channel_name); -@@ -428,8 +432,9 @@ - ComponentResult err1; - UInt32 outSize; - Boolean isWritable; -- AudioStreamBasicDescription srcFormat, dstFormat, sampleRate; -+ AudioStreamBasicDescription srcFormat, dstFormat; - int in_nChannels, out_nChannels, i; -+ Float64 nominalSampleRate; - - driver = (coreaudio_driver_t *) calloc(1, sizeof(coreaudio_driver_t)); - jack_driver_init((jack_driver_t *) driver); -@@ -459,14 +464,17 @@ - driver->playback_frame_latency = playback_latency; - - if (driver_uid) { -- if (get_device_id_from_uid(driver_uid, &driver->device_id) != noErr) -- return NULL; -+ if (get_device_id_from_uid(driver_uid, &driver->device_id) != noErr) { -+ if (get_default_device(&driver->device_id) != noErr) -+ goto error; -+ } - } else { -- get_device_id_from_num(0, &driver->device_id); // takes a default value (first device) -+ if (get_default_device(&driver->device_id) != noErr) -+ goto error; - } - - if (get_device_name_from_id(driver->device_id, driver->driver_name) != noErr) -- return NULL; -+ goto error; - - driver->client = client; - driver->period_usecs = -@@ -481,31 +489,42 @@ - err = AudioDeviceSetProperty(driver->device_id, NULL, 0, false, - kAudioDevicePropertyBufferFrameSize, outSize, &frames_per_cycle); - if (err != noErr) { -- jack_error("Cannot set buffer size %ld\n", frames_per_cycle); -+ JCALog("Cannot set buffer size %ld\n", frames_per_cycle); - printError1(err); -- return NULL; -+ goto error; - } -- -- // Setting sample rate -- outSize = sizeof(AudioStreamBasicDescription); -+ -+ outSize = sizeof(Float64); - err = AudioDeviceGetProperty(driver->device_id, 0, false, -- kAudioDevicePropertyStreamFormat, &outSize, &sampleRate); -+ kAudioDevicePropertyNominalSampleRate, &outSize, &nominalSampleRate); - if (err != noErr) { -- jack_error("Cannot get sample rate\n"); -+ JCALog("Cannot get sample rate\n"); - printError1(err); -- return NULL; -- } -+ goto error; -+ } else { -+ JCALog("Read nominalSampleRate %f\n", nominalSampleRate); -+ } - -- if (rate != (unsigned long)sampleRate.mSampleRate) { -- sampleRate.mSampleRate = (Float64)rate; -+ if (rate != (jack_nframes_t)nominalSampleRate) { -+ nominalSampleRate = (Float64)rate; - err = AudioDeviceSetProperty(driver->device_id, NULL, 0, -- false, kAudioDevicePropertyStreamFormat, outSize, &sampleRate); -+ false, kAudioDevicePropertyNominalSampleRate, outSize, &nominalSampleRate); - if (err != noErr) { -- jack_error("Cannot set sample rate %ld\n", rate); -+ JCALog("Cannot set sample rate %ld\n", rate); - printError1(err); -- return NULL; -+ goto error; - } - } -+ -+ err = AudioDeviceGetProperty(driver->device_id, 0, false, -+ kAudioDevicePropertyNominalSampleRate, &outSize, &nominalSampleRate); -+ if (err != noErr) { -+ JCALog("Cannot get sample rate\n"); -+ printError1(err); -+ goto error; -+ } else { -+ JCALog("Read again nominalSampleRate %f\n", nominalSampleRate); -+ } - - // AUHAL - ComponentDescription cd = {kAudioUnitType_Output, -@@ -516,22 +535,18 @@ - if (err1 != noErr) - goto error; - -- err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_CurrentDevice, -- kAudioUnitScope_Global, 0, &driver->device_id, sizeof(AudioDeviceID)); -- if (err1 != noErr) { -- JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_CurrentDevice\n"); -- return NULL; -- } -- - err1 = AudioUnitInitialize(driver->au_hal); -- if (err1 != noErr) -+ if (err1 != noErr) { -+ printError1(err1); - goto error; -+ } - - outSize = 1; - err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_EnableIO, - kAudioUnitScope_Output, 0, &outSize, sizeof(outSize)); - if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_EnableIO,kAudioUnitScope_Output\n"); -+ printError1(err1); - goto error; - } - -@@ -541,28 +556,42 @@ - kAudioUnitScope_Input, 1, &outSize, sizeof(outSize)); - if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_EnableIO,kAudioUnitScope_Input\n"); -+ printError1(err1); - goto error; - } - } - -+ err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_CurrentDevice, -+ kAudioUnitScope_Global, 0, &driver->device_id, sizeof(AudioDeviceID)); -+ if (err1 != noErr) { -+ JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_CurrentDevice\n"); -+ printError1(err1); -+ goto error; -+ } -+ - err1 = AudioUnitSetProperty(driver->au_hal, kAudioUnitProperty_MaximumFramesPerSlice, - kAudioUnitScope_Global, 0, (UInt32*)&frames_per_cycle, sizeof(UInt32)); - if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioUnitProperty_MaximumFramesPerSlice\n"); -+ printError1(err1); - goto error; - } - - err1 = AudioUnitGetPropertyInfo(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, - kAudioUnitScope_Input, 1, &outSize, &isWritable); -- if (err1 != noErr) -+ if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap-INFO 1\n"); -+ printError1(err1); -+ } - - in_nChannels = outSize / sizeof(SInt32); - - err1 = AudioUnitGetPropertyInfo(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, - kAudioUnitScope_Output, 0, &outSize, &isWritable); -- if (err1 != noErr) -+ if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap-INFO 0\n"); -+ printError1(err1); -+ } - - out_nChannels = outSize / sizeof(SInt32); - -@@ -576,7 +605,7 @@ - } - - if (chan_out < out_nChannels) { -- SInt32 chanArr[out_nChannels]; // ??? -+ SInt32 chanArr[out_nChannels]; - for (i = 0;i < out_nChannels; i++) { - chanArr[i] = -1; - } -@@ -585,8 +614,10 @@ - } - err1 = AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, - kAudioUnitScope_Output, 0, chanArr, sizeof(SInt32) * out_nChannels); -- if (err1 != noErr) -+ if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap 0\n"); -+ printError1(err1); -+ } - } - - if (chan_in < in_nChannels) { -@@ -599,8 +630,10 @@ - } - AudioUnitSetProperty(driver->au_hal, kAudioOutputUnitProperty_ChannelMap, - kAudioUnitScope_Input, 1, chanArr, sizeof(SInt32) * in_nChannels); -- if (err1 != noErr) -+ if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioOutputUnitProperty_ChannelMap 1\n"); -+ printError1(err1); -+ } - } - - srcFormat.mSampleRate = rate; -@@ -617,8 +650,10 @@ - - err1 = AudioUnitSetProperty(driver->au_hal, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Input, 0, &srcFormat, sizeof(AudioStreamBasicDescription)); -- if (err1 != noErr) -+ if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioUnitProperty_StreamFormat kAudioUnitScope_Input\n"); -+ printError1(err1); -+ } - - dstFormat.mSampleRate = rate; - dstFormat.mFormatID = kAudioFormatLinearPCM; -@@ -634,8 +669,10 @@ - - err1 = AudioUnitSetProperty(driver->au_hal, kAudioUnitProperty_StreamFormat, - kAudioUnitScope_Output, 1, &dstFormat, sizeof(AudioStreamBasicDescription)); -- if (err1 != noErr) -+ if (err1 != noErr) { - JCALog("error: calling AudioUnitSetProperty - kAudioUnitProperty_StreamFormat kAudioUnitScope_Output\n"); -+ printError1(err1); -+ } - - if (chan_in > 0 && chan_out== 0) { - AURenderCallbackStruct output; -@@ -645,6 +682,7 @@ - kAudioUnitScope_Output, 1, &output, sizeof(output)); - if (err1 != noErr) { - JCALog("AudioUnitSetProperty - kAudioUnitProperty_SetRenderCallback 1\n"); -+ printError1(err1); - goto error; - } - } else { -@@ -655,6 +693,7 @@ - kAudioUnitScope_Input, 0, &output, sizeof(output)); - if (err1 != noErr) { - JCALog("AudioUnitSetProperty - kAudioUnitProperty_SetRenderCallback 0\n"); -+ printError1(err1); - goto error; - } - } -@@ -689,7 +728,7 @@ - error: - AudioUnitUninitialize(driver->au_hal); - CloseComponent(driver->au_hal); -- jack_error("Cannot open the coreaudio driver\n"); -+ jack_error("Cannot open the coreaudio driver"); - free(driver); - return NULL; - } -@@ -796,7 +835,7 @@ - - i++; - strcpy(desc->params[i].name, "input-latency"); -- desc->params[i].character = 'l'; -+ desc->params[i].character = 'I'; - desc->params[i].type = JackDriverParamUInt; - desc->params[i].value.i = 0; - strcpy(desc->params[i].short_desc, "Extra input latency"); -@@ -804,7 +843,7 @@ - - i++; - strcpy(desc->params[i].name, "output-latency"); -- desc->params[i].character = 'L'; -+ desc->params[i].character = 'O'; - desc->params[i].type = JackDriverParamUInt; - desc->params[i].value.i = 0; - strcpy(desc->params[i].short_desc, "Extra output latency"); -@@ -870,18 +909,17 @@ - frames_per_interrupt = (unsigned int) param->value.ui; - break; - -- case 'l': -+ case 'I': - systemic_input_latency = param->value.ui; - break; - -- case 'L': -+ case 'O': - systemic_output_latency = param->value.ui; - break; - } - } - - /* duplex is the default */ -- - if (!capture && !playback) { - capture = TRUE; - playback = TRUE; diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-driver_interface.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-driver_interface.patch deleted file mode 100644 index 2b5d865cb561..000000000000 --- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.100.0-driver_interface.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- jack-audio-connection-kit-0.100.0/jack/driver_interface.h 2003-12-20 10:47:36 -0600 -+++ jack-cvs/jack/driver_interface.h 2005-09-10 18:47:09 -0500 -@@ -30,7 +30,7 @@ - - #define JACK_DRIVER_NAME_MAX 15 - #define JACK_DRIVER_PARAM_NAME_MAX 15 --#define JACK_DRIVER_PARAM_STRING_MAX 31 -+#define JACK_DRIVER_PARAM_STRING_MAX 63 - - - /** Driver parameter types */ diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch deleted file mode 100644 index 9e92d1212cac..000000000000 --- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-0.80.0-alsalib-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur jack-audio-connection-kit-0.80.0/drivers/alsa/alsa_driver.h jack-audio-connection-kit-0.80.0-fixed/drivers/alsa/alsa_driver.h ---- jack-audio-connection-kit-0.80.0/drivers/alsa/alsa_driver.h 2003-08-28 19:06:30.000000000 -0500 -+++ jack-audio-connection-kit-0.80.0-fixed/drivers/alsa/alsa_driver.h 2004-01-22 21:08:30.000000000 -0600 -@@ -21,6 +21,10 @@ - #ifndef __jack_alsa_driver_h__ - #define __jack_alsa_driver_h__ - -+#include <alsa/version.h> -+#if SND_LIB_MAJOR==1 -+#define ALSA_PCM_OLD_HW_PARAMS_API -+#endif - #include <alsa/asoundlib.h> - - #include <jack/types.h> diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-doc-option.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-doc-option.patch deleted file mode 100644 index 69a684b8ba3e..000000000000 --- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-doc-option.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- jack-audio-connection-kit-0.80.0/configure.in 2003-08-28 17:21:07.000000000 -0500 -+++ jack-audio-connection-kit-0.80.0-fixed/configure.in 2004-02-04 13:15:12.000000000 -0600 -@@ -269,10 +269,26 @@ - fi - AC_SUBST(READLINE_DEPS) - --# you need doxygen to make dist. --AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) --if test $HAVE_DOXYGEN = "false"; then -- AC_MSG_WARN([*** doxygen not found, docs will not be built]) -+AC_ARG_ENABLE(html-docs, -+ [ --enable-html-docs build the html documentation (default yes)], -+ [ if test "x$enable_html_docs" != "xno" ; then -+ ENABLE_HTML_DOCS="yes" -+ AC_MSG_RESULT([JACK will build html docs]) -+ else -+ AC_MSG_RESULT([JACK will not build html docs]) -+ fi; -+ ], -+ [ ENABLE_HTML_DOCS="yes"; ] -+) -+ -+if test "$ENABLE_HTML_DOCS" == "yes" ; then -+ # you need doxygen to make dist. -+ AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false) -+ if test $HAVE_DOXYGEN == "false"; then -+ AC_MSG_ERROR([*** doxygen not found, unable to build docs.]) -+ fi -+else -+ HAVE_DOXYGEN="false" - fi - - AM_CONDITIONAL(HAVE_SNDFILE, $HAVE_SNDFILE) diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-mmap_complex.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-mmap_complex.patch deleted file mode 100644 index cb2b54c75cb5..000000000000 --- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-mmap_complex.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff -ru jack-audio-connection-kit-0.100.0.orig/drivers/alsa/alsa_driver.c jack-audio-connection-kit-0.100.0/drivers/alsa/alsa_driver.c ---- jack-audio-connection-kit-0.100.0.orig/drivers/alsa/alsa_driver.c 2005-09-23 19:33:25.000000000 +0200 -+++ jack-audio-connection-kit-0.100.0/drivers/alsa/alsa_driver.c 2005-09-23 19:34:11.000000000 +0200 -@@ -70,6 +70,16 @@ - driver->capture_addr = 0; - } - -+ if (driver->playback_interleave_skip) { -+ free (driver->playback_interleave_skip); -+ driver->playback_interleave_skip = NULL; -+ } -+ -+ if (driver->capture_interleave_skip) { -+ free (driver->capture_interleave_skip); -+ driver->capture_interleave_skip = NULL; -+ } -+ - if (driver->silent) { - free (driver->silent); - driver->silent = 0; -@@ -377,6 +387,9 @@ - if ((err = snd_pcm_hw_params_set_access ( - handle, hw_params, - SND_PCM_ACCESS_MMAP_INTERLEAVED)) < 0) { -+ if ((err = snd_pcm_hw_params_set_access ( -+ handle, hw_params, -+ SND_PCM_ACCESS_MMAP_COMPLEX)) < 0) { - jack_error ("ALSA: mmap-based access is not possible" - " for the %s " - "stream of this audio interface", -@@ -384,6 +397,7 @@ - return -1; - } - } -+ } - - format = sample_width == 4 ? 0 : NOFORMATS - 1; - while (1) { -@@ -683,7 +697,8 @@ - err = snd_pcm_hw_params_get_access (driver->playback_hw_params, - &access); - driver->playback_interleaved = -- (access == SND_PCM_ACCESS_MMAP_INTERLEAVED); -+ (access == SND_PCM_ACCESS_MMAP_INTERLEAVED) -+ || (access == SND_PCM_ACCESS_MMAP_COMPLEX); - - if (p_period_size != driver->frames_per_cycle) { - jack_error ("alsa_pcm: requested an interrupt every %" -@@ -705,8 +720,8 @@ - err = snd_pcm_hw_params_get_access (driver->capture_hw_params, - &access); - driver->capture_interleaved = -- (access == SND_PCM_ACCESS_MMAP_INTERLEAVED); -- -+ (access == SND_PCM_ACCESS_MMAP_INTERLEAVED) -+ || (access == SND_PCM_ACCESS_MMAP_COMPLEX); - - if (c_period_size != driver->frames_per_cycle) { - jack_error ("alsa_pcm: requested an interrupt every %" -@@ -765,15 +780,11 @@ - driver->alsa_name_playback); - return -1; - } -- driver->playback_interleave_skip = my_areas[0].step / 8; - driver->interleave_unit = - snd_pcm_format_physical_width ( - driver->playback_sample_format) / 8; - } else { - driver->interleave_unit = 0; /* NOT USED */ -- driver->playback_interleave_skip = -- snd_pcm_format_physical_width ( -- driver->playback_sample_format) / 8; - } - - if (driver->capture_interleaved) { -@@ -785,11 +796,6 @@ - driver->alsa_name_capture); - return -1; - } -- driver->capture_interleave_skip = my_areas[0].step / 8; -- } else { -- driver->capture_interleave_skip = -- snd_pcm_format_physical_width ( -- driver->capture_sample_format) / 8; - } - - if (driver->playback_nchannels > driver->capture_nchannels) { -@@ -819,6 +825,10 @@ - malloc (sizeof (char *) * driver->playback_nchannels); - memset (driver->playback_addr, 0, - sizeof (char *) * driver->playback_nchannels); -+ driver->playback_interleave_skip = (unsigned long *) -+ malloc (sizeof (unsigned long *) * driver->playback_nchannels); -+ memset (driver->playback_interleave_skip, 0, -+ sizeof (unsigned long *) * driver->playback_nchannels); - driver->silent = (unsigned long *) - malloc (sizeof (unsigned long) - * driver->playback_nchannels); -@@ -841,6 +851,10 @@ - malloc (sizeof (char *) * driver->capture_nchannels); - memset (driver->capture_addr, 0, - sizeof (char *) * driver->capture_nchannels); -+ driver->capture_interleave_skip = (unsigned long *) -+ malloc (sizeof (unsigned long *) * driver->capture_nchannels); -+ memset (driver->capture_interleave_skip, 0, -+ sizeof (unsigned long *) * driver->capture_nchannels); - } - - driver->clock_sync_data = (ClockSyncStatus *) -@@ -897,6 +911,7 @@ - &driver->capture_areas[chn]; - driver->capture_addr[chn] = (char *) a->addr - + ((a->first + a->step * *capture_offset) / 8); -+ driver->capture_interleave_skip[chn] = (unsigned long ) (a->step / 8); - } - } - -@@ -915,6 +930,7 @@ - &driver->playback_areas[chn]; - driver->playback_addr[chn] = (char *) a->addr - + ((a->first + a->step * *playback_offset) / 8); -+ driver->playback_interleave_skip[chn] = (unsigned long ) (a->step / 8); - } - } - -@@ -1991,6 +2007,8 @@ - - driver->playback_addr = 0; - driver->capture_addr = 0; -+ driver->playback_interleave_skip = NULL; -+ driver->capture_interleave_skip = NULL; - - - driver->silent = 0; -Only in jack-audio-connection-kit-0.100.0/drivers/alsa: alsa_driver.c.orig -diff -ru jack-audio-connection-kit-0.100.0.orig/drivers/alsa/alsa_driver.h jack-audio-connection-kit-0.100.0/drivers/alsa/alsa_driver.h ---- jack-audio-connection-kit-0.100.0.orig/drivers/alsa/alsa_driver.h 2005-09-23 19:33:25.000000000 +0200 -+++ jack-audio-connection-kit-0.100.0/drivers/alsa/alsa_driver.h 2005-09-23 19:34:11.000000000 +0200 -@@ -65,8 +65,8 @@ - unsigned int playback_nfds; - unsigned int capture_nfds; - unsigned long interleave_unit; -- unsigned long capture_interleave_skip; -- unsigned long playback_interleave_skip; -+ unsigned long *capture_interleave_skip; -+ unsigned long *playback_interleave_skip; - channel_t max_nchannels; - channel_t user_nchannels; - channel_t playback_nchannels; -@@ -155,7 +155,7 @@ - (driver->playback_addr[chn], - 0, nframes * driver->playback_sample_bytes, - driver->interleave_unit, -- driver->playback_interleave_skip); -+ driver->playback_interleave_skip[chn]); - } else { - memset (driver->playback_addr[chn], 0, - nframes * driver->playback_sample_bytes); -@@ -171,7 +171,7 @@ - (driver->playback_addr[chn], - 0, nframes * driver->playback_sample_bytes, - driver->interleave_unit, -- driver->playback_interleave_skip); -+ driver->playback_interleave_skip[chn]); - } else { - memset (driver->playback_addr[chn], 0, - nframes * driver->playback_sample_bytes); -@@ -187,7 +187,7 @@ - driver->read_via_copy (buf, - driver->capture_addr[channel], - nsamples, -- driver->capture_interleave_skip); -+ driver->capture_interleave_skip[channel]); - } - - static inline void -@@ -199,7 +199,7 @@ - driver->write_via_copy (driver->playback_addr[channel], - buf, - nsamples, -- driver->playback_interleave_skip, -+ driver->playback_interleave_skip[channel], - driver->dither_state+channel); - alsa_driver_mark_channel_done (driver, channel); - } -@@ -213,8 +213,8 @@ - driver->channel_copy (driver->playback_addr[output_channel], - driver->capture_addr[input_channel], - nsamples * driver->playback_sample_bytes, -- driver->playback_interleave_skip, -- driver->capture_interleave_skip); -+ driver->playback_interleave_skip[output_channel], -+ driver->capture_interleave_skip[input_channel]); - alsa_driver_mark_channel_done (driver, output_channel); - } - diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild deleted file mode 100644 index e94548e898c7..000000000000 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.101.1-r1.ebuild,v 1.17 2007/08/04 12:28:54 grobian Exp $ - -inherit flag-o-matic eutils multilib linux-info - -NETJACK=netjack-0.12rc1 - -DESCRIPTION="A low-latency audio server" -HOMEPAGE="http://www.jackaudio.org" -SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/${NETJACK}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sh sparc x86" -IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack cpudetection" - -RDEPEND="dev-util/pkgconfig - sndfile? ( >=media-libs/libsndfile-1.0.0 ) - sys-libs/ncurses - caps? ( sys-libs/libcap ) - portaudio? ( =media-libs/portaudio-18* ) - alsa? ( >=media-libs/alsa-lib-0.9.1 ) - !media-sound/jack-cvs" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - netjack? ( dev-util/scons )" - -pkg_setup() { - if ! use sndfile ; then - ewarn "sndfile not in USE flags. jack_rec will not be installed!" - fi - - if use caps; then - if kernel_is 2 4 ; then - elog "will build jackstart for 2.4 kernel" - else - elog "using compatibility symlink for jackstart" - fi - fi - - if use netjack; then - elog "including support for experimental netjack, see http://netjack.sourceforge.net/" - fi -} - -src_unpack() { - unpack ${A} - use netjack && unpack ${NETJACK}.tar.bz2 - cd ${S} - - # the docs option is in upstream, I'll leave the pentium2 foobage - # for the x86 folks...... kito@gentoo.org - - # Add doc option and fix --march=pentium2 in caps test - #epatch ${FILESDIR}/${PN}-doc-option.patch - - # compile and install jackstart, see #92895, #94887 - #if use caps ; then - # epatch ${FILESDIR}/${PN}-0.99.0-jackstart.patch - #fi - - epatch ${FILESDIR}/${PN}-transport.patch - epatch ${FILESDIR}/${PN}-mmap_complex.patch -} - -src_compile() { - local myconf - - sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure - - use doc && myconf="--with-html-dir=/usr/share/doc/${PF}" - - if use jack-tmpfs; then - myconf="${myconf} --with-default-tmpdir=/dev/shm" - else - myconf="${myconf} --with-default-tmpdir=/var/run/jack" - fi - - if [[ ${CHOST} == *-darwin* ]] ; then - append-flags -fno-common - use altivec && append-flags -force_cpusubtype_ALL \ - -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt - fi - - # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse. - # Also, without -O2 it will not compile as well. - # we test if it is present before enabling the configure flag. - if use cpudetection ; then - if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then - ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565." - elif (! grep sse /proc/cpuinfo >/dev/null) ; then - ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565." - elif (! grep mmx /proc/cpuinfo >/dev/null) ; then - ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565." - else - elog "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS." - myconf="${myconf} --enable-dynsimd" - - filter-flags -O* - append-flags -mmmx -msse -m3dnow -O2 - fi - fi - - use sndfile && \ - export SNDFILE_CFLAGS="-I/usr/include" \ - export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile" - - econf \ - $(use_enable altivec) \ - $(use_enable alsa) \ - $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \ - $(use_enable coreaudio) \ - $(use_enable debug) \ - $(use_enable doc html-docs) \ - $(use_enable mmx) \ - $(use_enable oss) \ - $(use_enable portaudio) \ - $(use_enable sse) \ - --with-pic \ - ${myconf} || die "configure failed" - emake || die "compilation failed" - - if use caps && kernel_is 2 4 ; then - elog "Building jackstart for 2.4 kernel" - cd ${S}/jackd - emake jackstart || die "jackstart build failed." - fi - - if use netjack; then - cd ${WORKDIR}/${NETJACK} - scons jack_source_dir=${S} - fi - -} - -src_install() { - make DESTDIR=${D} datadir=/usr/share/doc install || die - - if use caps; then - if kernel_is 2 4 ; then - cd ${S}/jackd - dobin jackstart - else - dosym /usr/bin/jackd /usr/bin/jackstart - fi - fi - - if ! use jack-tmpfs; then - keepdir /var/run/jack - chmod 4777 ${D}/var/run/jack - fi - - if use doc; then - mv ${D}/usr/share/doc/${PF}/reference/html \ - ${D}/usr/share/doc/${PF}/ - - insinto /usr/share/doc/${PF} - doins -r ${S}/example-clients - else - rm -rf ${D}/usr/share/doc - fi - - rm -rf ${D}/usr/share/doc/${PF}/reference - - if use netjack; then - cd ${WORKDIR}/${NETJACK} - dobin alsa_in - dobin alsa_out - dobin jacknet_client - insinto /usr/lib/jack - doins jack_net.so - fi -} diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild deleted file mode 100644 index 9b434d63b401..000000000000 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.102.20.ebuild,v 1.7 2007/08/04 12:28:54 grobian Exp $ - -inherit flag-o-matic eutils multilib linux-info - -NETJACK=netjack-0.12rc1 - -DESCRIPTION="A low-latency audio server" -HOMEPAGE="http://www.jackaudio.org" -SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz http://netjack.sourceforge.net/${NETJACK}.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm ia64 ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="altivec alsa caps coreaudio doc debug jack-tmpfs mmx oss portaudio sndfile sse netjack cpudetection" - -RDEPEND="dev-util/pkgconfig - sndfile? ( >=media-libs/libsndfile-1.0.0 ) - sys-libs/ncurses - caps? ( sys-libs/libcap ) - portaudio? ( =media-libs/portaudio-18* ) - alsa? ( >=media-libs/alsa-lib-0.9.1 ) - !media-sound/jack-cvs" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - netjack? ( dev-util/scons )" - -pkg_setup() { - if ! use sndfile ; then - ewarn "sndfile not in USE flags. jack_rec will not be installed!" - fi - - if use caps; then - if kernel_is 2 4 ; then - elog "will build jackstart for 2.4 kernel" - else - elog "using compatibility symlink for jackstart" - fi - fi - - if use netjack; then - elog "including support for experimental netjack, see http://netjack.sourceforge.net/" - fi -} - -src_unpack() { - unpack ${A} - use netjack && unpack ${NETJACK}.tar.bz2 - cd ${S} - - epatch ${FILESDIR}/${PN}-transport.patch -} - -src_compile() { - local myconf - - sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure - - use doc && myconf="--with-html-dir=/usr/share/doc/${PF}" - - if use jack-tmpfs; then - myconf="${myconf} --with-default-tmpdir=/dev/shm" - else - myconf="${myconf} --with-default-tmpdir=/var/run/jack" - fi - - if [[ ${CHOST} == *-darwin* ]] ; then - append-flags -fno-common - use altivec && append-flags -force_cpusubtype_ALL \ - -maltivec -mabi=altivec -mhard-float -mpowerpc-gfxopt - fi - - # CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse. - # Also, without -O2 it will not compile as well. - # we test if it is present before enabling the configure flag. - if use cpudetection ; then - if (! grep 3dnow /proc/cpuinfo >/dev/null) ; then - ewarn "Can't build cpudetection (dynsimd) without cpu 3dnow support. see bug #136565." - elif (! grep sse /proc/cpuinfo >/dev/null) ; then - ewarn "Can't build cpudetection (dynsimd) without cpu sse support. see bug #136565." - elif (! grep mmx /proc/cpuinfo >/dev/null) ; then - ewarn "Can't build cpudetection (dynsimd) without cpu mmx support. see bug #136565." - else - elog "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS." - myconf="${myconf} --enable-dynsimd" - - filter-flags -O* - append-flags -mmmx -msse -m3dnow -O2 - fi - fi - - use sndfile && \ - export SNDFILE_CFLAGS="-I/usr/include" \ - export SNDFILE_LIBS="-L/usr/$(get_libdir) -lsndfile" - - econf \ - $(use_enable altivec) \ - $(use_enable alsa) \ - $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \ - $(use_enable coreaudio) \ - $(use_enable debug) \ - $(use_enable doc html-docs) \ - $(use_enable mmx) \ - $(use_enable oss) \ - $(use_enable portaudio) \ - $(use_enable sse) \ - --with-pic \ - ${myconf} || die "configure failed" - emake || die "compilation failed" - - if use caps && kernel_is 2 4 ; then - elog "Building jackstart for 2.4 kernel" - cd ${S}/jackd - emake jackstart || die "jackstart build failed." - fi - - if use netjack; then - cd ${WORKDIR}/${NETJACK} - scons jack_source_dir=${S} - fi - -} - -src_install() { - make DESTDIR=${D} datadir=/usr/share/doc install || die - - if use caps; then - if kernel_is 2 4 ; then - cd ${S}/jackd - dobin jackstart - else - dosym /usr/bin/jackd /usr/bin/jackstart - fi - fi - - if ! use jack-tmpfs; then - keepdir /var/run/jack - chmod 4777 ${D}/var/run/jack - fi - - if use doc; then - mv ${D}/usr/share/doc/${PF}/reference/html \ - ${D}/usr/share/doc/${PF}/ - - insinto /usr/share/doc/${PF} - doins -r ${S}/example-clients - else - rm -rf ${D}/usr/share/doc - fi - - rm -rf ${D}/usr/share/doc/${PF}/reference - - if use netjack; then - cd ${WORKDIR}/${NETJACK} - dobin alsa_in - dobin alsa_out - dobin jacknet_client - insinto /usr/lib/jack - doins jack_net.so - fi -} diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild deleted file mode 100644 index 01fe9e7076af..000000000000 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild,v 1.12 2007/08/04 12:28:54 grobian Exp $ - -IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio" - -inherit flag-o-matic eutils - -DESCRIPTION="A low-latency audio server" -HOMEPAGE="http://jackit.sourceforge.net/" -SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sh sparc x86" - -RDEPEND=">=media-libs/libsndfile-1.0.0 - dev-libs/glib - dev-util/pkgconfig - sys-libs/ncurses - portaudio? ( media-libs/portaudio ) - alsa? ( >=media-libs/alsa-lib-0.9.1 ) - caps? ( sys-libs/libcap ) - !media-sound/jack-cvs" - -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd ${S} - - # Add doc option and fix --march=pentium2 in caps test - epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && WANT_AUTOCONF=2.5 autoconf \ - || die -} - -src_compile() { - local myconf - local myarch - - myarch=`get-flag -march` - - sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $myarch\"/" configure - use doc \ - && myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}" \ - || myconf="--disable-html-docs" - - if use jack-tmpfs; then - myconf="${myconf} --with-default-tmpdir=/dev/shm" - else - myconf="${myconf} --with-default-tmpdir=/var/run/jack" - fi - - use caps && myconf="${myconf} --enable-capabilities --enable-stripped-jackd" - use debug && myconf="${myconf} --enable-debug" - - myconf="${myconf} `use_enable altivec` `use_enable alsa` `use_enable oss` `use_enable portaudio`" - - econf ${myconf} || die "configure failed" - emake || die "compilation failed" -} - -src_install() { - make DESTDIR=${D} \ - datadir=${D}/usr/share \ - install || die - - if ! use jack-tmpfs; then - keepdir /var/run/jack - chmod 4777 ${D}/var/run/jack - fi - - if use doc; then - mv ${D}/usr/share/doc/${PF}/reference/html \ - ${D}/usr/share/doc/${PF}/ - fi - - rm -rf ${D}/usr/share/doc/${PF}/reference -} diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild deleted file mode 100644 index 0b705bd70a8b..000000000000 --- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r2.ebuild,v 1.7 2007/08/04 12:28:54 grobian Exp $ - -inherit flag-o-matic eutils - -DESCRIPTION="A low-latency audio server" -HOMEPAGE="http://jackit.sourceforge.net/" -SRC_URI="mirror://sourceforge/jackit/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86" -IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio" - -RDEPEND="dev-libs/glib - dev-util/pkgconfig - >=media-libs/libsndfile-1.0.0 - sys-libs/ncurses - caps? ( sys-libs/libcap ) - portaudio? ( media-libs/portaudio ) - alsa? ( >=media-libs/alsa-lib-0.9.1 ) - !media-sound/jack-cvs" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen )" - -src_unpack() { - unpack ${A} - cd ${S} - - # Add doc option and fix --march=pentium2 in caps test - epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && \ - WANT_AUTOCONF=2.5 autoconf - - # compile and install jackstart, see #92895 - epatch ${FILESDIR}/${P}-jackstart.patch -} - -src_compile() { - local myconf - - sed -i "s/^CFLAGS=\$JACK_CFLAGS/CFLAGS=\"\$JACK_CFLAGS $(get-flag -march)\"/" configure - - if use doc; then - myconf="--enable-html-docs --with-html-dir=/usr/share/doc/${PF}" - else - myconf="--disable-html-docs" - fi - - if use jack-tmpfs; then - myconf="${myconf} --with-default-tmpdir=/dev/shm" - else - myconf="${myconf} --with-default-tmpdir=/var/run/jack" - fi - - econf \ - $(use_enable altivec) \ - $(use_enable alsa) \ - $(use_enable caps capabilities) $(use_enable caps stripped-jackd) \ - $(use_enable debug) \ - $(use_enable oss) \ - $(use_enable portaudio) \ - ${myconf} || die "configure failed" - emake || die "compilation failed" -} - -src_install() { - make DESTDIR=${D} datadir=${D}/usr/share install || die - - if ! use jack-tmpfs; then - keepdir /var/run/jack - chmod 4777 ${D}/var/run/jack - fi - - if use doc; then - mv ${D}/usr/share/doc/${PF}/reference/html \ - ${D}/usr/share/doc/${PF}/ - - mv ${S}/example-clients \ - ${D}/usr/share/doc/${PF}/ - fi - - rm -rf ${D}/usr/share/doc/${PF}/reference -} |