rpms/sdlmame/F-10 .cvsignore, 1.25, 1.26 sdlmame.spec, 1.29, 1.30 sources, 1.26, 1.27
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32549
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Mon Dec 15 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-0.6.0128u6
- Updated to 0.128u6
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore 7 Dec 2008 09:35:40 -0000 1.25
+++ .cvsignore 15 Dec 2008 10:06:13 -0000 1.26
@@ -1 +1 @@
-sdlmame0128u5.zip
+sdlmame0128u6.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sdlmame.spec 7 Dec 2008 09:35:40 -0000 1.29
+++ sdlmame.spec 15 Dec 2008 10:06:13 -0000 1.30
@@ -1,4 +1,4 @@
-%define beta 0128u5
+%define beta 0128u6
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0129
-Release: 0.5.%{?beta}%{?dist}
+Release: 0.6.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -200,6 +200,9 @@
%changelog
+* Mon Dec 15 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-0.6.0128u6
+- Updated to 0.128u6
+
* Sun Dec 7 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0129-0.5.0128u5
- Updated to 0.128u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 7 Dec 2008 09:35:40 -0000 1.26
+++ sources 15 Dec 2008 10:06:13 -0000 1.27
@@ -1 +1 @@
-69f3261befda00472af2a00f782a89bb sdlmame0128u5.zip
+9503da032353a3f01c4d00ab56247d0a sdlmame0128u6.zip
15 years, 11 months
rpms/audacity-freeworld/devel audacity-1.3.6-ffmpeg-lib-search-path.patch, NONE, 1.1 audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch, NONE, 1.1 audacity-freeworld.spec, 1.6, 1.7
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31680
Modified Files:
audacity-freeworld.spec
Added Files:
audacity-1.3.6-ffmpeg-lib-search-path.patch
audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch
Log Message:
add ffmpeg and pulseaudio support patches and update to 1.3.6
audacity-1.3.6-ffmpeg-lib-search-path.patch:
--- NEW FILE audacity-1.3.6-ffmpeg-lib-search-path.patch ---
--- FFmpeg.h 2008/10/17 06:42:44 1.27
+++ audacity-src-1.3.6/src/FFmpeg.h 2008/12/02 05:07:11 1.33
@@ -30,14 +30,21 @@
* Audacity.h */
#if defined(USE_FFMPEG)
- extern "C" {
- #ifdef _STDINT_H
+ extern "C" {
+ #ifdef _STDINT_H
/* stdint.h has already been included. That's likely to break ffmpeg headers
- * as described above so we issue a warning */
- #warning "stdint.h included before ffmpeg headers, this may well not compile"
- #endif
+ * as described above so we issue a warning */
+ #warning "stdint.h included before ffmpeg headers, this might not compile"
+ #endif
+ #ifdef _STDINT_H_
+ /* as above but for Mac (mainly as a debugging tool) */
+ #warning "stdint.h included before ffmpeg headers, this might not compile"
+ #endif
+
#if !defined(__STDC_CONSTANT_MACROS)
#define __STDC_CONSTANT_MACROS
+ /* also defined on the compiler command line for autotools builds, so
+ * should only be here for windows builders */
#endif
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -74,14 +81,14 @@
//----------------------------------------------------------------------------
wxString GetFFmpegVersion(wxWindow *parent);
+/* from here on in, this stuff only applies when ffmpeg is available */
+#if defined(USE_FFMPEG)
+
//----------------------------------------------------------------------------
// Attempt to load and enable/disable FFmpeg at startup
//----------------------------------------------------------------------------
void FFmpegStartup();
-/* from here on in, this stuff only applies when ffmpeg is available */
-#if defined(USE_FFMPEG)
-
bool LoadFFmpeg(bool showerror);
/// If Audacity failed to load libav*, this dialog
@@ -242,10 +249,9 @@
return wxString::Format(wxT("F(%s),C(%s),U(%s)"),mAVFormatVersion.c_str(),mAVCodecVersion.c_str(),mAVUtilVersion.c_str());
}
- /* note these values are for Windows only - Mac and Unix have their own
- * sections elsewhere */
- //\todo { Section for Mac and *nix }
#if defined(__WXMSW__)
+ /* Library names and file filters for Windows only */
+
wxString GetLibraryTypeString()
{
return _("Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*");
@@ -260,10 +266,21 @@
{
return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dll"));
}
-#else //__WXMSW__
+
+ wxString GetLibAVCodecName()
+ {
+ return (wxT("avcodec-") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dll"));
+ }
+
+ wxString GetLibAVUtilName()
+ {
+ return (wxT("avutil-") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dll"));
+ }
+#elif defined(__WXMAC__)
+ /* Library names and file filters for Mac OS only */
wxString GetLibraryTypeString()
{
- return _("Only avformat.so|*avformat*.so*|Dynamically Linked Libraries (*.so)|*.so|All Files (*)|*");
+ return _("Only libavformat.*.dylib|libavformat.*.dylib|Dynamically Linked Libraries (*.dylib)|*.dylib|All Files (*)|*");
}
wxString GetLibAVFormatPath()
@@ -273,9 +290,47 @@
wxString GetLibAVFormatName()
{
- return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dll"));
+ return (wxT("libavformat.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR))
+ wxT(".dylib"));
+ }
+
+ wxString GetLibAVCodecName()
+ {
+ return (wxT("libavcodec.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dylib"));
+ }
+
+ wxString GetLibAVUtilName()
+ {
+ return (wxT("libavutil.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dylib"));
+ }
+#else
+ /* Library names and file filters for other platforms, basically Linux and
+ * other *nix platforms */
+ wxString GetLibraryTypeString()
+ {
+ return _("Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*");
+ }
+
+ wxString GetLibAVFormatPath()
+ {
+ return wxT("");
+ }
+
+ wxString GetLibAVFormatName()
+ {
+ return (wxT("libavformat.so.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)));
+ }
+
+ wxString GetLibAVCodecName()
+ {
+ return (wxT("libavcodec.so.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)));
+ }
+
+ wxString GetLibAVUtilName()
+ {
+ return (wxT("libavutil.so.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)));
}
-#endif //__WXMSW__
+#endif // (__WXMAC__) || (__WXMSW__)
/// Ugly reference counting. I thought of using wxStuff for that,
/// but decided that wx reference counting is not useful, since
audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch:
--- NEW FILE audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch ---
diff -ur audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c audacity-src-1.3.6/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
--- audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c 2007-09-12 19:39:48.000000000 +0200
+++ audacity-src-1.3.6/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c 2008-12-08 19:30:20.000000000 +0100
@@ -6,6 +6,7 @@
*
* Copyright (c) 2002 Joshua Haberman <joshua(a)haberman.com>
* Copyright (c) 2005-2007 Arve Knudsen <aknuds-1(a)broadpark.no>
+ * Copyright (c) 2008 Kevin Kofler <kevin.kofler(a)chello.at>
*
* Based on the Open Source API proposed by Ross Bencina
* Copyright (c) 1999-2002 Ross Bencina, Phil Burk
@@ -118,6 +119,8 @@
unsigned long framesPerBuffer;
int numUserChannels, numHostChannels;
int userInterleaved, hostInterleaved;
+ int canMmap;
+ void *nonMmapBuffer;
PaDeviceIndex device; /* Keep the device index */
snd_pcm_t *pcm;
@@ -321,7 +324,7 @@
* and a suitable result returned. The device is closed before returning.
*/
static PaError GropeDevice( snd_pcm_t* pcm, int isPlug, StreamDirection mode, int openBlocking,
- PaAlsaDeviceInfo* devInfo, int* canMmap )
+ PaAlsaDeviceInfo* devInfo )
{
PaError result = paNoError;
snd_pcm_hw_params_t *hwParams;
@@ -354,9 +357,6 @@
snd_pcm_hw_params_alloca( &hwParams );
snd_pcm_hw_params_any( pcm, hwParams );
- *canMmap = snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_INTERLEAVED ) >= 0 ||
- snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_NONINTERLEAVED ) >= 0;
-
if( defaultSr >= 0 )
{
/* Could be that the device opened in one mode supports samplerates that the other mode wont have,
@@ -566,7 +566,6 @@
PaError result = 0;
PaDeviceInfo *baseDeviceInfo = &devInfo->baseDeviceInfo;
snd_pcm_t *pcm;
- int canMmap = -1;
PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
/* Zero fields */
@@ -580,8 +579,7 @@
OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_CAPTURE, blocking, 0 )
>= 0 )
{
- if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo,
- &canMmap ) != paNoError )
+ if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo ) != paNoError )
{
/* Error */
PA_DEBUG(("%s: Failed groping %s for capture\n", __FUNCTION__, deviceName->alsaName));
@@ -594,8 +592,7 @@
OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_PLAYBACK, blocking, 0 )
>= 0 )
{
- if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo,
- &canMmap ) != paNoError )
+ if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo ) != paNoError )
{
/* Error */
PA_DEBUG(("%s: Failed groping %s for playback\n", __FUNCTION__, deviceName->alsaName));
@@ -603,12 +600,6 @@
}
}
- if( 0 == canMmap )
- {
- PA_DEBUG(("%s: Device %s doesn't support mmap\n", __FUNCTION__, deviceName->alsaName));
- goto end;
- }
-
baseDeviceInfo->structVersion = 2;
baseDeviceInfo->hostApi = alsaApi->hostApiIndex;
baseDeviceInfo->name = deviceName->name;
@@ -1197,6 +1188,8 @@
self->hostInterleaved = self->userInterleaved = !(userSampleFormat & paNonInterleaved);
self->numUserChannels = params->channelCount;
self->streamDir = streamDir;
+ self->canMmap = 0;
+ self->nonMmapBuffer = NULL;
if( !callbackMode && !self->userInterleaved )
{
@@ -1239,6 +1232,7 @@
PaError result = paNoError;
snd_pcm_access_t accessMode, alternateAccessMode;
+ snd_pcm_access_t rwAccessMode, alternateRwAccessMode;
int dir = 0;
snd_pcm_t *pcm = self->pcm;
double sr = *sampleRate;
@@ -1258,32 +1252,40 @@
if( self->userInterleaved )
{
accessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+ rwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
alternateAccessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+ alternateRwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
}
else
{
accessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+ rwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
alternateAccessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+ alternateRwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
}
/* If requested access mode fails, try alternate mode */
+ self->canMmap = 1;
if( snd_pcm_hw_params_set_access( pcm, hwParams, accessMode ) < 0 )
{
- int err = 0;
- if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode )) < 0)
+ if( snd_pcm_hw_params_set_access( pcm, hwParams, rwAccessMode ) >= 0 )
+ self->canMmap = 0;
+ else
{
- result = paUnanticipatedHostError;
- if( -EINVAL == err )
+ if( snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode ) < 0 )
{
- PaUtil_SetLastHostErrorInfo( paALSA, err, "PA ALSA requires that a device supports mmap access" );
- }
- else
- {
- PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+ int err = 0;
+ if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateRwAccessMode )) >= 0)
+ self->canMmap = 0;
+ else
+ {
+ result = paUnanticipatedHostError;
+ PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+ goto error;
+ }
}
- goto error;
+ /* Flip mode */
+ self->hostInterleaved = !self->userInterleaved;
}
- /* Flip mode */
- self->hostInterleaved = !self->userInterleaved;
}
ENSURE_( snd_pcm_hw_params_set_format( pcm, hwParams, self->nativeFormat ), paUnanticipatedHostError );
@@ -1361,7 +1363,7 @@
ENSURE_( snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
ENSURE_( snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError );
- ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_MMAP ), paUnanticipatedHostError );
+ ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_ENABLE ), paUnanticipatedHostError );
/* Set the parameters! */
ENSURE_( snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError );
@@ -1589,6 +1591,10 @@
}
}
+ /* non-mmap mode needs a reasonably-sized buffer or it'll stutter */
+ if( !self->canMmap && framesPerHostBuffer < 2048 )
+ framesPerHostBuffer = 2048;
+
assert( framesPerHostBuffer > 0 );
{
snd_pcm_uframes_t min = 0, max = 0;
@@ -1831,12 +1837,13 @@
PA_UNLESS( framesPerHostBuffer != 0, paInternalError );
self->maxFramesPerHostBuffer = framesPerHostBuffer;
- if( !accurate )
+ if( !self->playback.canMmap || !accurate )
{
/* Don't know the exact size per host buffer */
*hostBufferSizeMode = paUtilBoundedHostBufferSize;
/* Raise upper bound */
- ++self->maxFramesPerHostBuffer;
+ if( !accurate )
+ ++self->maxFramesPerHostBuffer;
}
error:
@@ -2059,9 +2066,11 @@
{
/* Buffer isn't primed, so prepare and silence */
ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
- SilenceBuffer( stream );
+ if( stream->playback.canMmap )
+ SilenceBuffer( stream );
}
- ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
+ if( stream->playback.canMmap )
+ ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
}
else
ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
@@ -2390,6 +2399,7 @@
snd_pcm_status_t *st;
PaTime now = PaUtil_GetTime();
snd_timestamp_t t;
+ int errplayback = 0, errcapture = 0;
snd_pcm_status_alloca( &st );
@@ -2400,6 +2410,7 @@
{
snd_pcm_status_get_trigger_tstamp( st, &t );
self->underrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+ errplayback = snd_pcm_recover( self->playback.pcm, -EPIPE, 0 );
}
}
if( self->capture.pcm )
@@ -2409,10 +2420,12 @@
{
snd_pcm_status_get_trigger_tstamp( st, &t );
self->overrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+ errcapture = snd_pcm_recover( self->capture.pcm, -EPIPE, 0 );
}
}
- PA_ENSURE( AlsaRestart( self ) );
+ if( errplayback || errcapture )
+ PA_ENSURE( AlsaRestart( self ) );
end:
return result;
@@ -2563,7 +2576,7 @@
static PaError PaAlsaStreamComponent_EndProcessing( PaAlsaStreamComponent *self, unsigned long numFrames, int *xrun )
{
PaError result = paNoError;
- int res;
+ int res = 0;
/* @concern FullDuplex It is possible that only one direction is marked ready after polling, and processed
* afterwards
@@ -2571,7 +2584,34 @@
if( !self->ready )
goto end;
- res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+ if( !self->canMmap && StreamDirection_Out == self->streamDir )
+ {
+ /* Play sound */
+ if( self->hostInterleaved )
+ res = snd_pcm_writei( self->pcm, self->nonMmapBuffer, numFrames );
+ else
+ {
+ void *bufs[self->numHostChannels];
+ int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+ unsigned char *buffer = self->nonMmapBuffer;
+ int i;
+ for( i = 0; i < self->numHostChannels; ++i )
+ {
+ bufs[i] = buffer;
+ buffer += bufsize;
+ }
+ res = snd_pcm_writen( self->pcm, bufs, numFrames );
+ }
+ }
+
+ if( self->canMmap )
+ res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+ else
+ {
+ free( self->nonMmapBuffer );
+ self->nonMmapBuffer = NULL;
+ }
+
if( res == -EPIPE || res == -ESTRPIPE )
{
*xrun = 1;
@@ -2611,7 +2651,7 @@
if( self->hostInterleaved )
{
int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
- unsigned char *buffer = ExtractAddress( self->channelAreas, self->offset );
+ unsigned char *buffer = self->canMmap ? ExtractAddress( self->channelAreas, self->offset ) : self->nonMmapBuffer;
/* Start after the last user channel */
p = buffer + self->numUserChannels * swidth;
@@ -2991,13 +3031,23 @@
goto end;
}
- ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+ if( self->canMmap )
+ {
+ ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+ /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
+ self->channelAreas = (snd_pcm_channel_area_t *)areas;
+ }
+ else
+ {
+ free( self->nonMmapBuffer );
+ self->nonMmapBuffer = calloc( self->numHostChannels, snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 ) );
+ }
if( self->hostInterleaved )
{
int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
- p = buffer = ExtractAddress( areas, self->offset );
+ p = buffer = self->canMmap ? ExtractAddress( areas, self->offset ) : self->nonMmapBuffer;
for( i = 0; i < self->numUserChannels; ++i )
{
/* We're setting the channels up to userChannels, but the stride will be hostChannels samples */
@@ -3007,16 +3057,52 @@
}
else
{
- for( i = 0; i < self->numUserChannels; ++i )
+ if( self->canMmap )
+ for( i = 0; i < self->numUserChannels; ++i )
+ {
+ area = areas + i;
+ buffer = ExtractAddress( area, self->offset );
+ setChannel( bp, i, buffer, 1 );
+ }
+ else
{
- area = areas + i;
- buffer = ExtractAddress( area, self->offset );
- setChannel( bp, i, buffer, 1 );
+ int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+ buffer = self->nonMmapBuffer;
+ for( i = 0; i < self->numUserChannels; ++i )
+ {
+ setChannel( bp, i, buffer, 1 );
+ buffer += bufsize;
+ }
}
}
- /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
- self->channelAreas = (snd_pcm_channel_area_t *)areas;
+ if( !self->canMmap && StreamDirection_In == self->streamDir )
+ {
+ /* Read sound */
+ int res;
+ if( self->hostInterleaved )
+ res = snd_pcm_readi( self->pcm, self->nonMmapBuffer, *numFrames );
+ else
+ {
+ void *bufs[self->numHostChannels];
+ int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+ unsigned char *buffer = self->nonMmapBuffer;
+ int i;
+ for( i = 0; i < self->numHostChannels; ++i )
+ {
+ bufs[i] = buffer;
+ buffer += bufsize;
+ }
+ res = snd_pcm_readn( self->pcm, bufs, *numFrames );
+ }
+ if( res == -EPIPE || res == -ESTRPIPE )
+ {
+ *xrun = 1;
+ *numFrames = 0;
+ free( self->nonMmapBuffer );
+ self->nonMmapBuffer = NULL;
+ }
+ }
end:
error:
diff -ur audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c audacity-src-1.3.6/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c
--- audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c 2006-08-26 10:27:53.000000000 +0200
+++ audacity-src-1.3.6/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c 2008-11-09 04:51:04.000000000 +0100
@@ -75,4 +75,8 @@
0 /* NULL terminated array */
};
+#if defined(PA_USE_OSS) && defined(PA_USE_ALSA)
+int paDefaultHostApiIndex = 1;
+#else
int paDefaultHostApiIndex = 0;
+#endif
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- audacity-freeworld.spec 23 Nov 2008 13:29:40 -0000 1.6
+++ audacity-freeworld.spec 15 Dec 2008 09:56:17 -0000 1.7
@@ -3,7 +3,7 @@
Name: audacity-freeworld
Version: 1.3.6
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -15,7 +15,9 @@
#Patch1: audacity-1.3.4-libdir.patch
Patch2: audacity-1.3.5-gcc43.patch
-Patch3: audacity-1.3.4-libmp3lame-default.patch
+#Patch3: audacity-1.3.4-libmp3lame-default.patch
+Patch4: audacity-1.3.6-ffmpeg-lib-search-path.patch
+Patch5: audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch
# for 1.3.2-beta
Source100: http://downloads.sf.net/sourceforge/audacity/audacity-src-1.3.2.tar.gz
@@ -43,6 +45,7 @@
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
+BuildRequires: ffmpeg-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: jack-audio-connection-kit-devel
@@ -56,14 +59,15 @@
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: libmad-devel
+BuildRequires: lame-devel
-# for 1.3.5-beta
+# for 1.3.6-beta
BuildRequires: wxGTK2-devel
# for 1.3.2-beta
BuildRequires: compat-wxGTK26-devel
-Requires: lame-libs
+##Requires: lame-libs
%description
@@ -85,7 +89,7 @@
# Substitute hardcoded library paths.
#%%patch1 -p1
-%patch3 -p1
+#%%patch3 -p1
for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp src/AudacityApp.cpp lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
@@ -95,6 +99,11 @@
%patch2 -p1 -b .gcc43
#%%patch4 -p1 -b .fr
+%patch4 -p1 -b .ffmpeg-library-search-path
+
+# apply Kevin Kofler's portaudio-pulseaudio patch
+%patch5 -p1 -b .portaudio-pulseaudio-rev4-pathfix
+
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
@@ -102,6 +111,12 @@
sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
done
+# clear executable permissions on src files that go to -debuginfo
+chmod a-x lib-src/FileDialog/FileDialog.*
+chmod a-x lib-src/FileDialog/gtk/FileDialogPrivate.*
+chmod a-x src/FileIO.* src/UploadDialog.*
+chmod a-x src/widgets/HtmlWindow.cpp src/widgets/ProgressDialog.*
+
cd -
@@ -150,6 +165,12 @@
# for wxGTK26-compat
sed -i -e 's!wx-config!wx-2.6-config!g' configure
+# clear executable permissions on src files that go to -debuginfo
+chmod a-x lib-src/allegro/allegro.*
+chmod a-x lib-src/allegro/mfallegro.*
+chmod a-x lib-src/allegro/mfmidi.*
+chmod a-x src/UploadDialog.*
+
cd -
@@ -166,7 +187,8 @@
--with-id3tag=system \
--with-expat=system \
--with-soundtouch=system \
- --with-libmad=system
+ --with-libmad=system \
+ --with-ffmpeg=system
# _smp_mflags cause problems
make
cd -
@@ -243,10 +265,15 @@
%changelog
+* Sun Dec 14 2008 David Timms <iinet.net.au@dtimms> - 1.3.6-0.2.beta
+- add Kevin Koflers portaudio patch to allow output via pulseaudio
+
* Sun Nov 23 2008 David Timms <iinet.net.au@dtimms> - 1.3.6-0.1.beta
- update to new upstream beta release
- drop libdir patch for now
- drop upstreamed fr.po patch
+- add support for ffmpeg import and export via BR and --with-ffmpeg
+- add patch to allow selection of ffmpeg library on unix.
* Thu Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.4.beta
- mod patch2 apply command
15 years, 11 months
rpms/audacity-freeworld/F-10 audacity-1.3.6-ffmpeg-lib-search-path.patch, NONE, 1.1 audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch, NONE, 1.1 audacity-freeworld.spec, 1.6, 1.7
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30155
Modified Files:
audacity-freeworld.spec
Added Files:
audacity-1.3.6-ffmpeg-lib-search-path.patch
audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch
Log Message:
add ffmpeg and pulseaudio support patches and update to 1.3.6
audacity-1.3.6-ffmpeg-lib-search-path.patch:
--- NEW FILE audacity-1.3.6-ffmpeg-lib-search-path.patch ---
--- FFmpeg.h 2008/10/17 06:42:44 1.27
+++ audacity-src-1.3.6/src/FFmpeg.h 2008/12/02 05:07:11 1.33
@@ -30,14 +30,21 @@
* Audacity.h */
#if defined(USE_FFMPEG)
- extern "C" {
- #ifdef _STDINT_H
+ extern "C" {
+ #ifdef _STDINT_H
/* stdint.h has already been included. That's likely to break ffmpeg headers
- * as described above so we issue a warning */
- #warning "stdint.h included before ffmpeg headers, this may well not compile"
- #endif
+ * as described above so we issue a warning */
+ #warning "stdint.h included before ffmpeg headers, this might not compile"
+ #endif
+ #ifdef _STDINT_H_
+ /* as above but for Mac (mainly as a debugging tool) */
+ #warning "stdint.h included before ffmpeg headers, this might not compile"
+ #endif
+
#if !defined(__STDC_CONSTANT_MACROS)
#define __STDC_CONSTANT_MACROS
+ /* also defined on the compiler command line for autotools builds, so
+ * should only be here for windows builders */
#endif
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -74,14 +81,14 @@
//----------------------------------------------------------------------------
wxString GetFFmpegVersion(wxWindow *parent);
+/* from here on in, this stuff only applies when ffmpeg is available */
+#if defined(USE_FFMPEG)
+
//----------------------------------------------------------------------------
// Attempt to load and enable/disable FFmpeg at startup
//----------------------------------------------------------------------------
void FFmpegStartup();
-/* from here on in, this stuff only applies when ffmpeg is available */
-#if defined(USE_FFMPEG)
-
bool LoadFFmpeg(bool showerror);
/// If Audacity failed to load libav*, this dialog
@@ -242,10 +249,9 @@
return wxString::Format(wxT("F(%s),C(%s),U(%s)"),mAVFormatVersion.c_str(),mAVCodecVersion.c_str(),mAVUtilVersion.c_str());
}
- /* note these values are for Windows only - Mac and Unix have their own
- * sections elsewhere */
- //\todo { Section for Mac and *nix }
#if defined(__WXMSW__)
+ /* Library names and file filters for Windows only */
+
wxString GetLibraryTypeString()
{
return _("Only avformat.dll|*avformat*.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*");
@@ -260,10 +266,21 @@
{
return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dll"));
}
-#else //__WXMSW__
+
+ wxString GetLibAVCodecName()
+ {
+ return (wxT("avcodec-") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dll"));
+ }
+
+ wxString GetLibAVUtilName()
+ {
+ return (wxT("avutil-") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dll"));
+ }
+#elif defined(__WXMAC__)
+ /* Library names and file filters for Mac OS only */
wxString GetLibraryTypeString()
{
- return _("Only avformat.so|*avformat*.so*|Dynamically Linked Libraries (*.so)|*.so|All Files (*)|*");
+ return _("Only libavformat.*.dylib|libavformat.*.dylib|Dynamically Linked Libraries (*.dylib)|*.dylib|All Files (*)|*");
}
wxString GetLibAVFormatPath()
@@ -273,9 +290,47 @@
wxString GetLibAVFormatName()
{
- return (wxT("avformat-") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)) wxT(".dll"));
+ return (wxT("libavformat.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR))
+ wxT(".dylib"));
+ }
+
+ wxString GetLibAVCodecName()
+ {
+ return (wxT("libavcodec.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)) wxT(".dylib"));
+ }
+
+ wxString GetLibAVUtilName()
+ {
+ return (wxT("libavutil.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)) wxT(".dylib"));
+ }
+#else
+ /* Library names and file filters for other platforms, basically Linux and
+ * other *nix platforms */
+ wxString GetLibraryTypeString()
+ {
+ return _("Only libavformat.so|libavformat.so*|Dynamically Linked Libraries (*.so*)|*.so*|All Files (*)|*");
+ }
+
+ wxString GetLibAVFormatPath()
+ {
+ return wxT("");
+ }
+
+ wxString GetLibAVFormatName()
+ {
+ return (wxT("libavformat.so.") wxT(AV_STRINGIFY(LIBAVFORMAT_VERSION_MAJOR)));
+ }
+
+ wxString GetLibAVCodecName()
+ {
+ return (wxT("libavcodec.so.") wxT(AV_STRINGIFY(LIBAVCODEC_VERSION_MAJOR)));
+ }
+
+ wxString GetLibAVUtilName()
+ {
+ return (wxT("libavutil.so.") wxT(AV_STRINGIFY(LIBAVUTIL_VERSION_MAJOR)));
}
-#endif //__WXMSW__
+#endif // (__WXMAC__) || (__WXMSW__)
/// Ugly reference counting. I thought of using wxStuff for that,
/// but decided that wx reference counting is not useful, since
audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch:
--- NEW FILE audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch ---
diff -ur audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c audacity-src-1.3.6/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c
--- audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c 2007-09-12 19:39:48.000000000 +0200
+++ audacity-src-1.3.6/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c 2008-12-08 19:30:20.000000000 +0100
@@ -6,6 +6,7 @@
*
* Copyright (c) 2002 Joshua Haberman <joshua(a)haberman.com>
* Copyright (c) 2005-2007 Arve Knudsen <aknuds-1(a)broadpark.no>
+ * Copyright (c) 2008 Kevin Kofler <kevin.kofler(a)chello.at>
*
* Based on the Open Source API proposed by Ross Bencina
* Copyright (c) 1999-2002 Ross Bencina, Phil Burk
@@ -118,6 +119,8 @@
unsigned long framesPerBuffer;
int numUserChannels, numHostChannels;
int userInterleaved, hostInterleaved;
+ int canMmap;
+ void *nonMmapBuffer;
PaDeviceIndex device; /* Keep the device index */
snd_pcm_t *pcm;
@@ -321,7 +324,7 @@
* and a suitable result returned. The device is closed before returning.
*/
static PaError GropeDevice( snd_pcm_t* pcm, int isPlug, StreamDirection mode, int openBlocking,
- PaAlsaDeviceInfo* devInfo, int* canMmap )
+ PaAlsaDeviceInfo* devInfo )
{
PaError result = paNoError;
snd_pcm_hw_params_t *hwParams;
@@ -354,9 +357,6 @@
snd_pcm_hw_params_alloca( &hwParams );
snd_pcm_hw_params_any( pcm, hwParams );
- *canMmap = snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_INTERLEAVED ) >= 0 ||
- snd_pcm_hw_params_test_access( pcm, hwParams, SND_PCM_ACCESS_MMAP_NONINTERLEAVED ) >= 0;
-
if( defaultSr >= 0 )
{
/* Could be that the device opened in one mode supports samplerates that the other mode wont have,
@@ -566,7 +566,6 @@
PaError result = 0;
PaDeviceInfo *baseDeviceInfo = &devInfo->baseDeviceInfo;
snd_pcm_t *pcm;
- int canMmap = -1;
PaUtilHostApiRepresentation *baseApi = &alsaApi->baseHostApiRep;
/* Zero fields */
@@ -580,8 +579,7 @@
OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_CAPTURE, blocking, 0 )
>= 0 )
{
- if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo,
- &canMmap ) != paNoError )
+ if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_In, blocking, devInfo ) != paNoError )
{
/* Error */
PA_DEBUG(("%s: Failed groping %s for capture\n", __FUNCTION__, deviceName->alsaName));
@@ -594,8 +592,7 @@
OpenPcm( &pcm, deviceName->alsaName, SND_PCM_STREAM_PLAYBACK, blocking, 0 )
>= 0 )
{
- if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo,
- &canMmap ) != paNoError )
+ if( GropeDevice( pcm, deviceName->isPlug, StreamDirection_Out, blocking, devInfo ) != paNoError )
{
/* Error */
PA_DEBUG(("%s: Failed groping %s for playback\n", __FUNCTION__, deviceName->alsaName));
@@ -603,12 +600,6 @@
}
}
- if( 0 == canMmap )
- {
- PA_DEBUG(("%s: Device %s doesn't support mmap\n", __FUNCTION__, deviceName->alsaName));
- goto end;
- }
-
baseDeviceInfo->structVersion = 2;
baseDeviceInfo->hostApi = alsaApi->hostApiIndex;
baseDeviceInfo->name = deviceName->name;
@@ -1197,6 +1188,8 @@
self->hostInterleaved = self->userInterleaved = !(userSampleFormat & paNonInterleaved);
self->numUserChannels = params->channelCount;
self->streamDir = streamDir;
+ self->canMmap = 0;
+ self->nonMmapBuffer = NULL;
if( !callbackMode && !self->userInterleaved )
{
@@ -1239,6 +1232,7 @@
PaError result = paNoError;
snd_pcm_access_t accessMode, alternateAccessMode;
+ snd_pcm_access_t rwAccessMode, alternateRwAccessMode;
int dir = 0;
snd_pcm_t *pcm = self->pcm;
double sr = *sampleRate;
@@ -1258,32 +1252,40 @@
if( self->userInterleaved )
{
accessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+ rwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
alternateAccessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+ alternateRwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
}
else
{
accessMode = SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
+ rwAccessMode = SND_PCM_ACCESS_RW_NONINTERLEAVED;
alternateAccessMode = SND_PCM_ACCESS_MMAP_INTERLEAVED;
+ alternateRwAccessMode = SND_PCM_ACCESS_RW_INTERLEAVED;
}
/* If requested access mode fails, try alternate mode */
+ self->canMmap = 1;
if( snd_pcm_hw_params_set_access( pcm, hwParams, accessMode ) < 0 )
{
- int err = 0;
- if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode )) < 0)
+ if( snd_pcm_hw_params_set_access( pcm, hwParams, rwAccessMode ) >= 0 )
+ self->canMmap = 0;
+ else
{
- result = paUnanticipatedHostError;
- if( -EINVAL == err )
+ if( snd_pcm_hw_params_set_access( pcm, hwParams, alternateAccessMode ) < 0 )
{
- PaUtil_SetLastHostErrorInfo( paALSA, err, "PA ALSA requires that a device supports mmap access" );
- }
- else
- {
- PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+ int err = 0;
+ if( (err = snd_pcm_hw_params_set_access( pcm, hwParams, alternateRwAccessMode )) >= 0)
+ self->canMmap = 0;
+ else
+ {
+ result = paUnanticipatedHostError;
+ PaUtil_SetLastHostErrorInfo( paALSA, err, snd_strerror( err ) );
+ goto error;
+ }
}
- goto error;
+ /* Flip mode */
+ self->hostInterleaved = !self->userInterleaved;
}
- /* Flip mode */
- self->hostInterleaved = !self->userInterleaved;
}
ENSURE_( snd_pcm_hw_params_set_format( pcm, hwParams, self->nativeFormat ), paUnanticipatedHostError );
@@ -1361,7 +1363,7 @@
ENSURE_( snd_pcm_sw_params_set_avail_min( self->pcm, swParams, self->framesPerBuffer ), paUnanticipatedHostError );
ENSURE_( snd_pcm_sw_params_set_xfer_align( self->pcm, swParams, 1 ), paUnanticipatedHostError );
- ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_MMAP ), paUnanticipatedHostError );
+ ENSURE_( snd_pcm_sw_params_set_tstamp_mode( self->pcm, swParams, SND_PCM_TSTAMP_ENABLE ), paUnanticipatedHostError );
/* Set the parameters! */
ENSURE_( snd_pcm_sw_params( self->pcm, swParams ), paUnanticipatedHostError );
@@ -1589,6 +1591,10 @@
}
}
+ /* non-mmap mode needs a reasonably-sized buffer or it'll stutter */
+ if( !self->canMmap && framesPerHostBuffer < 2048 )
+ framesPerHostBuffer = 2048;
+
assert( framesPerHostBuffer > 0 );
{
snd_pcm_uframes_t min = 0, max = 0;
@@ -1831,12 +1837,13 @@
PA_UNLESS( framesPerHostBuffer != 0, paInternalError );
self->maxFramesPerHostBuffer = framesPerHostBuffer;
- if( !accurate )
+ if( !self->playback.canMmap || !accurate )
{
/* Don't know the exact size per host buffer */
*hostBufferSizeMode = paUtilBoundedHostBufferSize;
/* Raise upper bound */
- ++self->maxFramesPerHostBuffer;
+ if( !accurate )
+ ++self->maxFramesPerHostBuffer;
}
error:
@@ -2059,9 +2066,11 @@
{
/* Buffer isn't primed, so prepare and silence */
ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
- SilenceBuffer( stream );
+ if( stream->playback.canMmap )
+ SilenceBuffer( stream );
}
- ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
+ if( stream->playback.canMmap )
+ ENSURE_( snd_pcm_start( stream->playback.pcm ), paUnanticipatedHostError );
}
else
ENSURE_( snd_pcm_prepare( stream->playback.pcm ), paUnanticipatedHostError );
@@ -2390,6 +2399,7 @@
snd_pcm_status_t *st;
PaTime now = PaUtil_GetTime();
snd_timestamp_t t;
+ int errplayback = 0, errcapture = 0;
snd_pcm_status_alloca( &st );
@@ -2400,6 +2410,7 @@
{
snd_pcm_status_get_trigger_tstamp( st, &t );
self->underrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+ errplayback = snd_pcm_recover( self->playback.pcm, -EPIPE, 0 );
}
}
if( self->capture.pcm )
@@ -2409,10 +2420,12 @@
{
snd_pcm_status_get_trigger_tstamp( st, &t );
self->overrun = now * 1000 - ((PaTime) t.tv_sec * 1000 + (PaTime) t.tv_usec / 1000);
+ errcapture = snd_pcm_recover( self->capture.pcm, -EPIPE, 0 );
}
}
- PA_ENSURE( AlsaRestart( self ) );
+ if( errplayback || errcapture )
+ PA_ENSURE( AlsaRestart( self ) );
end:
return result;
@@ -2563,7 +2576,7 @@
static PaError PaAlsaStreamComponent_EndProcessing( PaAlsaStreamComponent *self, unsigned long numFrames, int *xrun )
{
PaError result = paNoError;
- int res;
+ int res = 0;
/* @concern FullDuplex It is possible that only one direction is marked ready after polling, and processed
* afterwards
@@ -2571,7 +2584,34 @@
if( !self->ready )
goto end;
- res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+ if( !self->canMmap && StreamDirection_Out == self->streamDir )
+ {
+ /* Play sound */
+ if( self->hostInterleaved )
+ res = snd_pcm_writei( self->pcm, self->nonMmapBuffer, numFrames );
+ else
+ {
+ void *bufs[self->numHostChannels];
+ int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+ unsigned char *buffer = self->nonMmapBuffer;
+ int i;
+ for( i = 0; i < self->numHostChannels; ++i )
+ {
+ bufs[i] = buffer;
+ buffer += bufsize;
+ }
+ res = snd_pcm_writen( self->pcm, bufs, numFrames );
+ }
+ }
+
+ if( self->canMmap )
+ res = snd_pcm_mmap_commit( self->pcm, self->offset, numFrames );
+ else
+ {
+ free( self->nonMmapBuffer );
+ self->nonMmapBuffer = NULL;
+ }
+
if( res == -EPIPE || res == -ESTRPIPE )
{
*xrun = 1;
@@ -2611,7 +2651,7 @@
if( self->hostInterleaved )
{
int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
- unsigned char *buffer = ExtractAddress( self->channelAreas, self->offset );
+ unsigned char *buffer = self->canMmap ? ExtractAddress( self->channelAreas, self->offset ) : self->nonMmapBuffer;
/* Start after the last user channel */
p = buffer + self->numUserChannels * swidth;
@@ -2991,13 +3031,23 @@
goto end;
}
- ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+ if( self->canMmap )
+ {
+ ENSURE_( snd_pcm_mmap_begin( self->pcm, &areas, &self->offset, numFrames ), paUnanticipatedHostError );
+ /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
+ self->channelAreas = (snd_pcm_channel_area_t *)areas;
+ }
+ else
+ {
+ free( self->nonMmapBuffer );
+ self->nonMmapBuffer = calloc( self->numHostChannels, snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 ) );
+ }
if( self->hostInterleaved )
{
int swidth = snd_pcm_format_size( self->nativeFormat, 1 );
- p = buffer = ExtractAddress( areas, self->offset );
+ p = buffer = self->canMmap ? ExtractAddress( areas, self->offset ) : self->nonMmapBuffer;
for( i = 0; i < self->numUserChannels; ++i )
{
/* We're setting the channels up to userChannels, but the stride will be hostChannels samples */
@@ -3007,16 +3057,52 @@
}
else
{
- for( i = 0; i < self->numUserChannels; ++i )
+ if( self->canMmap )
+ for( i = 0; i < self->numUserChannels; ++i )
+ {
+ area = areas + i;
+ buffer = ExtractAddress( area, self->offset );
+ setChannel( bp, i, buffer, 1 );
+ }
+ else
{
- area = areas + i;
- buffer = ExtractAddress( area, self->offset );
- setChannel( bp, i, buffer, 1 );
+ int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+ buffer = self->nonMmapBuffer;
+ for( i = 0; i < self->numUserChannels; ++i )
+ {
+ setChannel( bp, i, buffer, 1 );
+ buffer += bufsize;
+ }
}
}
- /* @concern ChannelAdaption Buffer address is recorded so we can do some channel adaption later */
- self->channelAreas = (snd_pcm_channel_area_t *)areas;
+ if( !self->canMmap && StreamDirection_In == self->streamDir )
+ {
+ /* Read sound */
+ int res;
+ if( self->hostInterleaved )
+ res = snd_pcm_readi( self->pcm, self->nonMmapBuffer, *numFrames );
+ else
+ {
+ void *bufs[self->numHostChannels];
+ int bufsize = snd_pcm_format_size( self->nativeFormat, self->framesPerBuffer + 1 );
+ unsigned char *buffer = self->nonMmapBuffer;
+ int i;
+ for( i = 0; i < self->numHostChannels; ++i )
+ {
+ bufs[i] = buffer;
+ buffer += bufsize;
+ }
+ res = snd_pcm_readn( self->pcm, bufs, *numFrames );
+ }
+ if( res == -EPIPE || res == -ESTRPIPE )
+ {
+ *xrun = 1;
+ *numFrames = 0;
+ free( self->nonMmapBuffer );
+ self->nonMmapBuffer = NULL;
+ }
+ }
end:
error:
diff -ur audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c audacity-src-1.3.6/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c
--- audacity-src-1.3.6.orig/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c 2006-08-26 10:27:53.000000000 +0200
+++ audacity-src-1.3.6/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c 2008-11-09 04:51:04.000000000 +0100
@@ -75,4 +75,8 @@
0 /* NULL terminated array */
};
+#if defined(PA_USE_OSS) && defined(PA_USE_ALSA)
+int paDefaultHostApiIndex = 1;
+#else
int paDefaultHostApiIndex = 0;
+#endif
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-10/audacity-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- audacity-freeworld.spec 23 Nov 2008 13:29:40 -0000 1.6
+++ audacity-freeworld.spec 15 Dec 2008 09:35:10 -0000 1.7
@@ -3,7 +3,7 @@
Name: audacity-freeworld
Version: 1.3.6
-Release: 0.1.beta%{?dist}
+Release: 0.2.beta%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -15,7 +15,9 @@
#Patch1: audacity-1.3.4-libdir.patch
Patch2: audacity-1.3.5-gcc43.patch
-Patch3: audacity-1.3.4-libmp3lame-default.patch
+#Patch3: audacity-1.3.4-libmp3lame-default.patch
+Patch4: audacity-1.3.6-ffmpeg-lib-search-path.patch
+Patch5: audacity-1.3.6-portaudio-pulseaudio-rev4-pathfix.patch
# for 1.3.2-beta
Source100: http://downloads.sf.net/sourceforge/audacity/audacity-src-1.3.2.tar.gz
@@ -43,6 +45,7 @@
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
+BuildRequires: ffmpeg-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: jack-audio-connection-kit-devel
@@ -56,14 +59,15 @@
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: libmad-devel
+BuildRequires: lame-devel
-# for 1.3.5-beta
+# for 1.3.6-beta
BuildRequires: wxGTK2-devel
# for 1.3.2-beta
BuildRequires: compat-wxGTK26-devel
-Requires: lame-libs
+##Requires: lame-libs
%description
@@ -85,7 +89,7 @@
# Substitute hardcoded library paths.
#%%patch1 -p1
-%patch3 -p1
+#%%patch3 -p1
for i in src/effects/ladspa/LoadLadspa.cpp src/export/ExportMP3.cpp src/AudacityApp.cpp lib-src/libvamp/vamp-sdk/PluginHostAdapter.cpp
do
sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' $i
@@ -95,6 +99,11 @@
%patch2 -p1 -b .gcc43
#%%patch4 -p1 -b .fr
+%patch4 -p1 -b .ffmpeg-library-search-path
+
+# apply Kevin Kofler's portaudio-pulseaudio patch
+%patch5 -p1 -b .portaudio-pulseaudio-rev4-pathfix
+
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
@@ -102,6 +111,12 @@
sed -i -e 's!libmp3lame.so\([^.]\)!libmp3lame.so.0\1!g' $i
done
+# clear executable permissions on src files that go to -debuginfo
+chmod a-x lib-src/FileDialog/FileDialog.*
+chmod a-x lib-src/FileDialog/gtk/FileDialogPrivate.*
+chmod a-x src/FileIO.* src/UploadDialog.*
+chmod a-x src/widgets/HtmlWindow.cpp src/widgets/ProgressDialog.*
+
cd -
@@ -150,6 +165,12 @@
# for wxGTK26-compat
sed -i -e 's!wx-config!wx-2.6-config!g' configure
+# clear executable permissions on src files that go to -debuginfo
+chmod a-x lib-src/allegro/allegro.*
+chmod a-x lib-src/allegro/mfallegro.*
+chmod a-x lib-src/allegro/mfmidi.*
+chmod a-x src/UploadDialog.*
+
cd -
@@ -166,7 +187,8 @@
--with-id3tag=system \
--with-expat=system \
--with-soundtouch=system \
- --with-libmad=system
+ --with-libmad=system \
+ --with-ffmpeg=system
# _smp_mflags cause problems
make
cd -
@@ -243,10 +265,15 @@
%changelog
+* Sun Dec 14 2008 David Timms <iinet.net.au@dtimms> - 1.3.6-0.2.beta
+- add Kevin Koflers portaudio patch to allow output via pulseaudio
+
* Sun Nov 23 2008 David Timms <iinet.net.au@dtimms> - 1.3.6-0.1.beta
- update to new upstream beta release
- drop libdir patch for now
- drop upstreamed fr.po patch
+- add support for ffmpeg import and export via BR and --with-ffmpeg
+- add patch to allow selection of ffmpeg library on unix.
* Thu Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.4.beta
- mod patch2 apply command
15 years, 11 months
rpms/ffmpeg/devel ffmpeg.spec,1.10,1.11
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15265
Modified Files:
ffmpeg.spec
Log Message:
- drop leftover patch lines
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ffmpeg.spec 14 Dec 2008 19:03:09 -0000 1.10
+++ ffmpeg.spec 14 Dec 2008 19:04:58 -0000 1.11
@@ -12,7 +12,6 @@
URL: http://ffmpeg.org/
Source0: http://rpm.greysector.net/livna/%{name}-%{svn}.tar.bz2
Source1: %{name}-snapshot.sh
-Patch0: %{name}-pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
@@ -109,7 +108,6 @@
%prep
%setup -q -n %{name}-%{svn}
-%patch0 -p1 -b .p
%build
mkdir generic
15 years, 11 months
rpms/ffmpeg/devel .cvsignore, 1.6, 1.7 ffmpeg.spec, 1.9, 1.10 sources, 1.6, 1.7 ffmpeg-pkgconfig.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15138
Modified Files:
.cvsignore ffmpeg.spec sources
Removed Files:
ffmpeg-pkgconfig.patch
Log Message:
* Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20081214
- 20081214 snapshot
- change the lib split on x86, it doesn't work right for P3/AthlonXP
- specfile cleanups
- enable bzlib, dirac and speex support via external libs
- sort BR list alphabetically
- drop upstream'd patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 4 Dec 2008 20:15:31 -0000 1.6
+++ .cvsignore 14 Dec 2008 19:03:09 -0000 1.7
@@ -1 +1 @@
-ffmpeg-20081202.tar.bz2
+ffmpeg-20081214.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ffmpeg.spec 12 Dec 2008 20:24:25 -0000 1.9
+++ ffmpeg.spec 14 Dec 2008 19:03:09 -0000 1.10
@@ -1,12 +1,12 @@
# TODO: add make test to %%check section
-%define svn 20081202
+%define svn 20081214
%define faad2min 1:2.6.1
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.4.9
-Release: 0.54.%{svn}%{?dist}
+Release: 0.55.%{svn}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://ffmpeg.org/
@@ -16,19 +16,23 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel}
-BuildRequires: zlib-devel
+BuildRequires: bzip2-devel
+BuildRequires: dirac-devel
+BuildRequires: faac-devel
+BuildRequires: faad2-devel >= %{faad2min}
+BuildRequires: gsm-devel
+BuildRequires: imlib2-devel
BuildRequires: lame-devel
BuildRequires: libdc1394-devel
-BuildRequires: libvorbis-devel
BuildRequires: libtheora-devel
-BuildRequires: faad2-devel >= %{faad2min}
-BuildRequires: xvidcore-devel
+BuildRequires: libvorbis-devel
+BuildRequires: schroedinger-devel
BuildRequires: SDL-devel
-BuildRequires: gsm-devel
-BuildRequires: imlib2-devel
+BuildRequires: speex-devel
BuildRequires: texi2html
-BuildRequires: faac-devel
BuildRequires: x264-devel >= 0.0.0-0.14.20080613
+BuildRequires: xvidcore-devel
+BuildRequires: zlib-devel
#don't enable on x86_64 until PIC issues on are fixed (in libavcodec/i386/fft_mmx.asm)
%ifarch %{ix86}
BuildRequires: yasm
@@ -76,11 +80,15 @@
--arch=%{_target_cpu} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_amr:--enable-libamr-nb --enable-libamr-wb --enable-nonfree} \\\
+ --enable-bzlib \\\
--enable-libdc1394 \\\
+ --enable-libdirac \\\
--enable-libfaac \\\
--enable-libfaad \\\
--enable-libgsm \\\
--enable-libmp3lame \\\
+ --enable-libschroedinger \\\
+ --enable-libspeex \\\
--enable-libtheora \\\
--enable-libvorbis \\\
--enable-libx264 \\\
@@ -110,7 +118,6 @@
--shlibdir=%{_libdir} \
%ifarch %{ix86}
--cpu=%{_target_cpu} \
- --disable-mmx \
%endif
%ifarch ppc ppc64
--disable-altivec \
@@ -122,22 +129,19 @@
make %{?_smp_mflags}
popd
+mkdir simd
+pushd simd
%ifarch %{ix86}
-mkdir sse2
-pushd sse2
%{ff_configure}\
- --shlibdir=%{_libdir}/sse2 \
+ --shlibdir=%{_libdir}/i686 \
--cpu=i686 \
--disable-ffmpeg \
--disable-ffserver \
--disable-ffplay \
make %{?_smp_mflags}
-popd
%endif
%ifarch ppc
-mkdir altivec
-pushd altivec
%{ff_configure}\
--shlibdir=%{_libdir}/altivec \
--cpu=g4 \
@@ -146,11 +150,9 @@
--disable-ffserver \
--disable-ffplay \
-popd
+make %{?_smp_mflags}
%endif
%ifarch ppc64
-mkdir altivec
-pushd altivec
%{ff_configure}\
--shlibdir=%{_libdir}/altivec \
--cpu=g5 \
@@ -159,11 +161,9 @@
--disable-ffserver \
--disable-ffplay \
-popd
+make %{?_smp_mflags}
%endif
%ifarch sparc sparc64
-mkdir vis
-pushd vis
%{ff_configure}\
--shlibdir=%{_libdir}/v9 \
--cpu=v9 \
@@ -172,29 +172,26 @@
--disable-ffserver \
--disable-ffplay \
-popd
+make %{?_smp_mflags}
%endif
+popd
%install
rm -rf $RPM_BUILD_ROOT __doc
pushd generic
make install DESTDIR=$RPM_BUILD_ROOT
popd
+pushd simd
%ifarch %{ix86}
-pushd sse2
make install DESTDIR=$RPM_BUILD_ROOT
-popd
%endif
%ifarch ppc ppc64
-pushd altivec
make install DESTDIR=$RPM_BUILD_ROOT
-popd
%endif
%ifarch sparc sparc64
-pushd vis
make install DESTDIR=$RPM_BUILD_ROOT
-popd
%endif
+popd
cp -a doc __doc
rm -f __doc/{Makefile,*.{1,pl,texi}}
@@ -223,8 +220,8 @@
%{_libdir}/lib*.so.*
%{_libdir}/vhook/
%ifarch %{ix86}
-%{_libdir}/sse2/lib*.so.*
-%{_libdir}/sse2/vhook/
+%{_libdir}/i686/lib*.so.*
+%{_libdir}/i686/vhook/
%endif
%ifarch ppc ppc64
%{_libdir}/altivec/lib*.so.*
@@ -241,7 +238,7 @@
%{_libdir}/pkgconfig/lib*.pc
%{_libdir}/lib*.so
%ifarch %{ix86}
-%{_libdir}/sse2/lib*.so
+%{_libdir}/i686/lib*.so
%endif
%ifarch ppc ppc64
%{_libdir}/altivec/lib*.so
@@ -252,6 +249,14 @@
%changelog
+* Sun Dec 14 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.55.20081214
+- 20081214 snapshot
+- change the lib split on x86, it doesn't work right for P3/AthlonXP
+- specfile cleanups
+- enable bzlib, dirac and speex support via external libs
+- sort BR list alphabetically
+- drop upstream'd patch
+
* Thu Dec 11 2008 Dominik Mierzejewski <rpm at greysector.net> - 0.4.9-0.54.20081202
- fix pkgconfig file generation
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 4 Dec 2008 20:15:31 -0000 1.6
+++ sources 14 Dec 2008 19:03:09 -0000 1.7
@@ -1 +1 @@
-231d71e5cc6101ac8fb8403b76758877 ffmpeg-20081202.tar.bz2
+eb90bfeda4ea39ff3c6b92806909a5be ffmpeg-20081214.tar.bz2
--- ffmpeg-pkgconfig.patch DELETED ---
15 years, 11 months
rpms/x264/devel x264.spec,1.7,1.8
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15032
Modified Files:
x264.spec
Log Message:
* Sat Dec 13 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.21.20081213git9089d21
- fix the libs split on x86
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- x264.spec 13 Dec 2008 13:48:28 -0000 1.7
+++ x264.spec 14 Dec 2008 19:02:08 -0000 1.8
@@ -4,7 +4,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.20.%{snapshot}git%{git}%{?dist}
+Release: 0.21.%{snapshot}git%{git}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
@@ -48,11 +48,9 @@
%define x_configure \
./configure \\\
- --host=%{_target_platform} \\\
--prefix=%{_prefix} \\\
--exec-prefix=%{_exec_prefix} \\\
--bindir=%{_bindir} \\\
- --libdir=%{_libdir} \\\
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
--enable-mp4-output \\\
@@ -69,15 +67,39 @@
# AUTHORS file is in iso-8859-1
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
mv -f AUTHORS.utf8 AUTHORS
+%ifarch %{ix86}
+mkdir simd
+cp -a `ls -1|grep -v simd` simd/
+%endif
%build
-%{x_configure}
+%{x_configure}\
+ --host=%{_target_platform} \
+ --libdir=%{_libdir} \
+%ifarch %{ix86}
+ --disable-asm \
+%endif
%{__make} %{?_smp_mflags}
+%ifarch %{ix86}
+pushd simd
+%{x_configure}\
+ --host=`echo %{_target_platform}|sed -e 's/i.86/i686/'` \
+ --libdir=%{_libdir}/i686 \
+
+%{__make} %{?_smp_mflags}
+popd
+%endif
%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
+%ifarch %{ix86}
+pushd simd
+%{__make} DESTDIR=%{buildroot} install
+rm %{buildroot}%{_libdir}/i686/pkgconfig/x264.pc
+popd
+%endif
%clean
%{__rm} -rf %{buildroot}
@@ -94,6 +116,9 @@
%files libs
%defattr(644, root, root, 0755)
%{_libdir}/libx264.so.*
+%ifarch %{ix86}
+%{_libdir}/i686/libx264.so.*
+%endif
%files devel
%defattr(644, root, root, 0755)
@@ -101,8 +126,14 @@
%{_includedir}/x264.h
%{_libdir}/libx264.so
%{_libdir}/pkgconfig/%{name}.pc
+%ifarch %{ix86}
+%{_libdir}/i686/libx264.so
+%endif
%changelog
+* Sat Dec 13 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.21.20081213git9089d21
+- fix the libs split on x86
+
* Sat Dec 13 2008 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.20.20081213git9089d21
- 20081213 snapshot
- drop the libs split on x86, it doesn't work right for P3/AthlonXP
15 years, 11 months
rpms/wl-kmod/devel wl-kmod.spec,1.8,1.9
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/wl-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11884
Modified Files:
wl-kmod.spec
Log Message:
* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.6
- rebuild for latest Fedora kernel;
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/devel/wl-kmod.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wl-kmod.spec 22 Nov 2008 13:49:15 -0000 1.8
+++ wl-kmod.spec 14 Dec 2008 18:09:31 -0000 1.9
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: wl-kmod
Version: 5.10.27.6
-Release: 5%{?dist}.5
+Release: 5%{?dist}.6
Summary: Kernel module for broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -84,6 +84,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.6
+- rebuild for latest Fedora kernel;
+
* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.5
- rebuild for latest Fedora kernel;
15 years, 11 months
rpms/slmodem-kmod/devel slmodem-kmod.spec,1.11,1.12
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/slmodem-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11763
Modified Files:
slmodem-kmod.spec
Log Message:
* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.11
- rebuild for latest Fedora kernel;
Index: slmodem-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/devel/slmodem-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- slmodem-kmod.spec 22 Nov 2008 20:52:15 -0000 1.11
+++ slmodem-kmod.spec 14 Dec 2008 18:09:16 -0000 1.12
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
%define filever 2.9.11-20080817
%define datetag 20080817
@@ -12,7 +12,7 @@
Name: slmodem-kmod
Version: 2.9.11
-Release: 26%{?dist}.10
+Release: 26%{?dist}.11
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.11
+- rebuild for latest Fedora kernel;
+
* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.10
- rebuilt
15 years, 11 months
rpms/rt2870-kmod/devel rt2870-kmod.spec,1.11,1.12
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rt2870-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11571
Modified Files:
rt2870-kmod.spec
Log Message:
* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.0.0-2.1
- rebuild for latest Fedora kernel;
Index: rt2870-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/rt2870-kmod/devel/rt2870-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rt2870-kmod.spec 4 Dec 2008 18:08:02 -0000 1.11
+++ rt2870-kmod.spec 14 Dec 2008 18:09:03 -0000 1.12
@@ -3,11 +3,11 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: rt2870-kmod
Version: 1.4.0.0
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Kernel module for wireless devices with Ralink's rt2870 chipsets
Group: System Environment/Kernel
@@ -72,6 +72,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.4.0.0-2.1
+- rebuild for latest Fedora kernel;
+
* Thu Dec 04 2008 Orcan Ogetbil <orcanbahri [AT] yahoo [DOT] com> - 1.4.0.0-2
- removed the iwe-stream patch since it is not needed for 2.6.27+ kernels
15 years, 11 months
rpms/nvidia-kmod/devel nvidia-kmod.spec,1.12,1.13
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11542
Modified Files:
nvidia-kmod.spec
Log Message:
* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.5
- rebuild for latest Fedora kernel;
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nvidia-kmod.spec 22 Nov 2008 20:26:51 -0000 1.12
+++ nvidia-kmod.spec 14 Dec 2008 18:09:01 -0000 1.13
@@ -3,12 +3,12 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-#define buildforkernels newest
+%define buildforkernels newest
Name: nvidia-kmod
Version: 177.82
# Taken over by kmodtool
-Release: 1%{?dist}.4
+Release: 1%{?dist}.5
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -94,6 +94,9 @@
%changelog
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.5
+- rebuild for latest Fedora kernel;
+
* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 177.82-1.4
- rebuilt
15 years, 11 months