From f2b50ed1a68e921e9f27007f3ed05f82bfb6b71f Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Wed, 25 Apr 2018 18:17:24 +0200 Subject: [PATCH] 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. --- .ci/ci-osx-build.sh | 5 ++++- .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 @@ set -e -COPTS="--with-crypto=none --disable-pulseaudio --disable-cxx-bindings" +COPTS="--disable-cxx-bindings" PARALLEL_JOBS=10 # Prepare OSX env for build @@ -11,6 +11,9 @@ ln -sfv /usr/local/opt/d-bus/*.plist ~/Library/LaunchAgents launchctl load ~/Library/LaunchAgents/org.freedesktop.dbus-session.plist export PATH="$(brew --prefix gettext)/bin:$PATH" +export CFLAGS="-I/usr/local/opt/openssl/include $CFLAGS" +export LDFLAGS="-L/usr/local/opt/openssl/lib $LDFLAGS" + # Normal build test of all targets ./autogen.sh $COPTS $@ 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 @@ brew update brew unlink python -brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 +brew install gettext check bullet dbus fontconfig freetype fribidi gst-plugins-good gstreamer luajit openssl webp libsndfile glib libspectre libraw librsvg poppler lz4 pulseaudio