From 628a87568bb8f1a584d426306f38aaaee751061b Mon Sep 17 00:00:00 2001 From: nibbles 2bits Date: Thu, 1 Nov 2012 01:40:51 -0700 Subject: ffmpeg: fix for openjpeg + dep for Dirac - Add `--extra-cflags` using pkg-config to find openjpeg. - The cflags fix a configure error. - Add an option `with-schroedinger` for Dirac Video Fixes #15772 Fixes #15734 Closes #15791. Signed-off-by: Adam Vandenberg --- Library/Formula/ffmpeg.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Library/Formula') diff --git a/Library/Formula/ffmpeg.rb b/Library/Formula/ffmpeg.rb index e690e8538..3a242f33b 100644 --- a/Library/Formula/ffmpeg.rb +++ b/Library/Formula/ffmpeg.rb @@ -21,6 +21,7 @@ class Ffmpeg < Formula option "with-libvo-aacenc", "Enable VisualOn AAC encoder" option "with-libass", "Enable ASS/SSA subtitle format" option "with-openjpeg", 'Enable JPEG 200 image format' + option 'with-shroedinger', 'Enable Dirac video format' option 'with-ffplay', 'Enable FFPlay media player' option 'with-tools', 'Enable additional FFmpeg tools' @@ -46,6 +47,7 @@ class Ffmpeg < Formula depends_on 'openjpeg' if build.include? 'with-openjpeg' depends_on 'sdl' if build.include? 'with-ffplay' depends_on 'speex' if build.include? 'with-speex' + depends_on 'shroedinger' if build.include? 'with-shroedinger' def install args = ["--prefix=#{prefix}", @@ -72,9 +74,14 @@ class Ffmpeg < Formula args << "--enable-libopencore-amrnb" << "--enable-libopencore-amrwb" if build.include? 'with-opencore-amr' args << "--enable-libvo-aacenc" if build.include? 'with-libvo-aacenc' args << "--enable-libass" if build.include? 'with-libass' - args << "--enable-libopenjpeg" if build.include? 'with-openjpeg' args << "--enable-ffplay" if build.include? 'with-ffplay' args << "--enable-libspeex" if build.include? 'with-speex' + args << '--enable-libschroedinger' if build.include? 'with-schroedinger' + + if build.include? 'with-openjpeg' + args << '--enable-libopenjpeg' + args << '--extra-cflags=' + %x[pkg-config --cflags libopenjpeg].chomp + end # For 32-bit compilation under gcc 4.2, see: # http://trac.macports.org/ticket/20938#comment:22 -- cgit v1.2.3