[Erp5-report] r44867 kazuhiko - /erp5/trunk/buildout/software-profiles/ffmpeg.cfg

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Mar 31 11:30:45 2011
New Revision: 44867

URL: http://svn.erp5.org?rev=44867&view=rev
Log:
use pkgconfig. enable yasm in ffmpeg.

Modified:
    erp5/trunk/buildout/software-profiles/ffmpeg.cfg

Modified: erp5/trunk/buildout/software-profiles/ffmpeg.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/ffmpeg.cfg?rev=44867&r1=44866&r2=44867&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/ffmpeg.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/ffmpeg.cfg [utf8] Thu Mar 31 11:30:45 2011
@@ -1,6 +1,7 @@
 [buildout]
 extends = 
   bzip2.cfg
+  pkgconfig.cfg
   zlib.cfg
 
 parts = 
@@ -19,16 +20,16 @@ recipe = hexagonit.recipe.cmmi
 url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.bz2
 md5sum = 798a4211221073c1409f26eac4567e8b
 environment = 
-  CPPFLAGS=-I${libogg:location}/include
-  LDFLAGS=-L${libogg:location}/lib -Wl,-rpath -Wl,${libogg:location}/lib
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig
 
 [libtheora]
 recipe = hexagonit.recipe.cmmi
 url = http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
 md5sum = 292ab65cedd5021d6b7ddd117e07cd8e
 environment = 
-  CPPFLAGS=-I${libogg:location}/include -I${libvorbis:location}/include
-  LDFLAGS =-L${libogg:location}/lib -L${libvorbis:location}/lib
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${libogg:location}/lib/pkgconfig:${libvorbis:location}/lib/pkgconfig
 
 [yasm]
 recipe = hexagonit.recipe.cmmi
@@ -60,3 +61,4 @@ configure-options = 
 environment = 
   CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libvorbis:location}/include -I${libtheora:location}/include -I${libvpx:location}/include -I${zlib:location}/include
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath -Wl,${bzip2:location}/lib -L${libogg:location}/lib -Wl,-rpath -Wl,${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath -Wl,${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath -Wl,${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath -Wl,${libvpx:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib
+  PATH=${yasm:location}/bin:%(PATH)s