Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=ffmpeg200911.git;a=commitdiff;h=48c08ec9c8e599933ed976188577ab5153273350
commit 48c08ec9c8e599933ed976188577ab5153273350
Author: Cedynamix <cedyna...@gmail.com>
Date: Tue Dec 22 14:48:41 2009 +0100
mpeg4ip-1.6-5-i686
* Rebuild with ffmpeg-20090403
* add ffmpeg20090404.patch
diff --git a/source/multimedia/mpeg4ip/FrugalBuild
b/source/multimedia/mpeg4ip/FrugalBuild
index db7f09d..d81faf7 100644
--- a/source/multimedia/mpeg4ip/FrugalBuild
+++ b/source/multimedia/mpeg4ip/FrugalBuild
@@ -7,33 +7,35 @@ pkgrel=5
pkgdesc="mpeg4ip provides an end-to-end system to explore streaming multimedia"
Finclude sourceforge
depends=("libmp4v2=$pkgver")
-makedepends=('id3lib' 'sdl' 'gtk+2>=2.16.2-2' 'faad2' 'mpeg2dec>=0.4.1'
'x264>=20080426' \
- 'freetype2' 'libice' 'ffmpeg>=20080427-10' 'nas' \
+makedepends=('id3lib' 'sdl' 'gtk+2>=2.16.2-2' 'faad2' 'mpeg2dec>=0.4.1'
'x264>=20090416' \
+ 'freetype2' 'libice' 'ffmpeg>=20090403-1' 'nas' \
'alsa-lib' 'srtp' 'twolame')
groups=('multimedia')
options=('scriptlet')
archs=('i686' 'x86_64')
+up2date="$pkgver"
source=($source autoreconf.patch \
type_basic.cpp_compile.patch alsa.patch \
build-with-werror-is-a-configure-option.patch \
from-mpeg4ip-1.6.1-mp4v2_fixes.patch \
ffmpeg_includes.diff compile.diff ffmpeg_compile.diff \
- glib210.diff gcc44.diff)
+ glib210.diff gcc44.diff ffmpeg20090403.patch)
sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \
- '40b3370027cace5e3cfecfbf15798bf0ade5f036' \
- '9657405dfe23cd8baeb4ea419cd5f036b03fa8c8' \
- 'ec4cf44483d9e92afb97e7eb0866da5813577464' \
- 'a2f18f62986a7f19acce4c788e8ce30d3c3e0691' \
- '5a2944a6ea56fd255cafef7626eaed60fed170e2' \
- '07c78d62b348d8b31ce2614a9170518ddebc9134' \
- '93dd0e66761a1cc6e3e68fd0fd242f1b886c0d6e' \
- '38803376dfb3f467e2cfc2eaff97a4f41a11191c' \
- 'd192c1ffe672755d44e4e6c4aec1b35f7e9c1970' \
- '5e8e629f8e26d1fc2cc951ecdb46b18811aec847')
+ '40b3370027cace5e3cfecfbf15798bf0ade5f036' \
+ '9657405dfe23cd8baeb4ea419cd5f036b03fa8c8' \
+ 'ec4cf44483d9e92afb97e7eb0866da5813577464' \
+ 'a2f18f62986a7f19acce4c788e8ce30d3c3e0691' \
+ '5a2944a6ea56fd255cafef7626eaed60fed170e2' \
+ 'b249e44b3407a4468325ded3a901d01ec86e6711' \
+ '93dd0e66761a1cc6e3e68fd0fd242f1b886c0d6e' \
+ '38803376dfb3f467e2cfc2eaff97a4f41a11191c' \
+ 'd192c1ffe672755d44e4e6c4aec1b35f7e9c1970' \
+ '5e8e629f8e26d1fc2cc951ecdb46b18811aec847' \
+ 'bd2a96a5222f532a11a67fe497ff47252095ec1a')
subpkgs=("$pkgname-player" "$pkgname-server" "$pkgname-utils")
subdescs=('mpeg4ip player' 'mpeg4ip server' 'mpeg4ip utils')
-subdepends=("$pkgname=$pkgver gtk+2 sdl ffmpeg>=20080427 mpeg2dec id3lib
alsa-lib faad2 libmad" \
+subdepends=("$pkgname=$pkgver gtk+2 sdl ffmpeg>=20090403 mpeg2dec id3lib
alsa-lib faad2 libmad" \
"$pkgname=$pkgver $pkgname-player=$pkgver twolame" "$pkgname=$pkgver sdl")
subgroups=('xmultimedia' 'xmultimedia-extra' 'xmultimedia-extra')
subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
diff --git a/source/multimedia/mpeg4ip/ffmpeg20090403.patch
b/source/multimedia/mpeg4ip/ffmpeg20090403.patch
new file mode 100644
index 0000000..1417756
--- /dev/null
+++ b/source/multimedia/mpeg4ip/ffmpeg20090403.patch
@@ -0,0 +1,47 @@
+--- mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.cpp 2007-07-02
19:43:14.000000000 +0200
++++ mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.cpp 2009-12-22
14:29:42.000000000 +0100
+@@ -585,10 +585,20 @@
+ from.data[ix] = ffmpeg->m_picture->data[ix];
+ from.linesize[ix] = ffmpeg->m_picture->linesize[ix];
+ }
+-
++#ifdef HAVE_FFMPEG_INSTALLED
++ SwsContext *pSWSCtx;
++ pSWSCtx = sws_getContext(ffmpeg->m_c->width, ffmpeg->m_c->height,
++ ffmpeg->m_c->pix_fmt,
++ ffmpeg->m_c->width, ffmpeg->m_c->height,
++ PIX_FMT_YUV420P, SWS_BICUBIC, 0, 0, 0);
++ sws_scale(pSWSCtx, from.data, from.linesize, 0, ffmpeg->m_c->height,
++ to.data, to.linesize);
++ sws_freeContext(pSWSCtx);
++#else
+ img_convert(&to, PIX_FMT_YUV420P,
+ &from, ffmpeg->m_c->pix_fmt,
+ ffmpeg->m_c->width, ffmpeg->m_c->height);
++#endif
+ ffmpeg->m_vft->video_filled_buffer(ffmpeg->m_ifptr,
+ ffmpeg->have_cached_ts ?
+ ffmpeg->cached_ts : ts);
+
+--- mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2009-12-22
12:09:10.000000000 +0100
++++ mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2009-12-22
14:26:48.000000000 +0100
+@@ -28,6 +28,7 @@
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+ #include <libavcodec/avcodec.h>
++#include <libswscale/swscale.h>
+ #else
+ #include <avcodec.h>
+ #endif
+
+ --- mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.cpp 2009-12-22
12:04:12.000000000 +0100
++++ fw_mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.cpp 2009-12-22
12:04:12.000000000 +0100
+@@ -220,7 +220,7 @@
+ uint32_t freq_ts = pts->audio_freq_timestamp;
+
+ do {
+-#if HAVE_DECL_AVCODEC_DECODE_AUDIO2 != 1
++#if HAVE_DECL_AVCODEC_DECODE_AUDIO2 != 0
+ used = avcodec_decode_audio(ffmpeg->m_c, (short *)ffmpeg->m_outbuf,
+ &outsize, buffer, left);
+ #else
diff --git a/source/multimedia/mpeg4ip/ffmpeg_includes.diff
b/source/multimedia/mpeg4ip/ffmpeg_includes.diff
index c718f87..dcd9b66 100644
--- a/source/multimedia/mpeg4ip/ffmpeg_includes.diff
+++ b/source/multimedia/mpeg4ip/ffmpeg_includes.diff
@@ -58,3 +58,5 @@ diff -aur mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp
fw_mpeg4ip-1.6/serv
#else
#include <avcodec.h>
#endif
+
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
