aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorJohannes Weißl2011-05-12 02:57:20 +0200
committerAdam Vandenberg2011-05-12 07:28:44 -0700
commit55611732955cccff774aeb585cc5def62b35bbba (patch)
tree192e8bf6a875261c76b12bcfa6b076be337a928f /Library
parent08329627dcafc0f1775410780a49b22010118f4a (diff)
downloadhomebrew-55611732955cccff774aeb585cc5def62b35bbba.tar.bz2
cmus: add flac CFLAGS detection patch
This could fix issue 5555: https://github.com/mxcl/homebrew/issues/5555 Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/cmus.rb25
1 files changed, 25 insertions, 0 deletions
diff --git a/Library/Formula/cmus.rb b/Library/Formula/cmus.rb
index d9bfebd4e..cb062adc4 100644
--- a/Library/Formula/cmus.rb
+++ b/Library/Formula/cmus.rb
@@ -17,8 +17,33 @@ class Cmus < Formula
skip_clean 'bin/cmus'
skip_clean 'bin/cmus-remote'
+ def patches
+ # fix flac CFLAGS detection, already applied upstream:
+ # https://gitorious.org/cmus/cmus/commit/51f7aaccab09f30ff6a683eec3163904c7148cb3
+ DATA
+ end
+
def install
system "./configure", "prefix=#{prefix}", "mandir=#{man}"
system "make install"
end
end
+__END__
+diff --git a/configure b/configure
+index 127f64a..e8fbece 100755
+--- a/configure
++++ b/configure
+@@ -146,7 +146,12 @@ check_mpc()
+
+ check_flac()
+ {
+- pkg_config FLAC "flac" "" "-lFLAC -lm" && return 0
++ if pkg_config FLAC "flac" "" "-lFLAC -lm"
++ then
++ # Make sure the FLAC_CFLAGS value is sane, strip trailing '/FLAC'.
++ FLAC_CFLAGS=`echo $FLAC_CFLAGS | sed "s/FLAC$//"`
++ return 0
++ fi
+ check_library FLAC "" "-lFLAC -lvorbisfile -lm"
+ return $?
+ }