From cfd6e9aa85ae925b23e1dcdd20bcec44a0a2b59b Mon Sep 17 00:00:00 2001 From: Andrew Tribick Date: Tue, 29 Jul 2025 04:23:16 +0200 Subject: [PATCH] [libjpeg-turbo] Update to 3.1.1 (#46614) --- ports/libjpeg-turbo/portfile.cmake | 6 +++--- ports/libjpeg-turbo/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libjpeg-turbo.json | 5 +++++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 631b2d169d..ce2f769a48 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo REF "${VERSION}" - SHA512 5712d318e222f1ffcd2f748b0f2c32b3859253a4ed4e13ae134f4445e0ca06efc258c7653b6924b39815ae078f6a9177e098c89684d2c886161a0a4118122e8d + SHA512 4937b63a27818cdb5087091b2d78837f7f385fd6b4d3e3fcaf4d9ad2944fed4a00020dcacb33e9c2fd4b0f9d9851fb4051ed3da86f606aca5167357262a73e89 HEAD_REF master PATCHES add-options-for-exes-docs-headers.patch @@ -84,9 +84,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib") endif() - + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - + if (EXISTS "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-debug.cmake" "jpeg-static${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" "jpeg${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}" IGNORE_UNCHANGED) diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 78fffcde0e..17818214c1 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libjpeg-turbo", - "version": "3.1.0", - "port-version": 2, + "version": "3.1.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 1210df96b4..d2de913a2e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4933,8 +4933,8 @@ "port-version": 2 }, "libjpeg-turbo": { - "baseline": "3.1.0", - "port-version": 2 + "baseline": "3.1.1", + "port-version": 0 }, "libjuice": { "baseline": "1.6.1", diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index d2ceb489a6..7438714dad 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93acf52ccee5c259cfe37894c9c1f4b9c6f64c67", + "version": "3.1.1", + "port-version": 0 + }, { "git-tree": "c415206250825da0b848c8fac1334f5547d929e9", "version": "3.1.0",