diff --git a/INSTALL.md b/INSTALL.md index 171de99cc7..02064632f6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -10,7 +10,7 @@ ``` 3. Install tools: ``` - brew install cmake ninja openssl@1.1 zlib autoconf libtool automake yasm pkg-config + brew install cmake ninja openssl@1.1 zlib autoconf libtool automake yasm nasm meson pkg-config ``` 4. Update ./scripts/rebuild file ``` diff --git a/core-xprojects/Mozjpeg/Mozjpeg/build.sh b/core-xprojects/Mozjpeg/Mozjpeg/build.sh index e315f4c302..b7dc5def40 100755 --- a/core-xprojects/Mozjpeg/Mozjpeg/build.sh +++ b/core-xprojects/Mozjpeg/Mozjpeg/build.sh @@ -35,7 +35,7 @@ echo "set(CMAKE_SYSTEM_PROCESSOR AMD64)" >> toolchain.cmake fi echo "set(CMAKE_C_COMPILER $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)" >> toolchain.cmake -cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake -DCMAKE_OSX_SYSROOT=${MACOS_SYSROOT[0]} -DPNG_SUPPORTED=FALSE -DENABLE_SHARED=FALSE -DWITH_JPEG8=1 ../../$SOURCE_DIR +cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake -DCMAKE_OSX_SYSROOT=${MACOS_SYSROOT[0]} -DPNG_SUPPORTED=FALSE -DENABLE_SHARED=FALSE -DWITH_JPEG8=1 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ../../$SOURCE_DIR make cd .. diff --git a/core-xprojects/ffmpeg/ffmpeg/build.sh b/core-xprojects/ffmpeg/ffmpeg/build.sh index 19e88d89ba..d8c9c1e247 100755 --- a/core-xprojects/ffmpeg/ffmpeg/build.sh +++ b/core-xprojects/ffmpeg/ffmpeg/build.sh @@ -29,7 +29,7 @@ LIBOPUS_PATH="${BUILD_DIR}../../libopus/build/libopus" LIBVPX_PATH="${BUILD_DIR}../../libvpx/build/libvpx" LIBDAV1D_PATH="${BUILD_DIR}../../dav1d/build/dav1d" -FF_VERSION="7.1" +FF_VERSION="7.1.1" SOURCE="$SOURCE_DIR/ffmpeg-$FF_VERSION" GAS_PREPROCESSOR_PATH="$SOURCE_DIR/gas-preprocessor.pl"