Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Bor Kraljič (055c493d2e11ab1ef6f8f5240b519ab6d73341c1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Bor Kraljič (055c493d2e11ab1ef6f8f5240b519ab6d73341c1)
  • Date: Wed, 1 Feb 2012 14:05:32 -0600

GIT changes to master grimoire by Bor Kraljič <pyrobor AT ver.si>:

audio-soft/sox/HISTORY | 3 ++
audio-soft/sox/PRE_BUILD | 3 +-
audio-soft/sox/sox-14.3.2-ffmpeg.patch | 39
+++++++++++++++++++++++++++++++++
3 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit 055c493d2e11ab1ef6f8f5240b519ab6d73341c1
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

sox: added patch for compile problem with ffmpeg-0.10

diff --git a/audio-soft/sox/HISTORY b/audio-soft/sox/HISTORY
index 458f8a0..dfdcc9a 100644
--- a/audio-soft/sox/HISTORY
+++ b/audio-soft/sox/HISTORY
@@ -1,3 +1,6 @@
+2012-02-01 Bor Kraljič <pyrobor AT ver.si>
+ * sox-14.3.2-ffmpeg.patch: added for compile problem with ffmpeg-0.10
+
2011-07-25 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: renewed and fixed configure flags for dependencies

diff --git a/audio-soft/sox/PRE_BUILD b/audio-soft/sox/PRE_BUILD
index 1def27b..93badce 100755
--- a/audio-soft/sox/PRE_BUILD
+++ b/audio-soft/sox/PRE_BUILD
@@ -1,4 +1,5 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch"
+patch -p0 < "$SPELL_DIRECTORY/file-5.0.patch" &&
+patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/sox-14.3.2-ffmpeg.patch
diff --git a/audio-soft/sox/sox-14.3.2-ffmpeg.patch
b/audio-soft/sox/sox-14.3.2-ffmpeg.patch
new file mode 100644
index 0000000..e21583f
--- /dev/null
+++ b/audio-soft/sox/sox-14.3.2-ffmpeg.patch
@@ -0,0 +1,39 @@
+Index: sox-14.3.2/src/ffmpeg.c
+===================================================================
+--- sox-14.3.2.orig/src/ffmpeg.c
++++ sox-14.3.2/src/ffmpeg.c
+@@ -91,7 +91,7 @@ static int stream_component_open(priv_t
+
+ if (!codec || avcodec_open(enc, codec) < 0)
+ return -1;
+- if (enc->codec_type != CODEC_TYPE_AUDIO) {
++ if (enc->codec_type != AVMEDIA_TYPE_AUDIO) {
+ lsx_fail("ffmpeg CODEC %x is not an audio CODEC", enc->codec_type);
+ return -1;
+ }
+@@ -182,7 +182,7 @@ static int startread(sox_format_t * ft)
+ /* Find audio stream (FIXME: allow different stream to be selected) */
+ for (i = 0; (unsigned)i < ffmpeg->ctxt->nb_streams; i++) {
+ AVCodecContext *enc = ffmpeg->ctxt->streams[i]->codec;
+- if (enc->codec_type == CODEC_TYPE_AUDIO && ffmpeg->audio_index < 0) {
++ if (enc->codec_type == AVMEDIA_TYPE_AUDIO && ffmpeg->audio_index < 0) {
+ ffmpeg->audio_index = i;
+ break;
+ }
+@@ -273,7 +273,7 @@ static AVStream *add_audio_stream(sox_fo
+
+ c = st->codec;
+ c->codec_id = codec_id;
+- c->codec_type = CODEC_TYPE_AUDIO;
++ c->codec_type = AVMEDIA_TYPE_AUDIO;
+
+ /* put sample parameters */
+ c->bit_rate = 256000; /* FIXME: allow specification */
+@@ -423,7 +423,7 @@ static size_t write_samples(sox_format_t
+ av_init_packet(&pkt);
+ pkt.size = avcodec_encode_audio(c, ffmpeg->audio_buf_aligned,
AVCODEC_MAX_AUDIO_FRAME_SIZE, ffmpeg->samples);
+ pkt.pts = av_rescale_q(c->coded_frame->pts, c->time_base,
ffmpeg->audio_st->time_base);
+- pkt.flags |= PKT_FLAG_KEY;
++ pkt.flags |= AV_PKT_FLAG_KEY;
+ pkt.stream_index = ffmpeg->audio_st->index;
+ pkt.data = ffmpeg->audio_buf_aligned;



  • [SM-Commit] GIT changes to master grimoire by Bor Kraljič (055c493d2e11ab1ef6f8f5240b519ab6d73341c1), Bor Kraljič, 02/01/2012

Archive powered by MHonArc 2.6.24.

Top of Page