diff --git a/.travis/osx..install.sh b/.travis/osx..install.sh index e344ffcd9..80eda9051 100755 --- a/.travis/osx..install.sh +++ b/.travis/osx..install.sh @@ -23,18 +23,8 @@ done; brew install $PACKAGES # Recompile fluid-synth without CoreAudio per issues #649 -# Changes to fluid-synth.rb must be pushed to URL prior to use -if [ "$TRAVIS_EVENT_TYPE" == "pull_request" ]; then - slug=$TRAVIS_PULL_REQUEST_SLUG - branch=$TRAVIS_PULL_REQUEST_BRANCH -elif "${TRAVIS}"; then - slug=$TRAVIS_REPO_SLUG - branch=$TRAVIS_BRANCH -else - slug="LMMS/lmms" - branch=$(git symbolic-ref --short HEAD) -fi +# Ruby formula must be a URL -brew install --build-from-source "https://raw.githubusercontent.com/${slug}/${branch}/cmake/apple/fluid-synth.rb" +brew install --build-from-source "https://gist.githubusercontent.com/tresf/c9260c43270abd4ce66ff40359588435/raw/fluid-synth.rb" sudo npm install -g appdmg diff --git a/cmake/apple/fluid-synth.rb b/cmake/apple/fluid-synth.rb deleted file mode 100644 index d05fb4d65..000000000 --- a/cmake/apple/fluid-synth.rb +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2009-present, Homebrew contributors -# License: BSD 2-Clause - -class FluidSynth < Formula - desc "Real-time software synthesizer based on the SoundFont 2 specs" - homepage "http://www.fluidsynth.org" - url "https://downloads.sourceforge.net/project/fluidsynth/fluidsynth-1.1.6/fluidsynth-1.1.6.tar.gz" - sha256 "50853391d9ebeda9b4db787efb23f98b1e26b7296dd2bb5d0d96b5bccee2171c" - - bottle do - cellar :any - rebuild 1 - sha256 "ee86f0e263db0610a340592d725bd2c05bc5ed1bfa6eb496ae304297de261ae0" => :sierra - sha256 "dfe31491d27c3c29ff4686900984e5884f89cd249d82b3dba4ad077f7bbe9057" => :el_capitan - sha256 "6938c03a61b696870de92435dc0a6e6118fbb0d68adcd0d17ec8d30c2f7eee20" => :yosemite - sha256 "5c5e00f88e45dd661c15f0e13793f9cc96f285b08200145ce8b77982350a5625" => :mavericks - sha256 "83b972cf7aec57e78dc1c1a6b3e286d8b9bf2a2622e174bca42efa8576e36e5f" => :mountain_lion - end - - depends_on "pkg-config" => :build - depends_on "cmake" => :build - depends_on "glib" - depends_on "libsndfile" => :optional - depends_on "portaudio" => :optional - - def install - args = std_cmake_args - args << "-Denable-framework=OFF" << "-DLIB_SUFFIX=" - args << "-Denable-portaudio=ON" if build.with? "portaudio" - args << "-Denable-libsndfile=OFF" if build.without? "libsndfile" - args << "-Denable-coreaudio=OFF" # Per lmms/issues/649 - - mkdir "build" do - system "cmake", "..", *args - system "make", "install" - end - end - - test do - assert_match /#{version}/, shell_output("#{bin}/fluidsynth --version") - end -end