Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=be4d5c9a70d2ceb9d91e769e644b06663d004f31
commit be4d5c9a70d2ceb9d91e769e644b06663d004f31
Author: voroskoi <[EMAIL PROTECTED]>
Date: Mon Apr 28 15:17:20 2008 +0200
mlt-0.2.4-3-x86_64
rebuilt with ffmpeg>=20080427
added configure.diff and ffmpeg_includes.diff
diff --git a/source/xmultimedia-extra/mlt/FrugalBuild
b/source/xmultimedia-extra/mlt/FrugalBuild
index fd1e6c3..90d2a28 100644
--- a/source/xmultimedia-extra/mlt/FrugalBuild
+++ b/source/xmultimedia-extra/mlt/FrugalBuild
@@ -3,15 +3,15 @@
pkgname=mlt
pkgver=0.2.4
-pkgrel=2
+pkgrel=3
pkgdesc="MLT is an open source multimedia framework, designed and developed for
television broadcasting."
-depends=('libsamplerate' 'alsa-lib' 'libdv' 'libxcb' 'ffmpeg>=20070422'
'libmad' 'libdv' 'libvorbis' 'lame' 'libogg')
+depends=('libsamplerate' 'alsa-lib' 'libdv' 'libxcb' 'ffmpeg>=20080427'
'libmad' 'libdv' 'libvorbis' 'lame' 'libogg')
makedepends=('qt' 'gtk+2' 'freetype2>=2.3.4' 'sox' 'jack' 'libxml2' 'sdlimage'
'libquicktime>=1.0.0' 'zlib' 'ladspa_sdk')
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
Finclude sourceforge
-source=($source no-O4s-and-other-crap-thx.patch mlt-0.2.4-gcc-4.3.patch)
+source=($source no-O4s-and-other-crap-thx.patch mlt-0.2.4-gcc-4.3.patch
configure.diff ffmpeg_includes.diff)
sha1sums=('4074dab510037ad9f49401bad75c8b78c1ee06b8' \
'54b4568963558b972d5d1cfa402f732f08bc1a8d' \
'51291b48dea4d7f2078cfa3669afac120e024d72')
@@ -29,7 +29,7 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686
x86_64' 'i686 x86_64'
build()
{
[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --disable-mmx"
- Fbuild --enable-gpl --enable-motion-est
+ Fbuild --enable-gpl --enable-motion-est --avformat-swscale
Fsplit $pkgname-lumas usr/share/$pkgname/modules/lumas/
Fsplit $pkgname-qimage usr/share/$pkgname/modules/libmltqimage.so
Fsplit $pkgname-gtk2 usr/share/$pkgname/modules/libmltgtk2.so
diff --git a/source/xmultimedia-extra/mlt/configure.diff
b/source/xmultimedia-extra/mlt/configure.diff
new file mode 100644
index 0000000..42d2452
--- /dev/null
+++ b/source/xmultimedia-extra/mlt/configure.diff
@@ -0,0 +1,24 @@
+diff -aur mlt-0.2.4/src/modules/avformat/configure
fw_mlt-0.2.4/src/modules/avformat/configure
+--- mlt-0.2.4/src/modules/avformat/configure 2007-07-15 09:43:48.000000000
+0200
++++ fw_mlt-0.2.4/src/modules/avformat/configure 2008-04-28
14:36:45.000000000 +0200
+@@ -32,7 +32,7 @@
+ bits=$(uname -m)
+ case $bits in
+ x86_64)
+- export LIBDIR=lib64
++ export LIBDIR=lib
+ ;;
+ *)
+ export LIBDIR=lib
+@@ -125,9 +125,9 @@
+ echo 0
+ fi
+ else
+- if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f
"$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
++ if [ -d "$shared_ffmpeg/include" -a -f
"$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
+ then
+- echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >>
config.mak
++ echo "CFLAGS+=-I$shared_ffmpeg/include " >> config.mak
+ echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
+ [ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
+ else
diff --git a/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
b/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
new file mode 100644
index 0000000..6c56de3
--- /dev/null
+++ b/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
@@ -0,0 +1,90 @@
+diff -aur mlt-0.2.4/src/modules/avformat/consumer_avformat.c
fw_mlt-0.2.4/src/modules/avformat/consumer_avformat.c
+--- mlt-0.2.4/src/modules/avformat/consumer_avformat.c 2007-07-30
21:11:49.000000000 +0200
++++ fw_mlt-0.2.4/src/modules/avformat/consumer_avformat.c 2008-04-28
14:51:13.000000000 +0200
+@@ -34,9 +34,9 @@
+ #include <math.h>
+
+ // avformat header files
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ #ifdef SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+
+ //
+diff -aur mlt-0.2.4/src/modules/avformat/factory.c
fw_mlt-0.2.4/src/modules/avformat/factory.c
+--- mlt-0.2.4/src/modules/avformat/factory.c 2007-03-30 08:55:55.000000000
+0200
++++ fw_mlt-0.2.4/src/modules/avformat/factory.c 2008-04-28
14:48:15.000000000 +0200
+@@ -29,7 +29,7 @@
+ #include "filter_avresample.h"
+
+ // ffmpeg Header files
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+
+ // A static flag used to determine if avformat has been initialised
+ static int avformat_initialised = 0;
+diff -aur mlt-0.2.4/src/modules/avformat/filter_avcolour_space.c
fw_mlt-0.2.4/src/modules/avformat/filter_avcolour_space.c
+--- mlt-0.2.4/src/modules/avformat/filter_avcolour_space.c 2007-03-30
08:55:55.000000000 +0200
++++ fw_mlt-0.2.4/src/modules/avformat/filter_avcolour_space.c 2008-04-28
15:04:39.000000000 +0200
+@@ -23,9 +23,9 @@
+ #include <framework/mlt_frame.h>
+
+ // ffmpeg Header files
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ #ifdef SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+
+ #include <stdio.h>
+diff -aur mlt-0.2.4/src/modules/avformat/filter_avdeinterlace.c
fw_mlt-0.2.4/src/modules/avformat/filter_avdeinterlace.c
+--- mlt-0.2.4/src/modules/avformat/filter_avdeinterlace.c 2007-03-30
08:55:55.000000000 +0200
++++ fw_mlt-0.2.4/src/modules/avformat/filter_avdeinterlace.c 2008-04-28
15:06:58.000000000 +0200
+@@ -26,7 +26,7 @@
+ #include <stdlib.h>
+
+ // ffmpeg Header files
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+
+ #ifdef USE_MMX
+ #include "mmx.h"
+diff -aur mlt-0.2.4/src/modules/avformat/filter_avresample.c
fw_mlt-0.2.4/src/modules/avformat/filter_avresample.c
+--- mlt-0.2.4/src/modules/avformat/filter_avresample.c 2007-03-30
08:55:55.000000000 +0200
++++ fw_mlt-0.2.4/src/modules/avformat/filter_avresample.c 2008-04-28
15:06:08.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include <string.h>
+
+ // ffmpeg Header files
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+
+ /** Get the audio.
+ */
+diff -aur mlt-0.2.4/src/modules/avformat/producer_avformat.c
fw_mlt-0.2.4/src/modules/avformat/producer_avformat.c
+--- mlt-0.2.4/src/modules/avformat/producer_avformat.c 2007-07-15
00:34:45.000000000 +0200
++++ fw_mlt-0.2.4/src/modules/avformat/producer_avformat.c 2008-04-28
15:00:03.000000000 +0200
+@@ -25,9 +25,9 @@
+ #include <framework/mlt_frame.h>
+
+ // ffmpeg Header files
+-#include <avformat.h>
++#include <libavformat/avformat.h>
+ #ifdef SWSCALE
+-#include <swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+
+ // System header files
+@@ -203,7 +203,7 @@
+ params->width = 640;
+ params->height = 480;
+ params->time_base= (AVRational){1,25};
+- params->device = file;
++ // params->device = file;
+ params->channels = 2;
+ params->sample_rate = 48000;
+ }
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
