From 017bd3f30aae7d460cd8828e1d5733bf5b1cc829 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 26 Apr 2023 07:42:00 +0200 Subject: [PATCH] [libjpeg-turbo] Update usage (#31071) Co-authored-by: Billy Robert O'Neal III --- ports/libjpeg-turbo/usage | 10 +++++++--- ports/libjpeg-turbo/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ports/libjpeg-turbo/usage b/ports/libjpeg-turbo/usage index ccd47717f7..c7be47b5aa 100644 --- a/ports/libjpeg-turbo/usage +++ b/ports/libjpeg-turbo/usage @@ -1,5 +1,9 @@ -The package libjpeg-turbo is compatible with built-in CMake targets: +libjpeg-turbo is compatible with built-in implementation-agnostic CMake targets: find_package(JPEG REQUIRED) - target_link_libraries(main PRIVATE ${JPEG_LIBRARIES}) - target_include_directories(main PRIVATE ${JPEG_INCLUDE_DIR}) + target_include_directories(main PRIVATE JPEG::JPEG) + +libjpeg-turbo provides CMake targets for the TurboJPEG C API: + + find_package(libjpeg-turbo CONFIG REQUIRED) + target_link_libraries(main PRIVATE libjpeg-turbo::turbojpeg) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 37cac9ea12..16ac0ff48f 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libjpeg-turbo", "version": "2.1.5.1", + "port-version": 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.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index adf975ac4f..80dcff6efd 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4114,7 +4114,7 @@ }, "libjpeg-turbo": { "baseline": "2.1.5.1", - "port-version": 0 + "port-version": 1 }, "libjuice": { "baseline": "1.0.6", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 777ed5143e..a5cc0b5f56 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2764640a1b2cc36636084470108de50f2b531085", + "version": "2.1.5.1", + "port-version": 1 + }, { "git-tree": "2b3b3fe0c258463586c0e421a2665ca1d2df9b4d", "version": "2.1.5.1",