From: Stephen <stephengroat@users.noreply.github.com>
Date: Wed, 3 Jan 2018 15:56:12 +0000 (-0800)
Subject: Travis/OS X: Use 'brew bundle' + Brewfile
X-Git-Tag: 1.5.90~45^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3847f91122b790082e3d5d3b6f5f054dc2fbd237;p=libjpeg-turbo

Travis/OS X: Use 'brew bundle' + Brewfile

This ensures that the build script will not fail if the Homebrew
dependencies are already installed.
---

diff --git a/.travis.yml b/.travis.yml
index f273012..55df6da 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ matrix:
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
       brew update &&
-      brew install nasm homebrew/versions/gcc5 md5sha1sum Caskroom/versions/java6 &&
+      brew bundle &&
       ln -fs /usr/local/bin/gpg1 /usr/local/bin/gpg &&
       git clone --depth=1 https://github.com/libjpeg-turbo/gas-preprocessor.git ~/src/gas-preprocessor &&
       ln -fs /Applications/Xcode.app /Applications/Xcode72.app;
diff --git a/Brewfile b/Brewfile
new file mode 100644
index 0000000..02d8457
--- /dev/null
+++ b/Brewfile
@@ -0,0 +1,4 @@
+brew 'nasm'
+brew 'gcc@5'
+brew 'md5sha1sum'
+cask 'Caskroom/versions/java6'
diff --git a/Makefile.am b/Makefile.am
index 8043f09..0c2d253 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,7 +174,7 @@ EXTRA_DIST = win release $(DOCS) testimages CMakeLists.txt \
 	sharedlib/CMakeLists.txt cmakescripts libjpeg.map.in doc doxygen.config \
 	doxygen-extra.css jccolext.c jdcolext.c jdcol565.c jdmrgext.c jdmrg565.c \
 	jstdhuff.c jdcoefct.h jdmainct.h jdmaster.h jdsample.h \
-	md5/CMakeLists.txt
+	md5/CMakeLists.txt Brewfile
 
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`