aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2014-02-24 20:26:56 -0800
committerAdam Vandenberg2014-02-27 08:21:14 -0800
commiteed3ed97126128eabda8f717c3294865d0098518 (patch)
treeddac1b0ab0c256003bcd3032cd3664ae1b015b62 /Library
parenta853959dd20a26e2ff366e4d6eefbb751389058d (diff)
downloadhomebrew-eed3ed97126128eabda8f717c3294865d0098518.tar.bz2
avidemux: use Formula[]
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/avidemux.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/Library/Formula/avidemux.rb b/Library/Formula/avidemux.rb
index 25e01ec5c..9eb0061c9 100644
--- a/Library/Formula/avidemux.rb
+++ b/Library/Formula/avidemux.rb
@@ -53,7 +53,7 @@ class Avidemux < Formula
mkdir 'buildCore' do
args = std_cmake_args
args << "-DAVIDEMUX_SOURCE_DIR=#{buildpath}"
- args << "-DGETTEXT_INCLUDE_DIR=#{Formula.factory('gettext').opt_prefix}/include"
+ args << "-DGETTEXT_INCLUDE_DIR=#{Formula['gettext'].opt_prefix}/include"
# Todo: We could depend on SDL and then remove the `-DSDL=OFF` arguments
# but I got build errors about NSview.
args << "-DSDL=OFF"
@@ -87,8 +87,6 @@ class Avidemux < Formula
args = std_cmake_args
args << "-DAVIDEMUX_SOURCE_DIR=#{buildpath}"
args << "-DAVIDEMUX_LIB_DIR=#{lib}"
- # If you get SDL to work with avidemux, you might still need to add -I like so:
- # args << "-DCMAKE_CXX_FLAGS=-I#{Formula.factory('sdl').opt_prefix}/include/SDL"
args << "-DSDL=OFF"
args << "../avidemux/#{interface}"
system "cmake", *args
@@ -130,7 +128,7 @@ class Avidemux < Formula
mkdir_p app/"MacOS"
cp_r "./cmake/osx/Avidemux2.6", app/"MacOS/Avidemux2.6.app"
chmod 0755, app/"MacOS/Avidemux2.6.app"
- cp_r Formula.factory('qt').opt_prefix/"lib/QtGui.framework/Resources/qt_menu.nib", app/"MacOS/" if build.with? 'qt'
+ cp_r Formula['qt'].opt_prefix/"lib/QtGui.framework/Resources/qt_menu.nib", app/"MacOS/" if build.with? 'qt'
cp "./cmake/osx/Info.plist", app
ln_s lib, app/"Resources/"
ln_s bin, app/"Resources/"