diff options
| author | Long Nguyen <nguyen.long.908132@gmail.com> | 2020-07-16 05:09:33 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 15:09:33 -0700 |
| commit | 830893fb8eefbc12f5a7f8274bfc2ac79dd85449 (patch) | |
| tree | 28f506b63809383b5f62bae5a8caccd6a0cf457d /ports/libvpx | |
| parent | bad319d271fa31557aaede98cb0478ced1213952 (diff) | |
| download | vcpkg-830893fb8eefbc12f5a7f8274bfc2ac79dd85449.tar.gz vcpkg-830893fb8eefbc12f5a7f8274bfc2ac79dd85449.zip | |
[liblzma, libvpx] Add mingw support (#12401)
* [liblzma] Update to v5.2.5
* [liblzma] Use WIN32 instead of MSVC
* [libvpx] Add mingw support
* Update portfile.cmake
* Update CONTROL
* Update CONTROL
Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
Diffstat (limited to 'ports/libvpx')
| -rw-r--r-- | ports/libvpx/CONTROL | 5 | ||||
| -rw-r--r-- | ports/libvpx/portfile.cmake | 37 |
2 files changed, 24 insertions, 18 deletions
diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL index 63ea7bb2f..969ae8a10 100644 --- a/ports/libvpx/CONTROL +++ b/ports/libvpx/CONTROL @@ -1,5 +1,6 @@ Source: libvpx
-Version: 1.8.1-7
+Version: 1.8.1
+Port-Version: 8
Homepage: https://github.com/webmproject/libvpx
Description: The reference software implementation for the video coding formats VP8 and VP9.
-Supports: !(uwp&arm)
\ No newline at end of file +Supports: !(uwp&arm)
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake index ec487d5c2..1d818ddf1 100644 --- a/ports/libvpx/portfile.cmake +++ b/ports/libvpx/portfile.cmake @@ -17,15 +17,20 @@ vcpkg_extract_source_archive_ex( vcpkg_find_acquire_program(YASM) vcpkg_find_acquire_program(PERL) -if(VCPKG_TARGET_IS_WINDOWS) - - vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils) - get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) - get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) +get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) +get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) + +if(CMAKE_HOST_WIN32) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES make) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES diffutils) + set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) + set(ENV{PATH} "${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") +else() + set(BASH /bin/bash) + set(ENV{PATH} "${YASM_EXE_PATH}:${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") +endif() - set(ENV{PATH} "${YASM_EXE_PATH};${MSYS_ROOT}/usr/bin;$ENV{PATH};${PERL_EXE_PATH}") - set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) +if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) @@ -115,17 +120,11 @@ if(VCPKG_TARGET_IS_WINDOWS) else() - get_filename_component(YASM_EXE_PATH ${YASM} DIRECTORY) - get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) - - set(ENV{PATH} "${YASM_EXE_PATH}:${MSYS_ROOT}/usr/bin:$ENV{PATH}:${PERL_EXE_PATH}") - set(BASH /bin/bash) - set(OPTIONS "--disable-examples --disable-tools --disable-docs --disable-unit-tests") set(OPTIONS_DEBUG "--enable-debug-libs --enable-debug --prefix=${CURRENT_PACKAGES_DIR}/debug") set(OPTIONS_RELEASE "--prefix=${CURRENT_PACKAGES_DIR}") - + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(OPTIONS "${OPTIONS} --disable-static --enable-shared") else() @@ -140,7 +139,13 @@ else() message(FATAL_ERROR "libvpx does not support architecture ${VCPKG_TARGET_ARCHITECTURE}") endif() - if(VCPKG_TARGET_IS_LINUX) + if(VCPKG_TARGET_IS_MINGW) + if(LIBVPX_TARGET_ARCH STREQUAL "x86") + set(LIBVPX_TARGET "x86-win32-gcc") + else() + set(LIBVPX_TARGET "x86_64-win64-gcc") + endif() + elseif(VCPKG_TARGET_IS_LINUX) set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-linux-gcc") elseif(VCPKG_TARGET_IS_OSX) set(LIBVPX_TARGET "${LIBVPX_TARGET_ARCH}-darwin17-gcc") # enable latest CPU instructions for best performance and less CPU usage on MacOS |