Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b05364d800e7d188092260bc74377820e9e86f83
commit b05364d800e7d188092260bc74377820e9e86f83
Author: voroskoi <[EMAIL PROTECTED]>
Date: Tue Apr 29 02:47:16 2008 +0200
mpeg4ip-1.6-3-x86_64
rebuilt with x264>=20080426 and ffmpeg>=20080427
added compile.diff, ffmpeg_compile.diff and ffmpeg_includes.diff
diff --git a/source/multimedia/mpeg4ip/FrugalBuild
b/source/multimedia/mpeg4ip/FrugalBuild
index e788c45..3f1f9b9 100644
--- a/source/multimedia/mpeg4ip/FrugalBuild
+++ b/source/multimedia/mpeg4ip/FrugalBuild
@@ -3,11 +3,11 @@
pkgname=mpeg4ip
pkgver=1.6
-pkgrel=2
+pkgrel=3
pkgdesc="mpeg4ip provides an end-to-end system to explore streaming multimedia"
Finclude sourceforge
depends=("libmp4v2=$pkgver")
-makedepends=('id3lib' 'sdl' 'gtk+2' 'faad2' 'mpeg2dec' 'x264>=20070421' \
+makedepends=('id3lib' 'sdl' 'gtk+2' 'faad2' 'mpeg2dec' 'x264>=20080426' \
'freetype2' 'libice' 'ffmpeg>=20070422' 'nas' \
'alsa-lib' 'srtp' 'twolame')
groups=('multimedia')
@@ -16,7 +16,8 @@ archs=('i686' 'x86_64')
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)
+ from-mpeg4ip-1.6.1-mp4v2_fixes.patch \
+ ffmpeg_includes.diff compile.diff ffmpeg_compile.diff)
sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \
'40b3370027cace5e3cfecfbf15798bf0ade5f036' \
'9657405dfe23cd8baeb4ea419cd5f036b03fa8c8' \
@@ -26,7 +27,7 @@ sha1sums=('2d0d42a00c161f5152f8f2fd33ef192209ffb8c4' \
subpkgs=("$pkgname-player" "$pkgname-server" "$pkgname-utils")
subdescs=('mpeg4ip player' 'mpeg4ip server' 'mpeg4ip utils')
-subdepends=("$pkgname=$pkgver gtk+2 sdl ffmpeg>=20070422 mpeg2dec id3lib
alsa-lib faad2 libmad" \
+subdepends=("$pkgname=$pkgver gtk+2 sdl ffmpeg>=20080427 mpeg2dec id3lib
alsa-lib faad2 libmad" \
"$pkgname=$pkgver $pkgname-player=$pkgver twolame" "$pkgname=$pkgver sdl")
subgroups=('xmultimedia' 'xmultimedia' 'xmultimedia')
subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
@@ -34,6 +35,8 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
build()
{
Fcd
+ Fsed '-Werror' '' player/lib/audio/faad/Makefile.in
+ Fsed '-Werror' '' player/lib/audio/faad/Makefile.am
## hack to allow autoreconf
touch bootstrapped || Fdie
touch lib/SDLAudio/{NEWS,AUTHORS,ChangeLog} || Fdie
diff --git a/source/multimedia/mpeg4ip/compile.diff
b/source/multimedia/mpeg4ip/compile.diff
new file mode 100644
index 0000000..f379219
--- /dev/null
+++ b/source/multimedia/mpeg4ip/compile.diff
@@ -0,0 +1,13 @@
+diff -aur mpeg4ip-1.6/server/mp4live/video_util_resize.h
fw_mpeg4ip-1.6/server/mp4live/video_util_resize.h
+--- mpeg4ip-1.6/server/mp4live/video_util_resize.h 2005-03-25
21:15:31.000000000 +0100
++++ fw_mpeg4ip-1.6/server/mp4live/video_util_resize.h 2008-04-29
02:03:53.000000000 +0200
+@@ -90,7 +90,7 @@
+
+ void CopyYuv(const uint8_t *fY, const uint8_t *fU, const uint8_t *fV,
+ uint32_t fyStride, uint32_t fuStride, uint32_t fvStride,
+- uint8_t *tY, uint8_t *tU, uint8_t *fV,
+- uint32_t tyStride, uint32_t tvStride, uint32_t tvStride,
++ uint8_t *tY, uint8_t *tU, uint8_t *tV,
++ uint32_t tyStride, uint32_t tuStride, uint32_t tvStride,
+ uint32_t w, uint32_t h);
+ #endif
diff --git a/source/multimedia/mpeg4ip/ffmpeg_compile.diff
b/source/multimedia/mpeg4ip/ffmpeg_compile.diff
new file mode 100644
index 0000000..e92e0eb
--- /dev/null
+++ b/source/multimedia/mpeg4ip/ffmpeg_compile.diff
@@ -0,0 +1,30 @@
+diff -aur mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp
fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp
+--- mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp 2007-01-30
22:38:19.000000000 +0100
++++ fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.cpp 2008-04-29
02:39:14.000000000 +0200
+@@ -120,26 +120,15 @@
+ m_avctx->height = Profile()->m_videoHeight;
+ m_avctx->bit_rate =
+ Profile()->GetIntegerValue(CFG_VIDEO_BIT_RATE) * 1000;
+-#ifndef HAVE_AVCODECCONTEXT_TIME_BASE
+- m_avctx->frame_rate = (int)(Profile()->GetFloatValue(CFG_VIDEO_FRAME_RATE)
+ 0.5);
+- m_avctx->frame_rate_base = 1;
+-#else
+ m_avctx->time_base = (AVRational){1,
(int)(Profile()->GetFloatValue(CFG_VIDEO_FRAME_RATE) + .5)};
+ m_avctx->pix_fmt = PIX_FMT_YUV420P;
+ m_avctx->me_method = ME_EPZS;
+-#endif
+ if (Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH) > 0 &&
+ Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT) > 0) {
+-#ifndef HAVE_AVRATIONAL
+- float asp = (float)Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH);
+- asp /= (float)Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT);
+- m_avctx->aspect_ratio = asp;
+-#else
+ AVRational asp =
+ {Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_WIDTH),
+ Profile()->GetIntegerValue(CFG_VIDEO_MPEG4_PAR_HEIGHT)};
+ m_avctx->sample_aspect_ratio = asp;
+-#endif
+ }
+
+ #if 0
diff --git a/source/multimedia/mpeg4ip/ffmpeg_includes.diff
b/source/multimedia/mpeg4ip/ffmpeg_includes.diff
new file mode 100644
index 0000000..c718f87
--- /dev/null
+++ b/source/multimedia/mpeg4ip/ffmpeg_includes.diff
@@ -0,0 +1,60 @@
+diff -aur mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h
fw_mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h
+--- mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h 2007-07-02
19:43:14.000000000 +0200
++++ fw_mpeg4ip-1.6/player/plugin/audio/ffmpeg/ffmpeg.h 2008-04-29
01:07:31.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include "codec_plugin.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
+diff -aur mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h
fw_mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h
+--- mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2007-07-02
19:43:14.000000000 +0200
++++ fw_mpeg4ip-1.6/player/plugin/video/ffmpeg/ffmpeg.h 2008-04-29
01:08:26.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include "codec_plugin.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
+diff -aur mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h
fw_mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h
+--- mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h 2007-07-02 19:43:14.000000000
+0200
++++ fw_mpeg4ip-1.6/server/mp4live/audio_ffmpeg.h 2008-04-29
02:13:50.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include "audio_encoder.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
+diff -aur mpeg4ip-1.6/server/mp4live/video_ffmpeg.h
fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.h
+--- mpeg4ip-1.6/server/mp4live/video_ffmpeg.h 2007-07-02 19:43:14.000000000
+0200
++++ fw_mpeg4ip-1.6/server/mp4live/video_ffmpeg.h 2008-04-29
02:15:13.000000000 +0200
+@@ -25,7 +25,7 @@
+ #include "video_encoder.h"
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
+diff -aur mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp
fw_mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp
+--- mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp 2007-07-02
19:43:14.000000000 +0200
++++ fw_mpeg4ip-1.6/server/mp4live/video_encoder_class.cpp 2008-04-29
02:24:15.000000000 +0200
+@@ -27,7 +27,7 @@
+ #ifdef HAVE_FFMPEG
+ extern "C" {
+ #ifdef HAVE_FFMPEG_INSTALLED
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ #else
+ #include <avcodec.h>
+ #endif
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
