From 93ce6b4f27602cd18f4327c2cfd84093d472b8bb Mon Sep 17 00:00:00 2001 From: Phil Christensen Date: Fri, 29 Mar 2019 23:23:18 -0700 Subject: [PATCH] [ffmpeg] switch to vcpkg_extract_source_archive_ex --- ports/ffmpeg/portfile.cmake | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/ports/ffmpeg/portfile.cmake b/ports/ffmpeg/portfile.cmake index ac053003e9..164995b994 100644 --- a/ports/ffmpeg/portfile.cmake +++ b/ports/ffmpeg/portfile.cmake @@ -1,27 +1,27 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/ffmpeg-4.1) + vcpkg_download_distfile(ARCHIVE URLS "http://ffmpeg.org/releases/ffmpeg-4.1.tar.bz2" FILENAME "ffmpeg-4.1.tar.bz2" SHA512 ccf6d07268dc47e08ca619eb182a003face2a8ee73ec1a28157330dd7de1df88939def1fc1c7e6b6ac7b59752cdad84657d589b2fafb73e14e5ef03fb6e33417 ) +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + create-lib-libraries.patch + detect-openssl.patch + configure_opencv.patch + fix_windowsinclude-in-ffmpegexe-1.patch + fix_windowsinclude-in-ffmpegexe-2.patch + fix_windowsinclude-in-ffmpegexe-3.patch +) + if (${SOURCE_PATH} MATCHES " ") message(FATAL_ERROR "Error: ffmpeg will not build with spaces in the path. Please use a directory with no spaces") endif() -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/create-lib-libraries.patch - ${CMAKE_CURRENT_LIST_DIR}/detect-openssl.patch - ${CMAKE_CURRENT_LIST_DIR}/configure_opencv.patch - ${CMAKE_CURRENT_LIST_DIR}/fix_windowsinclude-in-ffmpegexe-1.patch - ${CMAKE_CURRENT_LIST_DIR}/fix_windowsinclude-in-ffmpegexe-2.patch - ${CMAKE_CURRENT_LIST_DIR}/fix_windowsinclude-in-ffmpegexe-3.patch -) - vcpkg_find_acquire_program(YASM) get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")