Skip to content

[libjpeg-turbo] Enabled jpeg7 and jpeg8 APIs #14483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 7 commits into from
Dec 9, 2020
Merged

[libjpeg-turbo] Enabled jpeg7 and jpeg8 APIs #14483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7afc689
Enabled jpeg7 and jpeg8 APIs in libjpeg-turbo
ziriax Nov 6, 2020
ca9bc23
[libjpeg-turbo] JPEG7/8 API is now a feature
ziriax Nov 10, 2020
d644ab0
[libjpeg-turbo] Improved description of jpeg7/jpeg8 features
ziriax Nov 11, 2020
546a3ca
[libjpeg-turbo] Improved license installation
ziriax Nov 11, 2020
b478d13
[libjpeg-turbo] Removed obsolete code to delete EXEs (as these aren't…
ziriax Nov 12, 2020
7c539a5
Update ports/libjpeg-turbo/CONTROL
NancyLi1013 Dec 7, 2020
32bf947
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ports/libjpeg-turbo/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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!)
17 changes: 8 additions & 9 deletions ports/libjpeg-turbo/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
)
Expand All @@ -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()