From b313a9dfd6b006df4c0a84beb41287f2695d6a39 Mon Sep 17 00:00:00 2001
From: Kazuhiko Shiozaki <kazuhiko@nexedi.com>
Date: Thu, 31 Mar 2011 08:41:10 +0000
Subject: [PATCH] commit priscila.manhaes's improvements.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44863 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
buildout/software-profiles/ffmpeg.cfg | 40 +++++++++++++++++++--------
1 file changed, 28 insertions(+), 12 deletions(-)
diff --git a/buildout/software-profiles/ffmpeg.cfg b/buildout/software-profiles/ffmpeg.cfg
index 29060e6ed5..1be718b0a7 100644
--- a/buildout/software-profiles/ffmpeg.cfg
+++ b/buildout/software-profiles/ffmpeg.cfg
@@ -1,5 +1,8 @@
[buildout]
-parts =
+extends =
+ bzip2.cfg
+
+parts =
ffmpeg
[ffmpeg]
@@ -9,15 +12,11 @@ parts =
recipe = hexagonit.recipe.cmmi
url = http://downloads.xiph.org/releases/ogg/libogg-1.2.2.tar.gz
md5sum = 5a9fcabc9a1b7c6f1cd75ddc78f36c56
-configure-options =
- --disable-shared
[libvorbis]
recipe = hexagonit.recipe.cmmi
url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2
md5sum = 798a4211221073c1409f26eac4567e8b
-configure-options =
- --disable-shared
environment =
CPPFLAGS=-I${libogg:location}/include
LDFLAGS=-L${libogg:location}/lib -Wl,-rpath -Wl,${libogg:location}/lib
@@ -26,20 +25,37 @@ environment =
recipe = hexagonit.recipe.cmmi
url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
-configure-options =
- --disable-shared
environment =
CPPFLAGS=-I${libogg:location}/include -I${libvorbis:location}/include
- LDFLAGS =-L${libogg:location}/lib -Wl,-rpath -Wl,${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath -Wl,${libvorbis:location}/lib
+ LDFLAGS =-L${libogg:location}/lib -L${libvorbis:location}/lib
+
+[yasm]
+recipe = hexagonit.recipe.cmmi
+url = http://www.tortall.net/projects/yasm/releases/yasm-1.1.0.tar.gz
+
+[libvpx]
+recipe = hexagonit.recipe.cmmi
+url = http://webm.googlecode.com/files/libvpx-v0.9.5.tar.bz2
+md5sum = 4bf2f2c76700202c1fe9201fcb0680e3
+configure-options =
+ --enable-shared
+environment =
+ PATH=${yasm:location}/bin:%(PATH)s
[ffmpeg-0.6.1]
recipe = hexagonit.recipe.cmmi
url = http://www.ffmpeg.org/releases/ffmpeg-0.6.1.tar.bz2
md5sum = 4f5d732d25eedfb072251b5314ba2093
-configure-options =
+configure-options =
--enable-gpl
--enable-postproc
+ --enable-bzlib
--enable-libtheora
-environment =
- CPPFLAGS=-I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include
- LDFLAGS=-L${libogg:location}/lib -L${libvorbis:location}/lib -L${libtheora:location}/lib
+ --enable-libvpx
+ --enable-shared
+ --disable-static
+environment =
+ CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include -I${libvpx:location}/include
+ LDFLAGS=-L${bzip2:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -L${libtheora:location}/lib -L${libvpx:location}/lib
+ SHARED_LDFLAGS="${buildout:parts-directory}/${:_buildout_section_name_}/lib"
+
--
2.30.9