diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-18 00:33:00 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-18 00:33:00 -0700 |
| commit | bae7c95b22cff9ef667ce1780b839f1a386ed2d5 (patch) | |
| tree | 49ea6f00e428dcbe2456632a580fa66e940bf1cd | |
| parent | adb8edddbb8e019e04d43d096184d4d6613fece9 (diff) | |
| download | vcpkg-bae7c95b22cff9ef667ce1780b839f1a386ed2d5.tar.gz vcpkg-bae7c95b22cff9ef667ce1780b839f1a386ed2d5.zip | |
[libjpeg-turbo] Disable GETENV/SETENV in UWP. See https://github.com/libjpeg-turbo/libjpeg-turbo/issues/203
| -rw-r--r-- | ports/libjpeg-turbo/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libjpeg-turbo/portfile.cmake | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 2bb119dbc..fa72d68b0 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.5.3 +Version: 1.5.3-1 Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems. diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 288960662..7f6bc4973 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -7,10 +7,17 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_download_distfile(GETENV_PATCH + URLS "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff" + FILENAME "libjpeg-turbo-bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff" + SHA512 4cd064521b5e4baba4adf972f9f574f6dd43a2cd3e3ad143ca2cdf0f165024406d4fd2ed094124d0c17c5370394140e82fdd892d3cdc49609acdf8f79db1758c +) + vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/add-options-for-exes-docs-headers.patch" "${CMAKE_CURRENT_LIST_DIR}/linux-cmake.patch" + "${GETENV_PATCH}" ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")) @@ -22,6 +29,10 @@ else() set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}") endif() +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(ENV{_CL_} "-DNO_GETENV -DNO_PUTENV") +endif() + string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL) |