diff options
author | Stefan Schmidt <stefan@osg.samsung.com> | 2018-04-25 18:17:24 +0200 |
---|---|---|
committer | Stefan Schmidt <stefan@osg.samsung.com> | 2018-04-27 08:53:55 +0200 |
commit | f2b50ed1a68e921e9f27007f3ed05f82bfb6b71f (patch) | |
tree | 7f74f70443f7552671fef251089b8f730b3d23cb /.ci | |
parent | 4092c3a554ccfb2bd841f0b15b24c19dfe3be970 (diff) |
ci: travis: enable pulseaudio and openssl in macos build
These had been disabled due to former problems. They should work, so
time to re-enable them.
Diffstat (limited to '.ci')
-rwxr-xr-x | .ci/ci-osx-build.sh | 5 | ||||
-rwxr-xr-x | .ci/ci-osx-deps.sh | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.ci/ci-osx-build.sh b/.ci/ci-osx-build.sh index be1d670595..6195c535b9 100755 --- a/.ci/ci-osx-build.sh +++ b/.ci/ci-osx-build.sh | |||
@@ -2,7 +2,7 @@ | |||
2 | 2 | ||
3 | set -e | 3 | set -e |
4 | 4 | ||
5 | COPTS="--with-crypto=none --disable-pulseaudio --disable-cxx-bindings" | 5 | COPTS="--disable-cxx-bindings" |
6 | PARALLEL_JOBS=10 | 6 | PARALLEL_JOBS=10 |
7 | 7 | ||
8 | # Prepare OSX env for build | 8 | # Prepare OSX env for build |
@@ -11,6 +11,9 @@ ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents | |||
11 | launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist | 11 | launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist |
12 | export PATH="$(brew --prefix gettext)/bin:$PATH" | 12 | export PATH="$(brew --prefix gettext)/bin:$PATH" |
13 | 13 | ||
14 | export CFLAGS="-I/usr/local/opt/openssl/include $CFLAGS" | ||
15 | export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" | ||
16 | |||
14 | # Normal build test of all targets | 17 | # Normal build test of all targets |
15 | ./autogen.sh $COPTS $@ | 18 | ./autogen.sh $COPTS $@ |
16 | make -j $PARALLEL_JOBS | 19 | make -j $PARALLEL_JOBS |
diff --git a/.ci/ci-osx-deps.sh b/.ci/ci-osx-deps.sh index 5f2e23f1b1..859842624e 100755 --- a/.ci/ci-osx-deps.sh +++ b/.ci/ci-osx-deps.sh | |||
@@ -2,4 +2,4 @@ | |||
2 | 2 | ||
3 | brew update | 3 | brew update |
4 | brew unlink python | 4 | brew unlink python |
5 | brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 | 5 | brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio |