From 44cd0ebf82b0edc649579bd588d59ddf8b11229e Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Mon, 13 Oct 2014 21:16:48 +0200 Subject: [PATCH] Freshly build all VLC contribs The prebuilts for VLC are currently for the old 2.1.x release series and thus far behind the ones that are used for 2.2.x and 3.0.x which we are using for the nightlies. Also VLC (probably) links to its own static contribs, so some of the brew dependencies are invalid as they are freshly build inside VLC's contrib system. --- vlc.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/vlc.rb b/vlc.rb index a4d19b6..8e42309 100644 --- a/vlc.rb +++ b/vlc.rb @@ -9,12 +9,8 @@ class Vlc < Formula depends_on 'automake' depends_on 'pcre' depends_on 'gettext' - depends_on 'libgcrypt' - depends_on 'libshout' - depends_on 'libmad' depends_on 'libtool' depends_on 'pkg-config' - depends_on 'flac' depends_on 'yasm' def install @@ -61,13 +57,8 @@ def install # Additional Libs # KLN 20/08/2012 Added 'make .ogg' and 'make .vorbis' in order to get this recipe to work on OSX 10.6 - system "#{exp}; cd contrib; mkdir -p osx; cd osx; ../bootstrap --host=#{darwinVer} --build=#{darwinVer} --disable-sout" - system "#{exp}; cd contrib/osx; make prebuilt" - if MacOS.xcode_version.to_f <= 4.2 - system "cd contrib/osx; make .ogg; make .vorbis" - end - # libav/ffmpeg in current prebuilts is too old, build a fresh one from source - system "cd contrib/osx; make .ffmpeg" + system "#{exp}; cd contrib; mkdir -p osx; cd osx; ../bootstrap --host=#{darwinVer} --build=#{darwinVer} --disable-sout --disable-ass --disable-fribidi" + system "#{exp}; cd contrib/osx; make" # HACK: This file is normally created by the build query git log, but homebrew appears # to remove the .git folder just create a blank file so that this step passes