diff options
| author | Peter Verswyvelen <bugfact@gmail.com> | 2020-12-09 20:52:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-09 11:52:46 -0800 |
| commit | 769256950157de3c6c1076ae093be88620614dbe (patch) | |
| tree | 2fab2c7f592e426ebe84094fc6e4f582d19a769d | |
| parent | acb6b10e7fdf5e8519c18398d0b069e1d58ca025 (diff) | |
| download | vcpkg-769256950157de3c6c1076ae093be88620614dbe.tar.gz vcpkg-769256950157de3c6c1076ae093be88620614dbe.zip | |
[libjpeg-turbo] Enabled jpeg7 and jpeg8 APIs (#14483)
| -rw-r--r-- | ports/libjpeg-turbo/CONTROL | 7 | ||||
| -rw-r--r-- | ports/libjpeg-turbo/portfile.cmake | 17 |
2 files changed, 15 insertions, 9 deletions
diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index 3ee860999..f8a66e50c 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,4 +1,11 @@ Source: libjpeg-turbo Version: 2.0.5 +Port-Version: 1 Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo 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. + +Feature: jpeg7 +Description: Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) + +Feature: jpeg8 +Description: Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 95fae01c2..f4a55e078 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -28,6 +28,11 @@ 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) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + jpeg7 WITH_JPEG7 + jpeg8 WITH_JPEG8 +) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -37,6 +42,7 @@ vcpkg_configure_cmake( -DENABLE_EXECUTABLES=OFF -DINSTALL_DOCS=OFF -DWITH_CRT_DLL=${WITH_CRT_DLL} + ${FEATURE_OPTIONS} ${LIBJPEGTURBO_SIMD} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) @@ -62,24 +68,17 @@ else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") endif() endif() -file(COPY +file(INSTALL ${SOURCE_PATH}/LICENSE.md - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright ) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man) -file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(GLOB DEBUG_EXE ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) -if(EXE OR DEBUG_EXE) - file(REMOVE ${EXE} ${DEBUG_EXE}) -endif() - file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/libjpeg-turbo/copyright) vcpkg_copy_pdbs() |