Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ffmpeg200911.git;a=commitdiff;h=44b76258650c13a9352af350803edb7e4f32e9ba

commit 44b76258650c13a9352af350803edb7e4f32e9ba
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Sat Dec 12 13:18:58 2009 +0000

akode-2.0.2-8-i686
*rebuild with ffmpeg>=20090403
*fixed ffmepg patch

diff --git a/source/xmultimedia/akode/FrugalBuild 
b/source/xmultimedia/akode/FrugalBuild
index ad26b16..d6f0ab0 100644
--- a/source/xmultimedia/akode/FrugalBuild
+++ b/source/xmultimedia/akode/FrugalBuild
@@ -3,10 +3,10 @@

pkgname=akode
pkgver=2.0.2
-pkgrel=7
+pkgrel=8
pkgdesc="A simple audio-decoding frame-work that provides a uniform interface 
to decode the most common audio-formats"
depends=('jack' 'flac>=1.2.1-2' 'libsamplerate' 'libvorbis' 'speex' \
-       'libmad' 'libstdc++' 'ffmpeg>=20080427-11' 'faad2>=2.7' 'faac' \
+       'libmad' 'libstdc++' 'ffmpeg>=20090403' 'faad2>=2.7' 'faac' \
'libraw1394>=2.0.2')
license="LGPL"
groups=('xmultimedia')
@@ -42,7 +42,7 @@ sha1sums=('10ad1e335bc53c2a90d133b493568324514c729c' \
'f8a9b3813e9ffc4af6cd207508defbb86c1d3e72' \
'5b8d75fdbd038e163558de8699747a4196a6e52e' \
'1aabdb63b0bd46047007954ef404540e6871217d' \
-          'cd0d7d23ce365b30367bc9a89b41d27fb0b1171b' \
+          '78a1fa350bd0e64acbb1511c16a768b1fe64fbce' \
'7eaa33447731bc403d1ccee06196ea844da78d43')

# optimization OK
diff --git a/source/xmultimedia/akode/ffmpeg_includes.diff 
b/source/xmultimedia/akode/ffmpeg_includes.diff
index f3f08a1..9c4bd9e 100644
--- a/source/xmultimedia/akode/ffmpeg_includes.diff
+++ b/source/xmultimedia/akode/ffmpeg_includes.diff
@@ -1,16 +1,47 @@
-diff -aur akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 
fw_akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
---- akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp        
2006-08-10 20:37:20.000000000 +0200
-+++ fw_akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp     
2008-04-28 13:42:32.000000000 +0200
-@@ -26,9 +26,9 @@
+$NetBSD: patch-ad,v 1.2 2009/06/14 12:46:44 hasso Exp $
+
+--- akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.orig       2006-08-10 
21:37:20 +0300
++++ akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp    2009-06-14 15:14:53 
+0300
+@@ -26,9 +26,11 @@
#include "decoder.h"

#include <assert.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
++extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
++}

#include "ffmpeg_decoder.h"
#include <iostream>
+@@ -45,7 +47,7 @@ extern "C" {
+         aKode::File *file = (aKode::File*)opaque;
+         return file->write((char*)buf, size);
+     }
+-    static offset_t akode_seek(void* opaque, offset_t pos, int whence)
++    static int64_t akode_seek(void* opaque, int64_t pos, int whence)
+     {
+         aKode::File *file = (aKode::File*)opaque;
+         return file->seek(pos, whence);
+@@ -314,7 +316,7 @@ bool FFMPEGDecoder::readFrame(AudioFrame
+     assert(d->packet.stream_index == d->audioStream);
+
+ retry:
+-    int len = avcodec_decode_audio( d->ic->streams[d->audioStream]->codec,
++    int len = avcodec_decode_audio2( d->ic->streams[d->audioStream]->codec,
+                                     (short*)d->buffer, &d->buffer_size,
+                                     d->packetData, d->packetSize );
+
+@@ -349,7 +351,7 @@ retry:
+             assert(false);
+     }
+     if (length == 0) return readFrame(frame);
+-    std::cout << "akode: FFMPEG: Frame length: " << length << "\n";
++    // std::cout << "akode: FFMPEG: Frame length: " << length << "\n";
+
+     if( d->packetSize <= 0 )
+         av_free_packet( &d->packet );
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to