rpmfusion-commits
December 2011
rpmfusion-commits@lists.rpmfusion.org
- 21 participants
- 268 discussions
rpms/audacity-freeworld/F-15 audacity-1.3.14-ffmpeg-0.8.patch, NONE, 1.1 audacity-1.3.14-gtypes.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 audacity-freeworld.spec, 1.18, 1.19 sources, 1.8, 1.9
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12559
Modified Files:
.cvsignore audacity-freeworld.spec sources
Added Files:
audacity-1.3.14-ffmpeg-0.8.patch audacity-1.3.14-gtypes.patch
Log Message:
update to 1.3.14 beta release
add ffmpeg-0.8 patch from Leland Lucius
add test patch to workaround gtypes-include problem
audacity-1.3.14-ffmpeg-0.8.patch:
FFmpeg.cpp | 92 ++++++++++++++++++++++++++++++------------------
FFmpeg.h | 67 +++++++++++++++++++++++++++++++---
export/ExportFFmpeg.cpp | 27 +++++++++++++-
import/ImportFFmpeg.cpp | 16 +++++++-
4 files changed, 159 insertions(+), 43 deletions(-)
--- NEW FILE audacity-1.3.14-ffmpeg-0.8.patch ---
Index: src/FFmpeg.h
===================================================================
--- src/FFmpeg.h (revision 11286)
+++ src/FFmpeg.h (working copy)
@@ -47,6 +47,21 @@
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)
#define AVSampleFormat SampleFormat
#endif
+
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 120, 0)
+ #define CodecType AVMediaType
+ #define CODEC_TYPE_UNKNOWN AVMEDIA_TYPE_UNKNOWN
+ #define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
+ #define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
+ #define CODEC_TYPE_DATA AVMEDIA_TYPE_DATA
+ #define CODEC_TYPE_SUBTITLE AVMEDIA_TYPE_SUBTITLE
+ #define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
+ #define CODEC_TYPE_NB AVMEDIA_TYPE_NB
+ #endif
+
+ #ifndef PKT_FLAG_KEY
+ #define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+ #endif
}
#endif
@@ -505,20 +520,23 @@
(AVCodecContext *avctx, AVCodec *codec),
(avctx, codec);
);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
FFMPEG_FUNCTION_WITH_RETURN(
int,
+ avcodec_decode_audio3,
+ (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
+ (avctx, samples, frame_size_ptr, avpkt)
+ );
+#else
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
avcodec_decode_audio2,
(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size),
(avctx, samples, frame_size_ptr, buf, buf_size)
);
+#endif
FFMPEG_FUNCTION_WITH_RETURN(
int,
- avcodec_decode_audio3,
- (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
- (avctx, samples, frame_size_ptr, avpkt)
- );
- FFMPEG_FUNCTION_WITH_RETURN(
- int,
avcodec_encode_audio,
(AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples),
(avctx, buf, buf_size, samples)
@@ -556,13 +574,22 @@
(void),
()
);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
FFMPEG_FUNCTION_WITH_RETURN(
void*,
av_fast_realloc,
(void *ptr, unsigned int *size, unsigned int min_size),
(ptr, size, min_size)
);
+#else
FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_fast_realloc,
+ (void *ptr, unsigned int *size, size_t min_size),
+ (ptr, size, min_size)
+ );
+#endif
+ FFMPEG_FUNCTION_WITH_RETURN(
int,
av_open_input_stream,
(AVFormatContext **ic_ptr, AVIOContext *pb, const char *filename, AVInputFormat *fmt, AVFormatParameters *ap),
@@ -744,12 +771,21 @@
(AVFifoBuffer *f),
(f)
);
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 0, 0)
FFMPEG_FUNCTION_WITH_RETURN(
void*,
av_malloc,
(unsigned int size),
(size)
);
+#else
+ FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_malloc,
+ (size_t size),
+ (size)
+ );
+#endif
FFMPEG_FUNCTION_NO_RETURN(
av_freep,
(void *ptr),
@@ -761,11 +797,16 @@
(int64_t a, AVRational bq, AVRational cq),
(a, bq, cq)
);
+
+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
FFMPEG_FUNCTION_NO_RETURN(
av_free_packet,
(AVPacket *pkt),
(pkt)
);
+#endif
+
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
FFMPEG_FUNCTION_WITH_RETURN(
AVFifoBuffer*,
av_fifo_alloc,
@@ -778,8 +819,22 @@
(AVFifoBuffer *f, void *buf, int buf_size, void (*func)(void*, void*, int)),
(f, buf, buf_size, func)
);
+#else
FFMPEG_FUNCTION_WITH_RETURN(
int,
+ av_fifo_init,
+ (AVFifoBuffer *f, unsigned int size),
+ (f, size)
+ );
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
+ av_fifo_generic_read,
+ (AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest),
+ (f, buf_size, func, dest)
+ );
+#endif
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
av_fifo_realloc2,
(AVFifoBuffer *f, unsigned int size),
(f, size)
Index: src/FFmpeg.cpp
===================================================================
--- src/FFmpeg.cpp (revision 11286)
+++ src/FFmpeg.cpp (working copy)
@@ -186,9 +186,15 @@
return AVERROR(ENOMEM);
}
- if (flags & URL_RDWR) {
+ // LLL: These really should be logical AND tests, but on 2011/04/28, the URL_ open flags
+ // changed in the FFmpeg source to values that were not compatible with previous
+ // values.
+ //
+ // Since Audacity doesn't use any other open flags (there aren't any others defined
+ // anyway), making equality tests works for older and new FFmpeg headers.
+ if (flags == URL_RDWR) {
mode = wxFile::read_write;
- } else if (flags & URL_WRONLY) {
+ } else if (flags == URL_WRONLY) {
mode = wxFile::write;
} else {
mode = wxFile::read;
@@ -222,6 +228,10 @@
{
wxSeekMode mode = wxFromStart;
+#if !defined(AVSEEK_FORCE)
+#define AVSEEK_FORCE 0
+#endif
+
switch (whence & ~AVSEEK_FORCE)
{
case (SEEK_SET):
@@ -316,7 +326,7 @@
pd.buf_size = 0;
pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
if (pd.buf == NULL) {
- err = AVERROR_NOMEM;
+ err = AVERROR(ENOMEM);
goto fail;
}
@@ -381,7 +391,7 @@
// Didn't find a suitable format, so bail
if (!fmt) {
- err = AVERROR_NOFMT;
+ err = AVERROR(EILSEQ);
goto fail;
}
@@ -847,39 +857,53 @@
FFMPEG_INITALT(avformat, av_guess_format, guess_format);
FFMPEG_INITALT(avformat, av_match_ext, match_ext);
- FFMPEG_INITDYN(codec, av_init_packet);
- FFMPEG_INITDYN(codec, av_free_packet);
- FFMPEG_INITDYN(codec, avcodec_init);
- FFMPEG_INITDYN(codec, avcodec_find_encoder);
- FFMPEG_INITDYN(codec, avcodec_find_encoder_by_name);
- FFMPEG_INITDYN(codec, avcodec_find_decoder);
- FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
- FFMPEG_INITDYN(codec, avcodec_open);
- FFMPEG_INITDYN(codec, avcodec_decode_audio2);
- FFMPEG_INITDYN(codec, avcodec_decode_audio3);
- FFMPEG_INITDYN(codec, avcodec_encode_audio);
- FFMPEG_INITDYN(codec, avcodec_close);
- FFMPEG_INITDYN(codec, avcodec_register_all);
- FFMPEG_INITDYN(codec, avcodec_version);
- FFMPEG_INITDYN(codec, av_fast_realloc);
- FFMPEG_INITDYN(codec, av_codec_next);
- FFMPEG_INITDYN(codec, av_get_bits_per_sample_format);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 58, 0)
+ FFMPEG_INITDYN(avcodec, av_init_packet);
+#else
+ FFMPEG_INITDYN(avformat, av_init_packet);
+#endif
+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
+ FFMPEG_INITDYN(avcodec, av_free_packet);
+#endif
+ FFMPEG_INITDYN(avcodec, avcodec_init);
+ FFMPEG_INITDYN(avcodec, avcodec_find_encoder);
+ FFMPEG_INITDYN(avcodec, avcodec_find_encoder_by_name);
+ FFMPEG_INITDYN(avcodec, avcodec_find_decoder);
+ FFMPEG_INITDYN(avcodec, avcodec_get_context_defaults);
+ FFMPEG_INITDYN(avcodec, avcodec_open);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
+ FFMPEG_INITDYN(avcodec, avcodec_decode_audio3);
+#else
+ FFMPEG_INITDYN(avcodec, avcodec_decode_audio2);
+#endif
+ FFMPEG_INITDYN(avcodec, avcodec_encode_audio);
+ FFMPEG_INITDYN(avcodec, avcodec_close);
+ FFMPEG_INITDYN(avcodec, avcodec_register_all);
+ FFMPEG_INITDYN(avcodec, avcodec_version);
+ FFMPEG_INITDYN(avcodec, av_fast_realloc);
+ FFMPEG_INITDYN(avcodec, av_codec_next);
+ FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
+
FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
- FFMPEG_INITDYN(util, av_free);
- FFMPEG_INITDYN(util, av_log_set_callback);
- FFMPEG_INITDYN(util, av_log_default_callback);
- FFMPEG_INITDYN(util, av_fifo_alloc);
- FFMPEG_INITDYN(util, av_fifo_generic_read);
- FFMPEG_INITDYN(util, av_fifo_realloc2);
- FFMPEG_INITDYN(util, av_fifo_free);
- FFMPEG_INITDYN(util, av_fifo_size);
- FFMPEG_INITDYN(util, av_malloc);
- FFMPEG_INITDYN(util, av_fifo_generic_write);
- FFMPEG_INITDYN(util, av_freep);
- FFMPEG_INITDYN(util, av_rescale_q);
- FFMPEG_INITDYN(util, avutil_version);
+ FFMPEG_INITDYN(avutil, av_free);
+ FFMPEG_INITDYN(avutil, av_log_set_callback);
+ FFMPEG_INITDYN(avutil, av_log_default_callback);
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ FFMPEG_INITDYN(avutil, av_fifo_alloc);
+#else
+ FFMPEG_INITDYN(avutil, av_fifo_init);
+#endif
+ FFMPEG_INITDYN(avutil, av_fifo_generic_read);
+ FFMPEG_INITDYN(avutil, av_fifo_realloc2);
+ FFMPEG_INITDYN(avutil, av_fifo_free);
+ FFMPEG_INITDYN(avutil, av_fifo_size);
+ FFMPEG_INITDYN(avutil, av_malloc);
+ FFMPEG_INITDYN(avutil, av_fifo_generic_write);
+ FFMPEG_INITDYN(avutil, av_freep);
+ FFMPEG_INITDYN(avutil, av_rescale_q);
+ FFMPEG_INITDYN(avutil, avutil_version);
//FFmpeg initialization
wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
Index: src/import/ImportFFmpeg.cpp
===================================================================
--- src/import/ImportFFmpeg.cpp (revision 11286)
+++ src/import/ImportFFmpeg.cpp (working copy)
@@ -808,9 +808,12 @@
}
}
+
+ sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
+
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
// avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
// also returns the number of bytes it decoded in the same parameter.
- sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
AVPacket avpkt;
av_init_packet(&avpkt);
avpkt.data = pDecode;
@@ -820,7 +823,16 @@
(int16_t *)sc->m_decodedAudioSamples, // out
&sc->m_decodedAudioSamplesValidSiz, // in/out
&avpkt); // in
-
+#else
+ // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
+ // also returns the number of bytes it decoded in the same parameter.
+ nBytesDecoded =
+ avcodec_decode_audio2(sc->m_codecCtx,
+ (int16_t *) sc->m_decodedAudioSamples, // out
+ &sc->m_decodedAudioSamplesValidSiz, // in/out
+ pDecode, // in
+ nDecodeSiz); // in
+#endif
if (nBytesDecoded < 0)
{
// Decoding failed. Don't stop.
Index: src/export/ExportFFmpeg.cpp
===================================================================
--- src/export/ExportFFmpeg.cpp (revision 11286)
+++ src/export/ExportFFmpeg.cpp (working copy)
@@ -154,6 +154,10 @@
AVFifoBuffer * mEncAudioFifo; // FIFO to write incoming audio samples into
uint8_t * mEncAudioFifoOutBuf; // buffer to read _out_ of the FIFO into
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
+ AVFifoBuffer mEncAudioFifoBuffer; // FIFO to write incoming audio samples into
+#endif
+
wxString mName;
int mSubFormat;
@@ -174,6 +178,11 @@
#define MAX_AUDIO_PACKET_SIZE (128 * 1024)
mEncAudioEncodedBufSiz = 4*MAX_AUDIO_PACKET_SIZE;
mEncAudioFifoOutBuf = NULL; // buffer to read _out_ of the FIFO into
+
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
+ mEncAudioFifo = &mEncAudioFifoBuffer;
+#endif
+
mSampleRate = 0;
mSupportsUTF8 = true;
@@ -350,7 +359,6 @@
mEncAudioCodecCtx = mEncAudioStream->codec;
avcodec_get_context_defaults(mEncAudioCodecCtx);
-
mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
@@ -403,7 +411,9 @@
mEncAudioCodecCtx->flags2 = 0;
if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
+#endif
mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
@@ -487,7 +497,11 @@
// The encoder may require a minimum number of raw audio samples for each encoding but we can't
// guarantee we'll get this minimum each time an audio frame is decoded from the input file so
// we use a FIFO to store up incoming raw samples until we have enough for one call to the codec.
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
mEncAudioFifo = av_fifo_alloc(1024);
+#else
+ av_fifo_init(mEncAudioFifo, 1024);
+#endif
// Allocate a buffer to read OUT of the FIFO into. The FIFO maintains its own buffer internally.
if ((mEncAudioFifoOutBuf = (uint8_t*)av_malloc(2*MAX_AUDIO_PACKET_SIZE)) == NULL)
@@ -544,7 +558,11 @@
nFifoBytes, mEncAudioCodecCtx->frame_size);
// Pull the bytes out from the FIFO and feed them to the encoder.
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
if (av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nFifoBytes, NULL) == 0)
+#else
+ if (av_fifo_generic_read(mEncAudioFifo, nFifoBytes, NULL, mEncAudioFifoOutBuf) == 0)
+#endif
{
if (mEncAudioCodecCtx->frame_size != 1)
nEncodedBytes = avcodec_encode_audio(mEncAudioCodecCtx, mEncAudioEncodedBuf, mEncAudioEncodedBufSiz, (int16_t*)mEncAudioFifoOutBuf);
@@ -609,7 +627,10 @@
av_free(mEncAudioFifoOutBuf);
av_fifo_free(mEncAudioFifo);
+
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
mEncAudioFifo = NULL;
+#endif
return true;
}
@@ -635,7 +656,11 @@
// Read raw audio samples out of the FIFO in nAudioFrameSizeOut byte-sized groups to encode.
while ((ret = av_fifo_size(mEncAudioFifo)) >= nAudioFrameSizeOut)
{
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
ret = av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nAudioFrameSizeOut, NULL);
+#else
+ ret = av_fifo_generic_read(mEncAudioFifo, nAudioFrameSizeOut, NULL, mEncAudioFifoOutBuf);
+#endif
av_init_packet(&pkt);
audacity-1.3.14-gtypes.patch:
AudacityApp.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE audacity-1.3.14-gtypes.patch ---
--- src/AudacityApp.cpp.orig 2011-11-04 10:44:41.016958277 +1100
+++ src/AudacityApp.cpp 2011-11-01 17:15:19.000000000 +1100
@@ -406,7 +406,7 @@
* Happily we can avoid the hack, as we only need some of the headers, not
* the full GTK headers
*/
-#include <glib/gtypes.h>
+//#include <glib/gtypes.h>
#include <glib-object.h>
typedef struct _GnomeProgram GnomeProgram;
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-15/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 26 Apr 2011 13:20:05 -0000 1.8
+++ .cvsignore 13 Dec 2011 08:48:27 -0000 1.9
@@ -1 +1 @@
-audacity-minsrc-1.3.13-beta.tar.bz2
+audacity-minsrc-1.3.14-beta.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-15/audacity-freeworld.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- audacity-freeworld.spec 5 May 2011 11:52:22 -0000 1.18
+++ audacity-freeworld.spec 13 Dec 2011 08:48:27 -0000 1.19
@@ -1,17 +1,26 @@
+# Compile options:
+# --with mp3 : enable mp3 support
+
Name: audacity-freeworld
-Version: 1.3.13
-Release: 0.4.beta%{?dist}
+Version: 1.3.14
+Release: 0.5%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
URL: http://audacity.sourceforge.net
-%define tartopdir audacity-src-%{version}-beta
%define realname audacity
Conflicts: %{realname}
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
+# use for upstream source releases:
+#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-1.3.14-beta.tar.bz2
+%define tartopdir audacity-src-%{version}-beta
+
+# use for svn snapshot: [see package README for generation process]
+#Source0: audacity-minsrc-1.3.14-alpha-20111101.tar.bz2
+#%#define tartopdir audacity-src-%{version}-alpha-20111101
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
@@ -20,6 +29,8 @@
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-1.3.13-desktop.in.patch
+Patch4: audacity-1.3.14-gtypes.patch
+Patch5: audacity-1.3.14-ffmpeg-0.8.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -81,6 +92,8 @@
done
%patch3 -b .desktop.old
+%patch4 -b .gtypes
+%patch5 -b .ffmpeg.old
%build
@@ -151,6 +164,18 @@
%changelog
+* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.5
+- fix Source1 help reference (again).
+
+* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.4
+- update to 1.3.14 beta release
+
+* Thu Dec 8 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.3.alpha20111101svn11296
+- add ffmpeg-0.8 patch from Leland Lucius
+- add test patch to workaround gtypes-include problem
+
+* Tue Nov 1 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.1.alpha20111101svn11296
+- update to 1.3.14 alpha svn snapshot
* Sat Apr 30 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.4.beta
- fix files and dir ownership including -manual files in the main package
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-15/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 26 Apr 2011 13:20:06 -0000 1.8
+++ sources 13 Dec 2011 08:48:27 -0000 1.9
@@ -1 +1 @@
-57be7fadb8c8dd17b8462c7ac1561d03 audacity-minsrc-1.3.13-beta.tar.bz2
+e7754757e7c3b543db9aa32180b0fb6f audacity-minsrc-1.3.14-beta.tar.bz2
12 years, 11 months
- 1
- 0
rpms/audacity-freeworld/F-16 audacity-1.3.14-ffmpeg-0.8.patch, NONE, 1.1 audacity-1.3.14-gtypes.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 audacity-freeworld.spec, 1.18, 1.19 sources, 1.8, 1.9
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8716
Modified Files:
.cvsignore audacity-freeworld.spec sources
Added Files:
audacity-1.3.14-ffmpeg-0.8.patch audacity-1.3.14-gtypes.patch
Log Message:
update to 1.3.14 beta release
add ffmpeg-0.8 patch from Leland Lucius
add test patch to workaround gtypes-include problem
audacity-1.3.14-ffmpeg-0.8.patch:
FFmpeg.cpp | 92 ++++++++++++++++++++++++++++++------------------
FFmpeg.h | 67 +++++++++++++++++++++++++++++++---
export/ExportFFmpeg.cpp | 27 +++++++++++++-
import/ImportFFmpeg.cpp | 16 +++++++-
4 files changed, 159 insertions(+), 43 deletions(-)
--- NEW FILE audacity-1.3.14-ffmpeg-0.8.patch ---
Index: src/FFmpeg.h
===================================================================
--- src/FFmpeg.h (revision 11286)
+++ src/FFmpeg.h (working copy)
@@ -47,6 +47,21 @@
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)
#define AVSampleFormat SampleFormat
#endif
+
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 120, 0)
+ #define CodecType AVMediaType
+ #define CODEC_TYPE_UNKNOWN AVMEDIA_TYPE_UNKNOWN
+ #define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
+ #define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
+ #define CODEC_TYPE_DATA AVMEDIA_TYPE_DATA
+ #define CODEC_TYPE_SUBTITLE AVMEDIA_TYPE_SUBTITLE
+ #define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
+ #define CODEC_TYPE_NB AVMEDIA_TYPE_NB
+ #endif
+
+ #ifndef PKT_FLAG_KEY
+ #define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+ #endif
}
#endif
@@ -505,20 +520,23 @@
(AVCodecContext *avctx, AVCodec *codec),
(avctx, codec);
);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
FFMPEG_FUNCTION_WITH_RETURN(
int,
+ avcodec_decode_audio3,
+ (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
+ (avctx, samples, frame_size_ptr, avpkt)
+ );
+#else
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
avcodec_decode_audio2,
(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size),
(avctx, samples, frame_size_ptr, buf, buf_size)
);
+#endif
FFMPEG_FUNCTION_WITH_RETURN(
int,
- avcodec_decode_audio3,
- (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
- (avctx, samples, frame_size_ptr, avpkt)
- );
- FFMPEG_FUNCTION_WITH_RETURN(
- int,
avcodec_encode_audio,
(AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples),
(avctx, buf, buf_size, samples)
@@ -556,13 +574,22 @@
(void),
()
);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
FFMPEG_FUNCTION_WITH_RETURN(
void*,
av_fast_realloc,
(void *ptr, unsigned int *size, unsigned int min_size),
(ptr, size, min_size)
);
+#else
FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_fast_realloc,
+ (void *ptr, unsigned int *size, size_t min_size),
+ (ptr, size, min_size)
+ );
+#endif
+ FFMPEG_FUNCTION_WITH_RETURN(
int,
av_open_input_stream,
(AVFormatContext **ic_ptr, AVIOContext *pb, const char *filename, AVInputFormat *fmt, AVFormatParameters *ap),
@@ -744,12 +771,21 @@
(AVFifoBuffer *f),
(f)
);
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 0, 0)
FFMPEG_FUNCTION_WITH_RETURN(
void*,
av_malloc,
(unsigned int size),
(size)
);
+#else
+ FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_malloc,
+ (size_t size),
+ (size)
+ );
+#endif
FFMPEG_FUNCTION_NO_RETURN(
av_freep,
(void *ptr),
@@ -761,11 +797,16 @@
(int64_t a, AVRational bq, AVRational cq),
(a, bq, cq)
);
+
+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
FFMPEG_FUNCTION_NO_RETURN(
av_free_packet,
(AVPacket *pkt),
(pkt)
);
+#endif
+
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
FFMPEG_FUNCTION_WITH_RETURN(
AVFifoBuffer*,
av_fifo_alloc,
@@ -778,8 +819,22 @@
(AVFifoBuffer *f, void *buf, int buf_size, void (*func)(void*, void*, int)),
(f, buf, buf_size, func)
);
+#else
FFMPEG_FUNCTION_WITH_RETURN(
int,
+ av_fifo_init,
+ (AVFifoBuffer *f, unsigned int size),
+ (f, size)
+ );
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
+ av_fifo_generic_read,
+ (AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest),
+ (f, buf_size, func, dest)
+ );
+#endif
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
av_fifo_realloc2,
(AVFifoBuffer *f, unsigned int size),
(f, size)
Index: src/FFmpeg.cpp
===================================================================
--- src/FFmpeg.cpp (revision 11286)
+++ src/FFmpeg.cpp (working copy)
@@ -186,9 +186,15 @@
return AVERROR(ENOMEM);
}
- if (flags & URL_RDWR) {
+ // LLL: These really should be logical AND tests, but on 2011/04/28, the URL_ open flags
+ // changed in the FFmpeg source to values that were not compatible with previous
+ // values.
+ //
+ // Since Audacity doesn't use any other open flags (there aren't any others defined
+ // anyway), making equality tests works for older and new FFmpeg headers.
+ if (flags == URL_RDWR) {
mode = wxFile::read_write;
- } else if (flags & URL_WRONLY) {
+ } else if (flags == URL_WRONLY) {
mode = wxFile::write;
} else {
mode = wxFile::read;
@@ -222,6 +228,10 @@
{
wxSeekMode mode = wxFromStart;
+#if !defined(AVSEEK_FORCE)
+#define AVSEEK_FORCE 0
+#endif
+
switch (whence & ~AVSEEK_FORCE)
{
case (SEEK_SET):
@@ -316,7 +326,7 @@
pd.buf_size = 0;
pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
if (pd.buf == NULL) {
- err = AVERROR_NOMEM;
+ err = AVERROR(ENOMEM);
goto fail;
}
@@ -381,7 +391,7 @@
// Didn't find a suitable format, so bail
if (!fmt) {
- err = AVERROR_NOFMT;
+ err = AVERROR(EILSEQ);
goto fail;
}
@@ -847,39 +857,53 @@
FFMPEG_INITALT(avformat, av_guess_format, guess_format);
FFMPEG_INITALT(avformat, av_match_ext, match_ext);
- FFMPEG_INITDYN(codec, av_init_packet);
- FFMPEG_INITDYN(codec, av_free_packet);
- FFMPEG_INITDYN(codec, avcodec_init);
- FFMPEG_INITDYN(codec, avcodec_find_encoder);
- FFMPEG_INITDYN(codec, avcodec_find_encoder_by_name);
- FFMPEG_INITDYN(codec, avcodec_find_decoder);
- FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
- FFMPEG_INITDYN(codec, avcodec_open);
- FFMPEG_INITDYN(codec, avcodec_decode_audio2);
- FFMPEG_INITDYN(codec, avcodec_decode_audio3);
- FFMPEG_INITDYN(codec, avcodec_encode_audio);
- FFMPEG_INITDYN(codec, avcodec_close);
- FFMPEG_INITDYN(codec, avcodec_register_all);
- FFMPEG_INITDYN(codec, avcodec_version);
- FFMPEG_INITDYN(codec, av_fast_realloc);
- FFMPEG_INITDYN(codec, av_codec_next);
- FFMPEG_INITDYN(codec, av_get_bits_per_sample_format);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 58, 0)
+ FFMPEG_INITDYN(avcodec, av_init_packet);
+#else
+ FFMPEG_INITDYN(avformat, av_init_packet);
+#endif
+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
+ FFMPEG_INITDYN(avcodec, av_free_packet);
+#endif
+ FFMPEG_INITDYN(avcodec, avcodec_init);
+ FFMPEG_INITDYN(avcodec, avcodec_find_encoder);
+ FFMPEG_INITDYN(avcodec, avcodec_find_encoder_by_name);
+ FFMPEG_INITDYN(avcodec, avcodec_find_decoder);
+ FFMPEG_INITDYN(avcodec, avcodec_get_context_defaults);
+ FFMPEG_INITDYN(avcodec, avcodec_open);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
+ FFMPEG_INITDYN(avcodec, avcodec_decode_audio3);
+#else
+ FFMPEG_INITDYN(avcodec, avcodec_decode_audio2);
+#endif
+ FFMPEG_INITDYN(avcodec, avcodec_encode_audio);
+ FFMPEG_INITDYN(avcodec, avcodec_close);
+ FFMPEG_INITDYN(avcodec, avcodec_register_all);
+ FFMPEG_INITDYN(avcodec, avcodec_version);
+ FFMPEG_INITDYN(avcodec, av_fast_realloc);
+ FFMPEG_INITDYN(avcodec, av_codec_next);
+ FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
+
FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
- FFMPEG_INITDYN(util, av_free);
- FFMPEG_INITDYN(util, av_log_set_callback);
- FFMPEG_INITDYN(util, av_log_default_callback);
- FFMPEG_INITDYN(util, av_fifo_alloc);
- FFMPEG_INITDYN(util, av_fifo_generic_read);
- FFMPEG_INITDYN(util, av_fifo_realloc2);
- FFMPEG_INITDYN(util, av_fifo_free);
- FFMPEG_INITDYN(util, av_fifo_size);
- FFMPEG_INITDYN(util, av_malloc);
- FFMPEG_INITDYN(util, av_fifo_generic_write);
- FFMPEG_INITDYN(util, av_freep);
- FFMPEG_INITDYN(util, av_rescale_q);
- FFMPEG_INITDYN(util, avutil_version);
+ FFMPEG_INITDYN(avutil, av_free);
+ FFMPEG_INITDYN(avutil, av_log_set_callback);
+ FFMPEG_INITDYN(avutil, av_log_default_callback);
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ FFMPEG_INITDYN(avutil, av_fifo_alloc);
+#else
+ FFMPEG_INITDYN(avutil, av_fifo_init);
+#endif
+ FFMPEG_INITDYN(avutil, av_fifo_generic_read);
+ FFMPEG_INITDYN(avutil, av_fifo_realloc2);
+ FFMPEG_INITDYN(avutil, av_fifo_free);
+ FFMPEG_INITDYN(avutil, av_fifo_size);
+ FFMPEG_INITDYN(avutil, av_malloc);
+ FFMPEG_INITDYN(avutil, av_fifo_generic_write);
+ FFMPEG_INITDYN(avutil, av_freep);
+ FFMPEG_INITDYN(avutil, av_rescale_q);
+ FFMPEG_INITDYN(avutil, avutil_version);
//FFmpeg initialization
wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
Index: src/import/ImportFFmpeg.cpp
===================================================================
--- src/import/ImportFFmpeg.cpp (revision 11286)
+++ src/import/ImportFFmpeg.cpp (working copy)
@@ -808,9 +808,12 @@
}
}
+
+ sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
+
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
// avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
// also returns the number of bytes it decoded in the same parameter.
- sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
AVPacket avpkt;
av_init_packet(&avpkt);
avpkt.data = pDecode;
@@ -820,7 +823,16 @@
(int16_t *)sc->m_decodedAudioSamples, // out
&sc->m_decodedAudioSamplesValidSiz, // in/out
&avpkt); // in
-
+#else
+ // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
+ // also returns the number of bytes it decoded in the same parameter.
+ nBytesDecoded =
+ avcodec_decode_audio2(sc->m_codecCtx,
+ (int16_t *) sc->m_decodedAudioSamples, // out
+ &sc->m_decodedAudioSamplesValidSiz, // in/out
+ pDecode, // in
+ nDecodeSiz); // in
+#endif
if (nBytesDecoded < 0)
{
// Decoding failed. Don't stop.
Index: src/export/ExportFFmpeg.cpp
===================================================================
--- src/export/ExportFFmpeg.cpp (revision 11286)
+++ src/export/ExportFFmpeg.cpp (working copy)
@@ -154,6 +154,10 @@
AVFifoBuffer * mEncAudioFifo; // FIFO to write incoming audio samples into
uint8_t * mEncAudioFifoOutBuf; // buffer to read _out_ of the FIFO into
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
+ AVFifoBuffer mEncAudioFifoBuffer; // FIFO to write incoming audio samples into
+#endif
+
wxString mName;
int mSubFormat;
@@ -174,6 +178,11 @@
#define MAX_AUDIO_PACKET_SIZE (128 * 1024)
mEncAudioEncodedBufSiz = 4*MAX_AUDIO_PACKET_SIZE;
mEncAudioFifoOutBuf = NULL; // buffer to read _out_ of the FIFO into
+
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
+ mEncAudioFifo = &mEncAudioFifoBuffer;
+#endif
+
mSampleRate = 0;
mSupportsUTF8 = true;
@@ -350,7 +359,6 @@
mEncAudioCodecCtx = mEncAudioStream->codec;
avcodec_get_context_defaults(mEncAudioCodecCtx);
-
mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
@@ -403,7 +411,9 @@
mEncAudioCodecCtx->flags2 = 0;
if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
+#endif
mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
@@ -487,7 +497,11 @@
// The encoder may require a minimum number of raw audio samples for each encoding but we can't
// guarantee we'll get this minimum each time an audio frame is decoded from the input file so
// we use a FIFO to store up incoming raw samples until we have enough for one call to the codec.
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
mEncAudioFifo = av_fifo_alloc(1024);
+#else
+ av_fifo_init(mEncAudioFifo, 1024);
+#endif
// Allocate a buffer to read OUT of the FIFO into. The FIFO maintains its own buffer internally.
if ((mEncAudioFifoOutBuf = (uint8_t*)av_malloc(2*MAX_AUDIO_PACKET_SIZE)) == NULL)
@@ -544,7 +558,11 @@
nFifoBytes, mEncAudioCodecCtx->frame_size);
// Pull the bytes out from the FIFO and feed them to the encoder.
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
if (av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nFifoBytes, NULL) == 0)
+#else
+ if (av_fifo_generic_read(mEncAudioFifo, nFifoBytes, NULL, mEncAudioFifoOutBuf) == 0)
+#endif
{
if (mEncAudioCodecCtx->frame_size != 1)
nEncodedBytes = avcodec_encode_audio(mEncAudioCodecCtx, mEncAudioEncodedBuf, mEncAudioEncodedBufSiz, (int16_t*)mEncAudioFifoOutBuf);
@@ -609,7 +627,10 @@
av_free(mEncAudioFifoOutBuf);
av_fifo_free(mEncAudioFifo);
+
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
mEncAudioFifo = NULL;
+#endif
return true;
}
@@ -635,7 +656,11 @@
// Read raw audio samples out of the FIFO in nAudioFrameSizeOut byte-sized groups to encode.
while ((ret = av_fifo_size(mEncAudioFifo)) >= nAudioFrameSizeOut)
{
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
ret = av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nAudioFrameSizeOut, NULL);
+#else
+ ret = av_fifo_generic_read(mEncAudioFifo, nAudioFrameSizeOut, NULL, mEncAudioFifoOutBuf);
+#endif
av_init_packet(&pkt);
audacity-1.3.14-gtypes.patch:
AudacityApp.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE audacity-1.3.14-gtypes.patch ---
--- src/AudacityApp.cpp.orig 2011-11-04 10:44:41.016958277 +1100
+++ src/AudacityApp.cpp 2011-11-01 17:15:19.000000000 +1100
@@ -406,7 +406,7 @@
* Happily we can avoid the hack, as we only need some of the headers, not
* the full GTK headers
*/
-#include <glib/gtypes.h>
+//#include <glib/gtypes.h>
#include <glib-object.h>
typedef struct _GnomeProgram GnomeProgram;
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-16/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 26 Apr 2011 13:20:05 -0000 1.8
+++ .cvsignore 13 Dec 2011 08:13:50 -0000 1.9
@@ -1 +1 @@
-audacity-minsrc-1.3.13-beta.tar.bz2
+audacity-minsrc-1.3.14-beta.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-16/audacity-freeworld.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- audacity-freeworld.spec 5 May 2011 11:52:22 -0000 1.18
+++ audacity-freeworld.spec 13 Dec 2011 08:13:52 -0000 1.19
@@ -1,17 +1,26 @@
+# Compile options:
+# --with mp3 : enable mp3 support
+
Name: audacity-freeworld
-Version: 1.3.13
-Release: 0.4.beta%{?dist}
+Version: 1.3.14
+Release: 0.5%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
URL: http://audacity.sourceforge.net
-%define tartopdir audacity-src-%{version}-beta
%define realname audacity
Conflicts: %{realname}
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
+# use for upstream source releases:
+#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-1.3.14-beta.tar.bz2
+%define tartopdir audacity-src-%{version}-beta
+
+# use for svn snapshot: [see package README for generation process]
+#Source0: audacity-minsrc-1.3.14-alpha-20111101.tar.bz2
+#%#define tartopdir audacity-src-%{version}-alpha-20111101
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
@@ -20,6 +29,8 @@
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-1.3.13-desktop.in.patch
+Patch4: audacity-1.3.14-gtypes.patch
+Patch5: audacity-1.3.14-ffmpeg-0.8.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -81,6 +92,8 @@
done
%patch3 -b .desktop.old
+%patch4 -b .gtypes
+%patch5 -b .ffmpeg.old
%build
@@ -151,6 +164,18 @@
%changelog
+* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.5
+- fix Source1 help reference (again).
+
+* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.4
+- update to 1.3.14 beta release
+
+* Thu Dec 8 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.3.alpha20111101svn11296
+- add ffmpeg-0.8 patch from Leland Lucius
+- add test patch to workaround gtypes-include problem
+
+* Tue Nov 1 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.1.alpha20111101svn11296
+- update to 1.3.14 alpha svn snapshot
* Sat Apr 30 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.4.beta
- fix files and dir ownership including -manual files in the main package
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/F-16/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 26 Apr 2011 13:20:06 -0000 1.8
+++ sources 13 Dec 2011 08:13:52 -0000 1.9
@@ -1 +1 @@
-57be7fadb8c8dd17b8462c7ac1561d03 audacity-minsrc-1.3.13-beta.tar.bz2
+e7754757e7c3b543db9aa32180b0fb6f audacity-minsrc-1.3.14-beta.tar.bz2
12 years, 11 months
- 1
- 0
rpms/audacity-freeworld/devel audacity-freeworld.spec,1.19,1.20
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5601
Modified Files:
audacity-freeworld.spec
Log Message:
fix Source1 help reference (again)
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- audacity-freeworld.spec 12 Dec 2011 13:41:32 -0000 1.19
+++ audacity-freeworld.spec 13 Dec 2011 07:47:33 -0000 1.20
@@ -4,7 +4,7 @@
Name: audacity-freeworld
Version: 1.3.14
-Release: 0.4%{?dist}
+Release: 0.5%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
@@ -22,9 +22,6 @@
#Source0: audacity-minsrc-1.3.14-alpha-20111101.tar.bz2
#%#define tartopdir audacity-src-%{version}-alpha-20111101
-# The manual is not versioned; it is essentially a work in progress
-Source1: http://manual.audacityteam.org/help.zip
-
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
# add audio/x-flac
@@ -167,6 +164,9 @@
%changelog
+* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.5
+- fix Source1 help reference (again).
+
* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.4
- update to 1.3.14 beta release
12 years, 11 months
- 1
- 0
rpms/phonon-backend-vlc/devel phonon-backend-vlc.spec,1.11,1.12
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20358
Modified Files:
phonon-backend-vlc.spec
Log Message:
BR: phonon-backend-gstreamer
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- phonon-backend-vlc.spec 12 Dec 2011 15:18:01 -0000 1.11
+++ phonon-backend-vlc.spec 12 Dec 2011 15:22:13 -0000 1.12
@@ -25,6 +25,8 @@
BuildRequires: pkgconfig(phonon) >= 4.5.50
BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui)
BuildRequires: pkgconfig(xcb)
+# Oh, the irony of being in the default buildroot @ rpmfusion
+BuildRequires: phonon-backend-gstreamer
%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.50)
%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.10)
12 years, 11 months
- 1
- 0
rpms/phonon-backend-vlc/devel .cvsignore, 1.7, 1.8 phonon-backend-vlc.spec, 1.10, 1.11 sources, 1.7, 1.8
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19729
Modified Files:
.cvsignore phonon-backend-vlc.spec sources
Log Message:
* Mon Dec 12 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.0-0.1.20111212git
- 20111212 (master branch) snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 21 Oct 2011 21:03:20 -0000 1.7
+++ .cvsignore 12 Dec 2011 15:18:01 -0000 1.8
@@ -1,2 +1 @@
-phonon-backend-vlc-0.4.1.tar.xz
-phonon-vlc-0.4.55-20111021.tar.xz
+phonon-backend-vlc-0.5.0-20111212.tar.bz2
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/phonon-backend-vlc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phonon-backend-vlc.spec 21 Oct 2011 21:16:29 -0000 1.10
+++ phonon-backend-vlc.spec 12 Dec 2011 15:18:01 -0000 1.11
@@ -1,17 +1,17 @@
-%define snap 20111021
+%define snap 20111212
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.4.55
-Release: 0.1.%{snap}%{?dist}
+Version: 0.5.0
+Release: 0.1.%{snap}git%{?dist}
Group: Applications/Multimedia
License: LGPLv2+
URL: http://phonon.kde.org/
%if 0%{?snap}
# git clone git://anongit.kde.org/phonon-vlc
-# git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-vlc-%{version}-%{snap}.tar.xz
-Source0: phonon-vlc-%{version}-%{snap}.tar.xz
+# git archive --prefix=phonon-backend-vlc-%{version}/ master | bzip -9 > phonon-vlc-%{version}-%{snap}.tar.bz2
+Source0: phonon-backend-vlc-%{version}-%{snap}.tar.bz2
%else
Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/phonon-backend-vlc/%{version}/pho...
%endif
@@ -20,20 +20,20 @@
BuildRequires: automoc4 >= 0.9.86
BuildRequires: cmake >= 2.6.0
BuildRequires: kde-filesystem
-BuildRequires: pkgconfig(libvlc) >= 1.1.1
+BuildRequires: pkgconfig(libvlc) >= 1.1.10
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(phonon) >= 4.5.50
BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui)
BuildRequires: pkgconfig(xcb)
%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.50)
-%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.0)
+%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.10)
Provides: phonon-backend%{?_isa} = %{phonon_ver}
Requires: vlc-core%{?_isa} >= %{vlc_ver}
Requires: phonon%{?_isa} >= %{phonon_ver}
-Requires: qt4%{?_isa} >= %{_qt4_version}
+%{?_qt4:Requires: qt4%{?_isa} >= %{_qt4_version}}
%description
@@ -74,6 +74,9 @@
%changelog
+* Mon Dec 12 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.5.0-0.1.20111212git
+- 20111212 (master branch) snapshot
+
* Fri Oct 21 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.4.55-0.1.20111021
- 20111021 snapshot
- pkgconfig-style deps
Index: sources
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 21 Oct 2011 21:03:21 -0000 1.7
+++ sources 12 Dec 2011 15:18:01 -0000 1.8
@@ -1,2 +1 @@
-3adc566c8b24fb2374697b8b14309d26 phonon-backend-vlc-0.4.1.tar.xz
-204b0ed1f4fdee290b09e5b715bfb4a4 phonon-vlc-0.4.55-20111021.tar.xz
+36e7c5573351eadfe224729b7df0cf22 phonon-backend-vlc-0.5.0-20111212.tar.bz2
12 years, 11 months
- 1
- 0
rpms/phonon-backend-vlc/F-16 .cvsignore, 1.7, 1.8 phonon-backend-vlc.spec, 1.10, 1.11 sources, 1.7, 1.8
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/phonon-backend-vlc/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18352
Modified Files:
.cvsignore phonon-backend-vlc.spec sources
Log Message:
revert (back) to 0.4.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/F-16/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 21 Oct 2011 21:03:20 -0000 1.7
+++ .cvsignore 12 Dec 2011 15:09:46 -0000 1.8
@@ -1,2 +1 @@
phonon-backend-vlc-0.4.1.tar.xz
-phonon-vlc-0.4.55-20111021.tar.xz
Index: phonon-backend-vlc.spec
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/F-16/phonon-backend-vlc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- phonon-backend-vlc.spec 21 Oct 2011 21:16:29 -0000 1.10
+++ phonon-backend-vlc.spec 12 Dec 2011 15:09:47 -0000 1.11
@@ -1,15 +1,13 @@
-%define snap 20111021
-
name: phonon-backend-vlc
Summary: VLC phonon backend
-Version: 0.4.55
-Release: 0.1.%{snap}%{?dist}
+Version: 0.4.1
+Release: 2%{?dist}
Group: Applications/Multimedia
License: LGPLv2+
URL: http://phonon.kde.org/
%if 0%{?snap}
-# git clone git://anongit.kde.org/phonon-vlc
+# git clone git://gitorious.org/phonon/phonon-vlc.git
# git archive --prefix=phonon-backend-vlc-%{version}/ master | xz > phonon-vlc-%{version}-%{snap}.tar.xz
Source0: phonon-vlc-%{version}-%{snap}.tar.xz
%else
@@ -19,14 +17,14 @@
BuildRequires: automoc4 >= 0.9.86
BuildRequires: cmake >= 2.6.0
+BuildRequires: phonon-devel >= 4.5.0
BuildRequires: kde-filesystem
-BuildRequires: pkgconfig(libvlc) >= 1.1.1
-BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(phonon) >= 4.5.50
-BuildRequires: pkgconfig(QtCore) pkgconfig(QtGui)
-BuildRequires: pkgconfig(xcb)
+BuildRequires: libxcb-devel
+BuildRequires: libxml2-devel
+BuildRequires: qt4-devel
+BuildRequires: vlc-devel >= 1.1.1
-%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.50)
+%global phonon_ver %(pkg-config --modversion phonon 2>/dev/null || echo 4.5.0)
%global vlc_ver %(pkg-config --modversion libvlc 2>/dev/null || echo 1.1.0)
Provides: phonon-backend%{?_isa} = %{phonon_ver}
@@ -74,10 +72,6 @@
%changelog
-* Fri Oct 21 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.4.55-0.1.20111021
-- 20111021 snapshot
-- pkgconfig-style deps
-
* Mon Aug 15 2011 Rex Dieter <rdieter(a)fedoraproject.org> 0.4.1-2
- rebuild
Index: sources
===================================================================
RCS file: /cvs/free/rpms/phonon-backend-vlc/F-16/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 21 Oct 2011 21:03:21 -0000 1.7
+++ sources 12 Dec 2011 15:09:47 -0000 1.8
@@ -1,2 +1 @@
3adc566c8b24fb2374697b8b14309d26 phonon-backend-vlc-0.4.1.tar.xz
-204b0ed1f4fdee290b09e5b715bfb4a4 phonon-vlc-0.4.55-20111021.tar.xz
12 years, 11 months
- 1
- 0
rpms/cairo-dock/devel .cvsignore, 1.44, 1.45 cairo-dock.spec, 1.64, 1.65 sources, 1.46, 1.47
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2958
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Mon Dec 12 2011 Mamoru Tasaka <mtasaka(a)fedoraproject.org> - 2.4.0.2-1
- 2.3.4-2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- .cvsignore 27 Jun 2011 15:34:03 -0000 1.44
+++ .cvsignore 12 Dec 2011 13:55:39 -0000 1.45
@@ -1,2 +0,0 @@
-cairo-dock-2.3.0~3.tar.gz
-cairo-dock-plugins-2.3.0~3.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- cairo-dock.spec 8 Nov 2011 20:46:32 -0000 1.64
+++ cairo-dock.spec 12 Dec 2011 13:55:39 -0000 1.65
@@ -16,11 +16,11 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global urlver 2.3
-%global mainver 2.3.0
+%global urlver 2.4
+%global mainver 2.4.0
#%%define betaver 0rc1
-%global postver_c 3
-%global postver_p 3
+%global postver_c 2
+%global postver_p 2
%global rpmver_c %{mainver}%{?postver_c:.%postver_c}
%global rpmver_p %{mainver}%{?postver_p:.%postver_p}
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 3
+%global fedora_main_rel 1
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -89,7 +89,11 @@
# For plug-ins
BuildRequires: alsa-lib-devel
+BuildRequires: fftw3-devel
+%if 0%{?fedora} < 16
+# This is gnome2
BuildRequires: gnome-menus-devel
+%endif
BuildRequires: gnome-vfs2-devel
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
@@ -98,6 +102,9 @@
BuildRequires: libXrandr-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libzeitgeist-devel
+BuildRequires: pulseaudio-libs-devel
+#BuildRequires: qt4-devel
+BuildRequires: upower-devel
BuildRequires: vte-devel
# Not shown in .pc files
# Make it sure that cairo-dock is rebuilt against
@@ -352,6 +359,18 @@
%if %{skip_main_build} < 1
+# ZZZ GLib inclusion
+# From GLib 2.31, _some_ Glib headers were made not to be included
+# directly, however still gi18n.h, gstdio.h and so on have to be
+# included separately
+%if 0%{?fedora} >= 17
+export CFLAGS="%optflags -DGLIB_COMPILATION"
+export CXXFLAGS="%optflags -DGLIB_COMPILATION"
+%else
+export CFLAGS="%optflags"
+export CXXFLAGS="%optflags"
+%endif
+
## rpath issue needs investigating
%cmake -DCMAKE_SKIP_RPATH:BOOL=ON .
%{__make} %{?_smp_mflags} || status=$((status+1))
@@ -365,12 +384,16 @@
%endif
-export CFLAGS="%optflags -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
+%if 1
+export CFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
export CFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/cairo-dock"
export CFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/icon-factory"
-export CXXFLAGS="%optflags -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
+export CFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/gldit"
+export CXXFLAGS="$CFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock"
export CXXFLAGS="$CXXFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/cairo-dock"
export CXXFLAGS="$CXXFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/icon-factory"
+export CXXFLAGS="$CXXFLAGS -I$TOPDIR/TMPINSTDIR%{_includedir}/cairo-dock/gldit"
+%endif
export LD_LIBRARY_PATH=$TOPDIR/TMPINSTDIR%{_libdir}
export PKG_CONFIG_PATH=$TOPDIR/TMPINSTDIR%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}
@@ -516,15 +539,14 @@
%dir %{_datadir}/%{name}/
%{_datadir}/%{name}/*.conf
%{_datadir}/%{name}/*.desktop
-%{_datadir}/%{name}/*.png
%{_datadir}/%{name}/*.svg
-%{_datadir}/%{name}/*.sh
-%{_datadir}/%{name}/*.xpm
+%{_datadir}/%{name}/images/
%{_datadir}/%{name}/*view
#%%{_datadir}/%{name}/emblems/
%{_datadir}/%{name}/explosion/
%{_datadir}/%{name}/gauges/
%{_datadir}/%{name}/icons/
+%{_datadir}/%{name}/scripts/
%dir %{_datadir}/%{name}/themes/
%dir %{_datadir}/%{name}/plug-ins/
%{_datadir}/%{name}/themes/_default_/
@@ -572,6 +594,7 @@
%if %{build_python} > 0
%files python
%defattr(-,root,root,-)
+%{python_sitelib}/CairoDock.py*
%{python_sitelib}/CDApplet.py*
%{python_sitelib}/CDBashApplet.py*
%{python_sitelib}/*.egg-info
@@ -590,6 +613,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Mon Dec 12 2011 Mamoru Tasaka <mtasaka(a)fedoraproject.org> - 2.4.0.2-1
+- 2.3.4-2
+
* Tue Nov 8 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.0.3-3
- Rebuilt
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources 27 Jun 2011 15:34:03 -0000 1.46
+++ sources 12 Dec 2011 13:55:39 -0000 1.47
@@ -1,2 +0,0 @@
-e838dec553960adc443a312162ceeb9a cairo-dock-2.3.0~3.tar.gz
-b923a1cb934c5935c64019e40f15aa9a cairo-dock-plugins-2.3.0~3.tar.gz
12 years, 11 months
- 1
- 0
rpms/audacity-freeworld/devel audacity-1.3.14-ffmpeg-0.8.patch, NONE, 1.1 audacity-1.3.14-gtypes.patch, NONE, 1.1
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv732
Added Files:
audacity-1.3.14-ffmpeg-0.8.patch audacity-1.3.14-gtypes.patch
Log Message:
add patch audacity-1.3.14-gtypes.patch
add patch audacity-1.3.14-ffmpeg-0.8.patch
audacity-1.3.14-ffmpeg-0.8.patch:
FFmpeg.cpp | 92 ++++++++++++++++++++++++++++++------------------
FFmpeg.h | 67 +++++++++++++++++++++++++++++++---
export/ExportFFmpeg.cpp | 27 +++++++++++++-
import/ImportFFmpeg.cpp | 16 +++++++-
4 files changed, 159 insertions(+), 43 deletions(-)
--- NEW FILE audacity-1.3.14-ffmpeg-0.8.patch ---
Index: src/FFmpeg.h
===================================================================
--- src/FFmpeg.h (revision 11286)
+++ src/FFmpeg.h (working copy)
@@ -47,6 +47,21 @@
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 94, 1)
#define AVSampleFormat SampleFormat
#endif
+
+ #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 120, 0)
+ #define CodecType AVMediaType
+ #define CODEC_TYPE_UNKNOWN AVMEDIA_TYPE_UNKNOWN
+ #define CODEC_TYPE_VIDEO AVMEDIA_TYPE_VIDEO
+ #define CODEC_TYPE_AUDIO AVMEDIA_TYPE_AUDIO
+ #define CODEC_TYPE_DATA AVMEDIA_TYPE_DATA
+ #define CODEC_TYPE_SUBTITLE AVMEDIA_TYPE_SUBTITLE
+ #define CODEC_TYPE_ATTACHMENT AVMEDIA_TYPE_ATTACHMENT
+ #define CODEC_TYPE_NB AVMEDIA_TYPE_NB
+ #endif
+
+ #ifndef PKT_FLAG_KEY
+ #define PKT_FLAG_KEY AV_PKT_FLAG_KEY
+ #endif
}
#endif
@@ -505,20 +520,23 @@
(AVCodecContext *avctx, AVCodec *codec),
(avctx, codec);
);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
FFMPEG_FUNCTION_WITH_RETURN(
int,
+ avcodec_decode_audio3,
+ (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
+ (avctx, samples, frame_size_ptr, avpkt)
+ );
+#else
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
avcodec_decode_audio2,
(AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, const uint8_t *buf, int buf_size),
(avctx, samples, frame_size_ptr, buf, buf_size)
);
+#endif
FFMPEG_FUNCTION_WITH_RETURN(
int,
- avcodec_decode_audio3,
- (AVCodecContext *avctx, int16_t *samples, int *frame_size_ptr, AVPacket *avpkt),
- (avctx, samples, frame_size_ptr, avpkt)
- );
- FFMPEG_FUNCTION_WITH_RETURN(
- int,
avcodec_encode_audio,
(AVCodecContext *avctx, uint8_t *buf, int buf_size, const short *samples),
(avctx, buf, buf_size, samples)
@@ -556,13 +574,22 @@
(void),
()
);
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
FFMPEG_FUNCTION_WITH_RETURN(
void*,
av_fast_realloc,
(void *ptr, unsigned int *size, unsigned int min_size),
(ptr, size, min_size)
);
+#else
FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_fast_realloc,
+ (void *ptr, unsigned int *size, size_t min_size),
+ (ptr, size, min_size)
+ );
+#endif
+ FFMPEG_FUNCTION_WITH_RETURN(
int,
av_open_input_stream,
(AVFormatContext **ic_ptr, AVIOContext *pb, const char *filename, AVInputFormat *fmt, AVFormatParameters *ap),
@@ -744,12 +771,21 @@
(AVFifoBuffer *f),
(f)
);
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 0, 0)
FFMPEG_FUNCTION_WITH_RETURN(
void*,
av_malloc,
(unsigned int size),
(size)
);
+#else
+ FFMPEG_FUNCTION_WITH_RETURN(
+ void*,
+ av_malloc,
+ (size_t size),
+ (size)
+ );
+#endif
FFMPEG_FUNCTION_NO_RETURN(
av_freep,
(void *ptr),
@@ -761,11 +797,16 @@
(int64_t a, AVRational bq, AVRational cq),
(a, bq, cq)
);
+
+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
FFMPEG_FUNCTION_NO_RETURN(
av_free_packet,
(AVPacket *pkt),
(pkt)
);
+#endif
+
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
FFMPEG_FUNCTION_WITH_RETURN(
AVFifoBuffer*,
av_fifo_alloc,
@@ -778,8 +819,22 @@
(AVFifoBuffer *f, void *buf, int buf_size, void (*func)(void*, void*, int)),
(f, buf, buf_size, func)
);
+#else
FFMPEG_FUNCTION_WITH_RETURN(
int,
+ av_fifo_init,
+ (AVFifoBuffer *f, unsigned int size),
+ (f, size)
+ );
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
+ av_fifo_generic_read,
+ (AVFifoBuffer *f, int buf_size, void (*func)(void*, void*, int), void* dest),
+ (f, buf_size, func, dest)
+ );
+#endif
+ FFMPEG_FUNCTION_WITH_RETURN(
+ int,
av_fifo_realloc2,
(AVFifoBuffer *f, unsigned int size),
(f, size)
Index: src/FFmpeg.cpp
===================================================================
--- src/FFmpeg.cpp (revision 11286)
+++ src/FFmpeg.cpp (working copy)
@@ -186,9 +186,15 @@
return AVERROR(ENOMEM);
}
- if (flags & URL_RDWR) {
+ // LLL: These really should be logical AND tests, but on 2011/04/28, the URL_ open flags
+ // changed in the FFmpeg source to values that were not compatible with previous
+ // values.
+ //
+ // Since Audacity doesn't use any other open flags (there aren't any others defined
+ // anyway), making equality tests works for older and new FFmpeg headers.
+ if (flags == URL_RDWR) {
mode = wxFile::read_write;
- } else if (flags & URL_WRONLY) {
+ } else if (flags == URL_WRONLY) {
mode = wxFile::write;
} else {
mode = wxFile::read;
@@ -222,6 +228,10 @@
{
wxSeekMode mode = wxFromStart;
+#if !defined(AVSEEK_FORCE)
+#define AVSEEK_FORCE 0
+#endif
+
switch (whence & ~AVSEEK_FORCE)
{
case (SEEK_SET):
@@ -316,7 +326,7 @@
pd.buf_size = 0;
pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
if (pd.buf == NULL) {
- err = AVERROR_NOMEM;
+ err = AVERROR(ENOMEM);
goto fail;
}
@@ -381,7 +391,7 @@
// Didn't find a suitable format, so bail
if (!fmt) {
- err = AVERROR_NOFMT;
+ err = AVERROR(EILSEQ);
goto fail;
}
@@ -847,39 +857,53 @@
FFMPEG_INITALT(avformat, av_guess_format, guess_format);
FFMPEG_INITALT(avformat, av_match_ext, match_ext);
- FFMPEG_INITDYN(codec, av_init_packet);
- FFMPEG_INITDYN(codec, av_free_packet);
- FFMPEG_INITDYN(codec, avcodec_init);
- FFMPEG_INITDYN(codec, avcodec_find_encoder);
- FFMPEG_INITDYN(codec, avcodec_find_encoder_by_name);
- FFMPEG_INITDYN(codec, avcodec_find_decoder);
- FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
- FFMPEG_INITDYN(codec, avcodec_open);
- FFMPEG_INITDYN(codec, avcodec_decode_audio2);
- FFMPEG_INITDYN(codec, avcodec_decode_audio3);
- FFMPEG_INITDYN(codec, avcodec_encode_audio);
- FFMPEG_INITDYN(codec, avcodec_close);
- FFMPEG_INITDYN(codec, avcodec_register_all);
- FFMPEG_INITDYN(codec, avcodec_version);
- FFMPEG_INITDYN(codec, av_fast_realloc);
- FFMPEG_INITDYN(codec, av_codec_next);
- FFMPEG_INITDYN(codec, av_get_bits_per_sample_format);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 58, 0)
+ FFMPEG_INITDYN(avcodec, av_init_packet);
+#else
+ FFMPEG_INITDYN(avformat, av_init_packet);
+#endif
+#if LIBAVFORMAT_VERSION_INT > AV_VERSION_INT(52, 31, 0)
+ FFMPEG_INITDYN(avcodec, av_free_packet);
+#endif
+ FFMPEG_INITDYN(avcodec, avcodec_init);
+ FFMPEG_INITDYN(avcodec, avcodec_find_encoder);
+ FFMPEG_INITDYN(avcodec, avcodec_find_encoder_by_name);
+ FFMPEG_INITDYN(avcodec, avcodec_find_decoder);
+ FFMPEG_INITDYN(avcodec, avcodec_get_context_defaults);
+ FFMPEG_INITDYN(avcodec, avcodec_open);
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
+ FFMPEG_INITDYN(avcodec, avcodec_decode_audio3);
+#else
+ FFMPEG_INITDYN(avcodec, avcodec_decode_audio2);
+#endif
+ FFMPEG_INITDYN(avcodec, avcodec_encode_audio);
+ FFMPEG_INITDYN(avcodec, avcodec_close);
+ FFMPEG_INITDYN(avcodec, avcodec_register_all);
+ FFMPEG_INITDYN(avcodec, avcodec_version);
+ FFMPEG_INITDYN(avcodec, av_fast_realloc);
+ FFMPEG_INITDYN(avcodec, av_codec_next);
+ FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
+
FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
- FFMPEG_INITDYN(util, av_free);
- FFMPEG_INITDYN(util, av_log_set_callback);
- FFMPEG_INITDYN(util, av_log_default_callback);
- FFMPEG_INITDYN(util, av_fifo_alloc);
- FFMPEG_INITDYN(util, av_fifo_generic_read);
- FFMPEG_INITDYN(util, av_fifo_realloc2);
- FFMPEG_INITDYN(util, av_fifo_free);
- FFMPEG_INITDYN(util, av_fifo_size);
- FFMPEG_INITDYN(util, av_malloc);
- FFMPEG_INITDYN(util, av_fifo_generic_write);
- FFMPEG_INITDYN(util, av_freep);
- FFMPEG_INITDYN(util, av_rescale_q);
- FFMPEG_INITDYN(util, avutil_version);
+ FFMPEG_INITDYN(avutil, av_free);
+ FFMPEG_INITDYN(avutil, av_log_set_callback);
+ FFMPEG_INITDYN(avutil, av_log_default_callback);
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
+ FFMPEG_INITDYN(avutil, av_fifo_alloc);
+#else
+ FFMPEG_INITDYN(avutil, av_fifo_init);
+#endif
+ FFMPEG_INITDYN(avutil, av_fifo_generic_read);
+ FFMPEG_INITDYN(avutil, av_fifo_realloc2);
+ FFMPEG_INITDYN(avutil, av_fifo_free);
+ FFMPEG_INITDYN(avutil, av_fifo_size);
+ FFMPEG_INITDYN(avutil, av_malloc);
+ FFMPEG_INITDYN(avutil, av_fifo_generic_write);
+ FFMPEG_INITDYN(avutil, av_freep);
+ FFMPEG_INITDYN(avutil, av_rescale_q);
+ FFMPEG_INITDYN(avutil, avutil_version);
//FFmpeg initialization
wxLogMessage(wxT("All symbols loaded successfully. Initializing the library."));
Index: src/import/ImportFFmpeg.cpp
===================================================================
--- src/import/ImportFFmpeg.cpp (revision 11286)
+++ src/import/ImportFFmpeg.cpp (working copy)
@@ -808,9 +808,12 @@
}
}
+
+ sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
+
+#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(52, 25, 0)
// avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
// also returns the number of bytes it decoded in the same parameter.
- sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
AVPacket avpkt;
av_init_packet(&avpkt);
avpkt.data = pDecode;
@@ -820,7 +823,16 @@
(int16_t *)sc->m_decodedAudioSamples, // out
&sc->m_decodedAudioSamplesValidSiz, // in/out
&avpkt); // in
-
+#else
+ // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
+ // also returns the number of bytes it decoded in the same parameter.
+ nBytesDecoded =
+ avcodec_decode_audio2(sc->m_codecCtx,
+ (int16_t *) sc->m_decodedAudioSamples, // out
+ &sc->m_decodedAudioSamplesValidSiz, // in/out
+ pDecode, // in
+ nDecodeSiz); // in
+#endif
if (nBytesDecoded < 0)
{
// Decoding failed. Don't stop.
Index: src/export/ExportFFmpeg.cpp
===================================================================
--- src/export/ExportFFmpeg.cpp (revision 11286)
+++ src/export/ExportFFmpeg.cpp (working copy)
@@ -154,6 +154,10 @@
AVFifoBuffer * mEncAudioFifo; // FIFO to write incoming audio samples into
uint8_t * mEncAudioFifoOutBuf; // buffer to read _out_ of the FIFO into
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
+ AVFifoBuffer mEncAudioFifoBuffer; // FIFO to write incoming audio samples into
+#endif
+
wxString mName;
int mSubFormat;
@@ -174,6 +178,11 @@
#define MAX_AUDIO_PACKET_SIZE (128 * 1024)
mEncAudioEncodedBufSiz = 4*MAX_AUDIO_PACKET_SIZE;
mEncAudioFifoOutBuf = NULL; // buffer to read _out_ of the FIFO into
+
+#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(50, 0, 0)
+ mEncAudioFifo = &mEncAudioFifoBuffer;
+#endif
+
mSampleRate = 0;
mSupportsUTF8 = true;
@@ -350,7 +359,6 @@
mEncAudioCodecCtx = mEncAudioStream->codec;
avcodec_get_context_defaults(mEncAudioCodecCtx);
-
mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
@@ -403,7 +411,9 @@
mEncAudioCodecCtx->flags2 = 0;
if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(53, 0, 0)
mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
+#endif
mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
@@ -487,7 +497,11 @@
// The encoder may require a minimum number of raw audio samples for each encoding but we can't
// guarantee we'll get this minimum each time an audio frame is decoded from the input file so
// we use a FIFO to store up incoming raw samples until we have enough for one call to the codec.
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
mEncAudioFifo = av_fifo_alloc(1024);
+#else
+ av_fifo_init(mEncAudioFifo, 1024);
+#endif
// Allocate a buffer to read OUT of the FIFO into. The FIFO maintains its own buffer internally.
if ((mEncAudioFifoOutBuf = (uint8_t*)av_malloc(2*MAX_AUDIO_PACKET_SIZE)) == NULL)
@@ -544,7 +558,11 @@
nFifoBytes, mEncAudioCodecCtx->frame_size);
// Pull the bytes out from the FIFO and feed them to the encoder.
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
if (av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nFifoBytes, NULL) == 0)
+#else
+ if (av_fifo_generic_read(mEncAudioFifo, nFifoBytes, NULL, mEncAudioFifoOutBuf) == 0)
+#endif
{
if (mEncAudioCodecCtx->frame_size != 1)
nEncodedBytes = avcodec_encode_audio(mEncAudioCodecCtx, mEncAudioEncodedBuf, mEncAudioEncodedBufSiz, (int16_t*)mEncAudioFifoOutBuf);
@@ -609,7 +627,10 @@
av_free(mEncAudioFifoOutBuf);
av_fifo_free(mEncAudioFifo);
+
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
mEncAudioFifo = NULL;
+#endif
return true;
}
@@ -635,7 +656,11 @@
// Read raw audio samples out of the FIFO in nAudioFrameSizeOut byte-sized groups to encode.
while ((ret = av_fifo_size(mEncAudioFifo)) >= nAudioFrameSizeOut)
{
+#if LIBAVUTIL_VERSION_INT > AV_VERSION_INT(49, 15, 0)
ret = av_fifo_generic_read(mEncAudioFifo, mEncAudioFifoOutBuf, nAudioFrameSizeOut, NULL);
+#else
+ ret = av_fifo_generic_read(mEncAudioFifo, nAudioFrameSizeOut, NULL, mEncAudioFifoOutBuf);
+#endif
av_init_packet(&pkt);
audacity-1.3.14-gtypes.patch:
AudacityApp.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE audacity-1.3.14-gtypes.patch ---
--- src/AudacityApp.cpp.orig 2011-11-04 10:44:41.016958277 +1100
+++ src/AudacityApp.cpp 2011-11-01 17:15:19.000000000 +1100
@@ -406,7 +406,7 @@
* Happily we can avoid the hack, as we only need some of the headers, not
* the full GTK headers
*/
-#include <glib/gtypes.h>
+//#include <glib/gtypes.h>
#include <glib-object.h>
typedef struct _GnomeProgram GnomeProgram;
12 years, 11 months
- 1
- 0
rpms/audacity-freeworld/devel .cvsignore, 1.8, 1.9 audacity-freeworld.spec, 1.18, 1.19 sources, 1.8, 1.9
by David Timms
Author: dtimms
Update of /cvs/free/rpms/audacity-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv461
Modified Files:
.cvsignore audacity-freeworld.spec sources
Log Message:
update to 1.3.14 beta release
add ffmpeg-0.8 patch from Leland Lucius
add patch to workaround gtypes-include problem
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 26 Apr 2011 13:20:05 -0000 1.8
+++ .cvsignore 12 Dec 2011 13:41:32 -0000 1.9
@@ -1 +1 @@
-audacity-minsrc-1.3.13-beta.tar.bz2
+audacity-minsrc-1.3.14-beta.tar.bz2
Index: audacity-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/audacity-freeworld.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- audacity-freeworld.spec 5 May 2011 11:52:22 -0000 1.18
+++ audacity-freeworld.spec 12 Dec 2011 13:41:32 -0000 1.19
@@ -1,17 +1,29 @@
+# Compile options:
+# --with mp3 : enable mp3 support
+
Name: audacity-freeworld
-Version: 1.3.13
-Release: 0.4.beta%{?dist}
+Version: 1.3.14
+Release: 0.4%{?dist}
Summary: Multitrack audio editor
Group: Applications/Multimedia
License: GPLv2
URL: http://audacity.sourceforge.net
-%define tartopdir audacity-src-%{version}-beta
%define realname audacity
Conflicts: %{realname}
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
+# use for upstream source releases:
+#Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-b...
+Source0: http://audacity.googlecode.com/files/audacity-minsrc-1.3.14-beta.tar.bz2
+%define tartopdir audacity-src-%{version}-beta
+
+# use for svn snapshot: [see package README for generation process]
+#Source0: audacity-minsrc-1.3.14-alpha-20111101.tar.bz2
+#%#define tartopdir audacity-src-%{version}-alpha-20111101
+
+# The manual is not versioned; it is essentially a work in progress
+Source1: http://manual.audacityteam.org/help.zip
Patch1: audacity-1.3.7-libmp3lame-default.patch
Patch2: audacity-1.3.9-libdir.patch
@@ -20,6 +32,8 @@
# enable startup notification
# add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
Patch3: audacity-1.3.13-desktop.in.patch
+Patch4: audacity-1.3.14-gtypes.patch
+Patch5: audacity-1.3.14-ffmpeg-0.8.patch
Provides: audacity-nonfree = %{version}-%{release}
Obsoletes: audacity-nonfree < %{version}-%{release}
@@ -81,6 +95,8 @@
done
%patch3 -b .desktop.old
+%patch4 -b .gtypes
+%patch5 -b .ffmpeg.old
%build
@@ -151,6 +167,15 @@
%changelog
+* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.4
+- update to 1.3.14 beta release
+
+* Thu Dec 8 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.3.alpha20111101svn11296
+- add ffmpeg-0.8 patch from Leland Lucius
+- add test patch to workaround gtypes-include problem
+
+* Tue Nov 1 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.1.alpha20111101svn11296
+- update to 1.3.14 alpha svn snapshot
* Sat Apr 30 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.4.beta
- fix files and dir ownership including -manual files in the main package
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacity-freeworld/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 26 Apr 2011 13:20:06 -0000 1.8
+++ sources 12 Dec 2011 13:41:32 -0000 1.9
@@ -1 +1 @@
-57be7fadb8c8dd17b8462c7ac1561d03 audacity-minsrc-1.3.13-beta.tar.bz2
+e7754757e7c3b543db9aa32180b0fb6f audacity-minsrc-1.3.14-beta.tar.bz2
12 years, 11 months
- 1
- 0
rpms/VirtualBox-OSE/devel VirtualBox-OSE.spec,1.76,1.77
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23912
Modified Files:
VirtualBox-OSE.spec
Log Message:
* Mon Dec 12 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-7
- complete list of commands of VBox command line based on
src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups.
- add source vboxweb-service to package.
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- VirtualBox-OSE.spec 11 Dec 2011 19:46:11 -0000 1.76
+++ VirtualBox-OSE.spec 12 Dec 2011 03:59:38 -0000 1.77
@@ -15,7 +15,7 @@
Name: VirtualBox-OSE
Version: 4.1.6
-Release: 6%{?prerel:.%{prerel}}%{?dist}
+Release: 7%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -221,13 +221,19 @@
# Binaries and Wrapper with Launchers
install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
-ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/virtualbox
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxmanage
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxsdl
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/VBoxTunctl \
@@ -283,7 +289,7 @@
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
-ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
+#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
@@ -317,6 +323,9 @@
install -m 0755 -D %{SOURCE9} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
+install -m 0755 -D %{SOURCE10} \
+ $RPM_BUILD_ROOT%{_initrddir}/%{SOURCE10}
+
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
@@ -405,11 +414,18 @@
%{_bindir}/VBoxBalloonCtrl
%{_bindir}/VBoxBFE
%{_bindir}/VBoxHeadless
+%{_bindir}/vboxheadless
%{_bindir}/VBoxManage
+%{_bindir}/vboxmanage
%{_bindir}/VBoxSDL
+%{_bindir}/vboxsdl
%{_bindir}/VBoxTunctl
%{_bindir}/VirtualBox
+%{_bindir}/virtualbox
%{_bindir}/vboxwebsrv
+%{_bindir}/VBoxVRDP
+%{_bindir}/VBoxBalloonCtrl
+%{_bindir}/vboxballoonctrl
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
%{_libdir}/virtualbox/*.[^p]*
@@ -439,6 +455,7 @@
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
+%attr(755,root,root) %{_initrddir}/*
%files devel
@@ -477,6 +494,11 @@
%changelog
+* Mon Dec 12 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-7
+- complete list of commands of VBox command line based on
+ src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups.
+- add source vboxweb-service to package.
+
* Sun Dec 11 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-6
- added compile fixes for kernel 3.2, although guest client still not start with X, now I got a
segfault, but will help who want try guest client with rawhide.
12 years, 11 months
- 1
- 0