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 @@
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 @@
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`
