Commit 755872fe authored by Gabriel Monnerat's avatar Gabriel Monnerat

enable compilation of ffmpeg

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44941 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b1968b5d
...@@ -59,7 +59,7 @@ memory-limit = 1000 ...@@ -59,7 +59,7 @@ memory-limit = 1000
uno-path = ${software_definition:openoffice_software}/basis-link/program/ uno-path = ${software_definition:openoffice_software}/basis-link/program/
office-binary-path = ${software_definition:openoffice_software}/program/ office-binary-path = ${software_definition:openoffice_software}/program/
openoffice-port = 4062 openoffice-port = 4062
env-PATH = ${software_definition:software_home}/parts/xpdf/bin:${software_definition:software_home}/parts/imagemagick/bin env-PATH = ${software_definition:software_home}/parts/xpdf/bin:${software_definition:software_home}/parts/imagemagick/bin:${software_definition:software_home}/parts/ffmpeg/bin
env-LD_LIBRARY_PATH = ${software_definition:software_home}/parts/file/lib env-LD_LIBRARY_PATH = ${software_definition:software_home}/parts/file/lib
server-hostname = 0.0.0.0 server-hostname = 0.0.0.0
server-port = ${configuration:oood_port} server-port = ${configuration:oood_port}
......
...@@ -8,6 +8,7 @@ extends = ...@@ -8,6 +8,7 @@ extends =
xpdf.cfg xpdf.cfg
imagemagick.cfg imagemagick.cfg
file.cfg file.cfg
ffmpeg.cfg
python-2.6.cfg python-2.6.cfg
libreoffice-bin.cfg libreoffice-bin.cfg
lxml-python.cfg lxml-python.cfg
...@@ -22,6 +23,7 @@ parts = ...@@ -22,6 +23,7 @@ parts =
libreoffice-bin libreoffice-bin
file file
xpdf xpdf
ffmpeg
python2.6 python2.6
bootstrap2.6 bootstrap2.6
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment