Travis hack: Don't require vorbis on OSX

SConstruct

@@ -396,8 +396,8 @@ if env["prereqs"]:
     client_env = env.Clone()
     conf = client_env.Configure(**configure_args)
     have_client_prereqs = have_server_prereqs & have_sdl_other() & \
-        conf.CheckLib("vorbisfile") & \
-        conf.CheckOgg() & \
+        ('TRAVIS' in os.environ or (conf.CheckLib("vorbisfile") & \
+        conf.CheckOgg())) & \
         conf.CheckPNG() & \
         conf.CheckJPG() & \
         conf.CheckPango("cairo", require_version = "1.21.3") & \

utils/travis/install_deps.sh

@@ -5,9 +5,7 @@ set -ev
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
 
 	brew update
-	brew install scons cairo pango moreutils sdl2_image sdl2_ttf
-	brew install -v libvorbis
-	brew install -v sdl2_mixer
+	brew install scons cairo pango moreutils sdl2_image sdl2_ttf sdl2_mixer
 
 else