Skip to content

Commit

Permalink
libav 10
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimeMF authored and brettkoonce committed Apr 12, 2014
1 parent c18fa55 commit 649f995
Showing 1 changed file with 2 additions and 27 deletions.
29 changes: 2 additions & 27 deletions Formula/libav.rb
Expand Up @@ -2,10 +2,9 @@

class Libav < Formula
homepage 'https://libav.org/'
url 'http://libav.org/releases/libav-9.11.tar.xz'
sha1 '4eb48cbe70515734f70bde8dceff28896d76adf2'
url 'http://libav.org/releases/libav-10.tar.xz'
sha1 '74effded58ec3c63de6c8c20b5a382dc3a864d5b'
head 'git://git.libav.org/libav.git'
revision 1

bottle do
sha1 "bf3aec728041ec2946a2da890556bdb2979c4ad3" => :mavericks
Expand Down Expand Up @@ -58,8 +57,6 @@ class Libav < Formula
depends_on 'speex' => :optional
depends_on 'theora' => :optional

patch :DATA

def install
args = [
"--disable-debug",
Expand Down Expand Up @@ -112,25 +109,3 @@ def install
system "#{bin}/avconv -h"
end
end

__END__
# Patch configure to use require_pkg_config so it will use correct include path.
#
# Upstream bugs relating to this patch:
#
# https://bugzilla.libav.org/show_bug.cgi?id=387
# https://bugzilla.libav.org/show_bug.cgi?id=405
# https://bugzilla.libav.org/show_bug.cgi?id=569
diff --git a/tmp/libav-9.9/configure b/configure
index 6ab04ae..5ccd2b7 100755
--- a/tmp/libav-9.9/configure
+++ b/configure
@@ -3488,7 +3488,7 @@ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_q
enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
-enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
+enabled libopenjpeg && require_pkg_config libopenjpeg openjpeg.h opj_version
enabled libopus && require_pkg_config opus opus_multistream.h opus_multistream_decoder_create
enabled libpulse && require_pkg_config libpulse-simple pulse/simple.h pa_simple_new
enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket

0 comments on commit 649f995

Please sign in to comment.