[ENG-748] Fix cache factory and libheif on Windows (#950)

* Attempt to fix cache factory

* Fix macOS/Windows failing to find libheif
 - Some clippy changes

* Discard changes to core/src/p2p/p2p_manager.rs

* Attempt fix libheif.lib not being built for windows

* Added missing libde265 to ffmpeg-windows Dockerfile
 - Build .lib file for libheif to fix compilation failing in windows

* Remove borked cmake option from libheif build script

* Fix .lib name

* Remove incorrect build option for libheif

* Add cargo to cache factory

* Cache factory is working, disable it on pull_request
This commit is contained in:
Vítor Vasconcellos authored and GitHub committed 2023-06-18 08:33:59 +00:00
1 parent 3198a9bdb6
commit 2d6228115c
5 files changed
+35 -15

No files matched your search

@@ -12,26 +12,37 @@ ffbuild_dockerbuild() {
cmake \
-GNinja \
-DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX='/opt/dlls' \
-DCMAKE_INSTALL_BINDIR='/opt/dlls/bin' \
-DCMAKE_INSTALL_LIBDIR='/opt/dlls/lib' \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" \
-DBUILD_TESTING=OFF \
-DWITH_EXAMPLES=OFF \
-DBUILD_SHARED_LIBS=ON \
-DWITH_X265=ON \
-DWITH_X265_PLUGIN=OFF \
-DWITH_DAV1D=ON \
-DWITH_DAV1D_PLUGIN=OFF \
-DWITH_RAV1E=ON \
-DWITH_RAV1E_PLUGIN=OFF \
-DWITH_LIBDE265=ON \
-DWITH_LIBDE265_PLUGIN=OFF \
-DWITH_LIBSHARPYUV=ON \
-DWITH_FUZZERS=OFF \
-DWITH_EXAMPLES=OFF \
-DWITH_UNCOMPRESSED_CODEC=ON \
-DWITH_REDUCED_VISIBILITY=ON \
-DWITH_DEFLATE_HEADER_COMPRESSION=ON \
-DWITH_AOM_DECODER_PLUGIN=OFF \
-DWITH_AOM_ENCODER_PLUGIN=OFF \
-DWITH_DAV1D_PLUGIN=OFF \
-DWITH_LIBDE265_PLUGIN=OFF \
-DWITH_RAV1E_PLUGIN=OFF \
-DWITH_SvtEnc_PLUGIN=OFF \
-DWITH_X265_PLUGIN=OFF \
-DENABLE_PLUGIN_LOADING=OFF \
-DENABLE_MULTITHREADING_SUPPORT=ON \
..
ninja -j"$(nproc)"
ninja install
cd /opt/dlls/bin
"${FFBUILD_CROSS_PREFIX}gendef" libheif.dll
"${FFBUILD_CROSS_PREFIX}dlltool" -m i386:x86-64 -d libheif.def -l heif.lib -D libheif.dll
}