Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=ffmpeg200911.git;a=commitdiff;h=412a853b187d0858a2308c6dd14db7cab715f1f3
commit 412a853b187d0858a2308c6dd14db7cab715f1f3
Author: Cedynamix <cedyna...@gmail.com>
Date: Wed Dec 16 01:44:09 2009 +0100
mlt-0.4.10-1-i686
* Version bump
* Build with ffmepg-20090403-1
diff --git a/source/xmultimedia-extra/mlt/FrugalBuild
b/source/xmultimedia-extra/mlt/FrugalBuild
index 8e29123..9eec4d8 100644
--- a/source/xmultimedia-extra/mlt/FrugalBuild
+++ b/source/xmultimedia-extra/mlt/FrugalBuild
@@ -2,24 +2,21 @@
# Maintainer: crazy <cr...@frugalware.org>
pkgname=mlt
-pkgver=0.2.4
-pkgrel=5
+pkgver=0.4.10
+pkgrel=1
pkgdesc="MLT is an open source multimedia framework, designed and developed for
television broadcasting."
-depends=('libsamplerate' 'alsa-lib' 'libdv' 'libxcb' 'ffmpeg>=20080427-4'
'libmad' 'libdv' 'libvorbis' 'lame' 'libogg')
-makedepends=('qt' 'gtk+2' 'freetype2>=2.3.4' 'sox>=14.2.0' 'jack' 'libxml2'
'sdlimage' 'libquicktime>=1.0.0' 'zlib' 'ladspa_sdk')
+depends=('libsamplerate' 'alsa-lib' 'libdv' 'libxcb' 'ffmpeg>=20090403-1'
'libmad' 'libdv' 'libvorbis' 'lame' 'libogg')
+makedepends=('qt4' 'gtk+2' 'freetype2>=2.3.4' 'sox>=14.2.0' 'jack' 'libxml2'
'sdlimage' 'libquicktime>=1.1.3' '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 configure.diff \
+ no-O4s-and-other-crap-thx.patch \
ffmpeg_includes.diff)
-sha1sums=('4074dab510037ad9f49401bad75c8b78c1ee06b8' \
- '54b4568963558b972d5d1cfa402f732f08bc1a8d' \
- '51291b48dea4d7f2078cfa3669afac120e024d72' \
- 'dd259ce0db75d14272701ded95b2362195e1ec60' \
- '7f6740922f9654e9c659c7c2ff5c8e6c3c883976')
-
+sha1sums=('21fe7642f018f0de9392fcb58e11530208171d23' \
+ '875a788d99cc8b9b574df1c48868882478add076' \
+ '9f2b134761a912e351be29aefbec188e0ccb21fc')
subpkgs=("$pkgname-lumas" "$pkgname-qimage" "$pkgname-gtk2" "$pkgname-sdl"
"$pkgname-jack" "$pkgname-kino")
subdescs=("Lumas module for $pkgname" "Qimage module for $pkgname" "Gtk2 module
for $pkgname" "SDL module for $pkgname" \
@@ -32,14 +29,15 @@ subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' 'i686
x86_64' 'i686 x86_64'
build()
{
+ Fconfopts="$Fconfopts --enable-gpl --avformat-swscale
--qimage-libdir=/usr/lib --qimage-includedir=/usr/include/Qt"
[ "$CARCH" == "x86_64" ] && Fconfopts="$Fconfopts --disable-mmx"
- Fbuild --enable-gpl --enable-motion-est
- 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
- Fsplit $pkgname-sdl usr/share/$pkgname/modules/libmltsdl.so
- Fsplit $pkgname-jack usr/share/$pkgname/modules/libmltjackrack.so
- Fsplit $pkgname-kino usr/share/$pkgname/modules/libmltkino.so
+ Fbuild
+ Fsplit $pkgname-lumas usr/share/$pkgname/lumas/
+ Fsplit $pkgname-qimage usr/lib/$pkgname/libmltqimage.so
+ Fsplit $pkgname-gtk2 usr/lib/$pkgname/libmltgtk2.so
+ Fsplit $pkgname-sdl usr/lib/$pkgname/libmltsdl.so
+ Fsplit $pkgname-jack usr/lib/$pkgname/libmltjackrack.so
+ Fsplit $pkgname-kino usr/lib/$pkgname/libmltkino.so
}
# optimization OK
diff --git a/source/xmultimedia-extra/mlt/configure.diff
b/source/xmultimedia-extra/mlt/configure.diff
index 42d2452..90aaebc 100644
--- a/source/xmultimedia-extra/mlt/configure.diff
+++ b/source/xmultimedia-extra/mlt/configure.diff
@@ -1,24 +1,23 @@
-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
+diff -u mlt-0.4.10/src/modules/qimageconfigure
mlt-0.4.10/src/modules/qimage/configure
+--- mlt-0.4.10/src/modules/qimage/configure 2009-12-13 02:21:41.000000000
+0100
++++ mlt-0.4.10/src/modules/qimage/configure 2009-12-13 02:21:29.000000000
+0100
+@@ -29,8 +29,8 @@
;;
- *)
- 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
+ esac
+
+- qimage_includedir=/usr/include/qt4
+- qimage_libdir=/usr/lib/qt4
++ qimage_includedir=/usr/include/qt
++ qimage_libdir=/usr/lib/qt
+
+ if [ ! -d "$qimage_libdir" -o ! -d "$qimage_includedir" ]
+ then
+@@ -48,7 +48,7 @@
+ if [ "$QTDIR" != "" ]
+ then
+ qimage_includedir="$QTDIR/include"
+- qimage_libdir="$QTDIR/lib"
++ qimage_libdir="$QTDIR"
+ fi
+
+ export force_qt3=
diff --git a/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
b/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
index 6c56de3..bc3f536 100644
--- a/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
+++ b/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
@@ -1,90 +1,15 @@
-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>
+--- /src/modules/avformat/producer_avformat.c 2009-12-09 05:38:48.000000000
+0100
++++ /src/modules/avformat/producer_avformat.c 2009-12-12 21:28:54.000000000
+0100
+@@ -26,10 +26,10 @@
+ #include <framework/mlt_log.h>
// ffmpeg Header files
-#include <avformat.h>
+#include <libavformat/avformat.h>
+ #include <opt.h>
#ifdef SWSCALE
--#include <swscale.h>
+-# 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;
- }
+ #if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+ # include "audioconvert.h"
diff --git a/source/xmultimedia-extra/mlt/no-O4s-and-other-crap-thx.patch
b/source/xmultimedia-extra/mlt/no-O4s-and-other-crap-thx.patch
index c88c09a..105c60d 100644
--- a/source/xmultimedia-extra/mlt/no-O4s-and-other-crap-thx.patch
+++ b/source/xmultimedia-extra/mlt/no-O4s-and-other-crap-thx.patch
@@ -1,22 +1,21 @@
-diff -Naurp mlt-0.2.2/configure mlt-0.2.2-p/configure
---- mlt-0.2.2/configure 2006-05-27 21:58:15.000000000 +0200
-+++ mlt-0.2.2-p/configure 2006-12-28 18:14:39.000000000 +0100
-@@ -54,9 +54,8 @@ function build_config
- [ "$cpu" != "" ] &&
- echo "TARGETARCH=-march=$cpu" &&
- echo "TARGETCPU=-mcpu=$cpu"
-- echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
+--- configure 2009-12-09 05:38:48.000000000 +0100
++++ configurenew 2009-12-12 16:05:59.000000000 +0100
+@@ -65,9 +65,8 @@
-- echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU)
\$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
-+ echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU)
\$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+ [ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
+ [ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
+- echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
+
+- echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU)
\$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
++ echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU)
\$(OPTIMISATIONS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
case $targetos in
Darwin)
-@@ -65,7 +64,6 @@ function build_config
- echo "LDFLAGS+=`sdl-config --libs`"
+@@ -87,7 +86,6 @@
;;
- Linux)
+ FreeBSD)
+ [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo
"CFLAGS+=-DARCH_X86_64"
- echo "OPTIMISATIONS+=-ffast-math"
echo "CFLAGS+=-pthread"
echo "SHFLAGS=-shared"
- echo "LIBDL=-ldl"
+ echo "RDYNAMIC=-rdynamic"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
