summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorder richter <der.richter@gmx.de>2019-12-28 21:42:20 +0100
committerder richter <der.richter@gmx.de>2020-01-09 19:11:38 +0100
commit57f9de7b53f7cb5a671d04e4204aaa3ad7f8875e (patch)
treea53781bfb14a57f31fa5b0f946e765a966688923 /ci
parent363048077f0ee3a98f1184b363a25c6c50afd6df (diff)
downloadmpv-57f9de7b53f7cb5a671d04e4204aaa3ad7f8875e.tar.bz2
mpv-57f9de7b53f7cb5a671d04e4204aaa3ad7f8875e.tar.xz
travis: update macOS images and make building faster
don't build our own ffmpeg anymore and instead use the bottled version from homebrew. update the newest macOS image. also handle macOS 10.12 as a legacy OS since homebrew and Apple stopped supporting it. nevertheless it's helpful to build on that version since it's the last version we support building on. it's a bit special since we have to pin the homebrew-core version to a previous one where all the bottles for macOS 10.12 are still available, otherwise it would build nearly everything from source and that would take ages. also start caching the homebrew cache folder for downloads.
Diffstat (limited to 'ci')
-rwxr-xr-xci/get_ffmpeg.sh38
1 files changed, 0 insertions, 38 deletions
diff --git a/ci/get_ffmpeg.sh b/ci/get_ffmpeg.sh
deleted file mode 100755
index ef575701d9..0000000000
--- a/ci/get_ffmpeg.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-FFMPEG_SRC_DIR="${HOME}/deps/src/ffmpeg"
-FFMPEG_BUILD_DIR="${FFMPEG_SRC_DIR}/${TRAVIS_OS_NAME}"
-FFMPEG_SYSROOT="${HOME}/deps/sysroot"
-FFMPEG_HASH="18928e2bb4568cbe5e9061c3e6b63559392af3d2"
-
-# Get the sauce if not around
-if [[ ! -d "${FFMPEG_SRC_DIR}" ]] ; then
- git clone "https://git.videolan.org/git/ffmpeg.git" "${FFMPEG_SRC_DIR}"
-fi
-
-# pop into FFmpeg's source dir and clean up & check out our wanted revision
-pushd "${FFMPEG_SRC_DIR}"
-git reset --hard HEAD && git clean -dfx
-git checkout "${FFMPEG_HASH}"
-popd
-
-# If a build dir of the same type is around, clean it up
-if [[ -d "${FFMPEG_BUILD_DIR}" ]] ; then
- rm -rf "${FFMPEG_BUILD_DIR}"
-fi
-
-# Create and move into the build dir, configure and build!
-mkdir -p "${FFMPEG_BUILD_DIR}" && pushd "${FFMPEG_BUILD_DIR}"
-
-PKG_CONFIG_PATH="${FFMPEG_SYSROOT}/lib/pkgconfig/" ../configure \
- --disable-{autodetect,stripping} \
- --cc="${CC}" \
- --cxx="${CXX}" \
- --prefix="${FFMPEG_SYSROOT}" \
- --enable-{zlib,securetransport,videotoolbox}
-
-make -j4 && make install && popd
-
-exit 0