Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=jackwip.git;a=commitdiff;h=cb07f8fe4c1a3566946b73903fbd539c93d2858e
commit cb07f8fe4c1a3566946b73903fbd539c93d2858e
Author: exceed <exceed.ced...@gmail.com>
Date: Tue Apr 20 23:45:21 2010 +0200
mlt-0.5.4-1-i686
* Version bump
* Removed useless patches
* Fixed subpakages depends
diff --git a/source/xmultimedia-extra/mlt/FrugalBuild
b/source/xmultimedia-extra/mlt/FrugalBuild
index 6c09f13..5aee27b 100644
--- a/source/xmultimedia-extra/mlt/FrugalBuild
+++ b/source/xmultimedia-extra/mlt/FrugalBuild
@@ -11,59 +11,29 @@ groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
options=('scriptlet' 'force')
Finclude sourceforge python
-source=($source \
- no-O4s-and-other-crap-thx.patch \
- ffmpeg_includes.diff)
sha1sums=('8c38f78e99f9eb1b8e06961aebee7213b995144a')
-subpkgs=("${subpk...@]}" "$pkgname-lumas")
-subdescs=("${subdes...@]}" "Lumas module for $pkgname")
-subdepends=("${subdepen...@]}" "$pkgname=$pkgver")
-subgroups=("${subgrou...@]}" 'xmultimedia-extra')
-subarchs=("${subarc...@]}" 'i686 x86_64')
-suboptions=("${suboptio...@]}" 'force')
-
-subpkgs=("${subpk...@]}" "$pkgname-qimage")
-subdescs=("${subdes...@]}" "Qimage module for $pkgname")
-subdepends=("${subdepen...@]}" "$pkgname=$pkgver libxi libstdc++ libxrender
libqtgui")
-subgroups=("${subgrou...@]}" 'xmultimedia-extra')
-subarchs=("${subarc...@]}" 'i686 x86_64')
-suboptions=("${suboptio...@]}" 'force')
-
-subpkgs=("${subpk...@]}" "$pkgname-gtk2")
-subdescs=("${subdes...@]}" "Gtk2 module for $pkgname")
-subdepends=("${subdepen...@]}" "$pkgname=$pkgver gtk+2 freetype2>=2.3.4")
-subgroups=("${subgrou...@]}" 'xmultimedia-extra')
-subarchs=("${subarc...@]}" 'i686 x86_64')
-suboptions=("${suboptio...@]}" 'force')
-
-subpkgs=("${subpk...@]}" "$pkgname-sdl")
-subdescs=("${subdes...@]}" "SDL module for $pkgname")
-subdepends=("${subdepen...@]}" "$pkgname=$pkgver sdlimage")
-subgroups=("${subgrou...@]}" 'xmultimedia-extra')
-subarchs=("${subarc...@]}" 'i686 x86_64')
-suboptions=("${suboptio...@]}" 'force')
-
-subpkgs=("${subpk...@]}" "$pkgname-jack")
-subdescs=("${subdes...@]}" "Jack modules for $pkgname")
-subdepends=("${subdepen...@]}" "$pkgname=$pkgver jack libxml2")
-subgroups=("${subgrou...@]}" 'xmultimedia-extra')
-subarchs=("${subarc...@]}" 'i686 x86_64')
-suboptions=("${suboptio...@]}" 'force')
-
-subpkgs=("${subpk...@]}" "$pkgname-kino")
-subdescs=("${subdes...@]}" "Kino module for $pkgname")
-subdepends=("${subdepen...@]}" "$pkgname=$pkgver libquicktime>=1.1.3 zlib
libdv")
-subgroups=("${subgrou...@]}" 'xmultimedia-extra')
-subarchs=("${subarc...@]}" 'i686 x86_64')
-suboptions=("${suboptio...@]}" 'force')
-
-subpkgs=("${subpk...@]}" "$pkgname-python")
-subdescs=("${subdes...@]}" "python bindings for MLT multimedia framework")
-subdepends=("${subdepen...@]}" "$pkgname=$pkgver python")
-subgroups=("${subgrou...@]}" 'xmultimedia-extra')
-subarchs=("${subarc...@]}" 'i686 x86_64')
-suboptions=("${suboptio...@]}" 'force')
+subpkgs=("$pkgname-lumas" "$pkgname-qimage" "$pkgname-gtk2" \
+ "$pkgname-sdl" "$pkgname-jack" "$pkgname-kino" \
+ "$pkgname-python")
+subdescs=("Lumas module for $pkgname" "Qimage module for $pkgname" "Gtk2
module for $pkgname" \
+ "SDL module for $pkgname" "Jack modules for $pkgname" "Kino modules for
$pkgname" \
+ "python bindings for MLT multimedia framework")
+subdepends=("" "libxi libstdc++ libxrender libqtgui" "gtk+2 freetype2>=2.3.4" \
+ "sdlimage" "jack>=0.118.0 libxml2" "libquicktime>=1.1.3 zlib libdv" \
+ "python")
+subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \
+ "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \
+ "$pkgname=$pkgver")
+subgroups=('xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' \
+ 'xmultimedia-extra' 'xmultimedia-extra' 'xmultimedia-extra' \
+ 'xmultimedia-extra')
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64' \
+ 'i686 x86_64' 'i686 x86_64' 'i686 x86_64' \
+ 'i686 x86_64')
+suboptions=('force' 'force' 'force' \
+ 'force' 'force' 'force' \
+ 'force')
build()
{
diff --git a/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
b/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
deleted file mode 100644
index bc3f536..0000000
--- a/source/xmultimedia-extra/mlt/ffmpeg_includes.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- /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 <libswscale/swscale.h>
- #endif
- #if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
- # include "audioconvert.h"
diff --git a/source/xmultimedia-extra/mlt/mlt-0.2.4-gcc-4.3.patch
b/source/xmultimedia-extra/mlt/mlt-0.2.4-gcc-4.3.patch
deleted file mode 100644
index c953d8c..0000000
--- a/source/xmultimedia-extra/mlt/mlt-0.2.4-gcc-4.3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/modules/kino/avi.cc
-+++ src/modules/kino/avi.cc
-@@ -175,6 +175,7 @@
- // C++ includes
-
- #include <string>
-+#include <cstring>
- #include <iostream>
- #include <iomanip>
-
---- src/modules/kino/filehandler.cc
-+++ src/modules/kino/filehandler.cc
-@@ -24,6 +24,7 @@
- }
-
- #include <string>
-+#include <cstring>
- #include <iostream>
- #include <sstream>
- #include <iomanip>
---- src/modules/kino/kino_wrapper.cc
-+++ src/modules/kino/kino_wrapper.cc
-@@ -19,7 +19,8 @@
- */
-
- #include "config.h"
--#include <strings.h>
-+#include <cstring>
-+#include <cstdlib>
- #include "kino_wrapper.h"
- #include "filehandler.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
deleted file mode 100644
index 105c60d..0000000
--- a/source/xmultimedia-extra/mlt/no-O4s-and-other-crap-thx.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure 2009-12-09 05:38:48.000000000 +0100
-+++ configurenew 2009-12-12 16:05:59.000000000 +0100
-@@ -65,9 +65,8 @@
-
- [ "$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)
-@@ -87,7 +86,6 @@
- ;;
- 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 "RDYNAMIC=-rdynamic"
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
