diff --git a/CI/install-dependencies-osx.sh b/CI/install-dependencies-osx.sh index 106506972..6fc371a1c 100755 --- a/CI/install-dependencies-osx.sh +++ b/CI/install-dependencies-osx.sh @@ -24,7 +24,7 @@ sudo installer -pkg ./Packages.pkg -target / brew update #Base OBS Deps and ccache -brew install qt@5.11 jack speexdsp ccache swig +brew install qt@5.11 jack speexdsp ccache swig mbedtls export PATH=/usr/local/opt/ccache/libexec:$PATH ccache -s || echo "CCache is not available." @@ -41,7 +41,7 @@ unzip -q ./vlc-master.zip # Get sparkle hr "Downloading Sparkle framework" -wget --quiet --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.16.0/Sparkle-1.16.0.tar.bz2 +wget --quiet --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.20.0/Sparkle-1.20.0.tar.bz2 mkdir ./sparkle tar -xf ./sparkle.tar.bz2 -C ./sparkle sudo cp -R ./sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework diff --git a/CI/util/build-package-deps-osx.sh b/CI/util/build-package-deps-osx.sh index 08aa0b196..9cb283425 100755 --- a/CI/util/build-package-deps-osx.sh +++ b/CI/util/build-package-deps-osx.sh @@ -47,9 +47,9 @@ export MACOSX_DEPLOYMENT_TARGET=10.11 # https://github.com/phracker/MacOSX-SDKs # libopus -curl -L -O http://downloads.xiph.org/releases/opus/opus-1.1.3.tar.gz -tar -xf opus-1.1.3.tar.gz -cd ./opus-1.1.3 +curl -L -O https://ftp.osuosl.org/pub/xiph/releases/opus/opus-1.2.1.tar.gz +tar -xf opus-1.2.1.tar.gz +cd ./opus-1.2.1 mkdir build cd ./build ../configure --disable-shared --enable-static --prefix="/tmp/obsdeps" @@ -59,9 +59,9 @@ make install cd $WORK_DIR # libogg -curl -L -O http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz -tar -xf libogg-1.3.2.tar.gz -cd ./libogg-1.3.2 +curl -L -O https://ftp.osuosl.org/pub/xiph/releases/ogg/libogg-1.3.3.tar.gz +tar -xf libogg-1.3.3.tar.gz +cd ./libogg-1.3.3 mkdir build cd ./build ../configure --disable-shared --enable-static --prefix="/tmp/obsdeps" @@ -71,9 +71,9 @@ make install cd $WORK_DIR # libvorbis -curl -L -O http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz -tar -xf libvorbis-1.3.5.tar.gz -cd ./libvorbis-1.3.5 +curl -L -O https://ftp.osuosl.org/pub/xiph/releases/vorbis/libvorbis-1.3.6.tar.gz +tar -xf libvorbis-1.3.6.tar.gz +cd ./libvorbis-1.3.6 mkdir build cd ./build ../configure --disable-shared --enable-static --prefix="/tmp/obsdeps" @@ -83,9 +83,9 @@ make install cd $WORK_DIR # libvpx -curl -L -O http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.6.0.tar.bz2 -tar -xf libvpx-1.6.0.tar.bz2 -cd ./libvpx-1.6.0 +curl -L -O https://chromium.googlesource.com/webm/libvpx/+archive/v1.7.0.tar.gz +tar -xf libvpx-1.7.0.tar.gz +cd ./libvpx-1.7.0 mkdir build cd ./build ../configure --disable-shared --libdir="/tmp/obsdeps/bin" @@ -113,9 +113,9 @@ rsync -avh --include="*/" --include="*.h" --exclude="*" ./* $DEPS_DEST/include/ cd $WORK_DIR # janson -curl -L -O http://www.digip.org/jansson/releases/jansson-2.9.tar.gz -tar -xf jansson-2.9.tar.gz -cd jansson-2.9 +curl -L -O http://www.digip.org/jansson/releases/jansson-2.11.tar.gz +tar -xf jansson-2.11.tar.gz +cd jansson-2.11 mkdir build cd ./build ../configure --libdir="/tmp/obsdeps/bin" --enable-shared --disable-static @@ -130,9 +130,9 @@ export LDFLAGS="-L/tmp/obsdeps/lib" export CFLAGS="-I/tmp/obsdeps/include" # FFMPEG -curl -L -O https://github.com/FFmpeg/FFmpeg/archive/n3.2.2.zip -unzip ./n3.2.2.zip -cd ./FFmpeg-n3.2.2 +curl -L -O https://github.com/FFmpeg/FFmpeg/archive/n4.0.2.zip +unzip ./n4.0.2.zip +cd ./FFmpeg-n4.0.2 mkdir build cd ./build ../configure --extra-ldflags="-mmacosx-version-min=10.11" --enable-shared --disable-static --shlibdir="/tmp/obsdeps/bin" --enable-gpl --disable-doc --enable-libx264 --enable-libopus --enable-libvorbis --enable-libvpx --disable-outdev=sdl