From 8f54ef5453e7e76ff01e15988bf243e7247c5eb5 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Fri, 23 May 2025 09:53:47 +0200 Subject: [PATCH] [ijg-libjpeg] update to 9f (#45633) --- ports/ijg-libjpeg/CMakeLists.txt | 2 +- ports/ijg-libjpeg/portfile.cmake | 6 +++--- ports/ijg-libjpeg/vcpkg.json | 3 +-- scripts/ci.feature.baseline.txt | 1 - versions/baseline.json | 4 ++-- versions/i-/ijg-libjpeg.json | 5 +++++ 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ports/ijg-libjpeg/CMakeLists.txt b/ports/ijg-libjpeg/CMakeLists.txt index b65477d9c4..8148210f4c 100644 --- a/ports/ijg-libjpeg/CMakeLists.txt +++ b/ports/ijg-libjpeg/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.16) project(libjpeg LANGUAGES C) option(BUILD_EXECUTABLES OFF) diff --git a/ports/ijg-libjpeg/portfile.cmake b/ports/ijg-libjpeg/portfile.cmake index bd3c3cf23a..0e88be59d0 100644 --- a/ports/ijg-libjpeg/portfile.cmake +++ b/ports/ijg-libjpeg/portfile.cmake @@ -10,9 +10,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() vcpkg_download_distfile(ARCHIVE - URLS "http://www.ijg.org/files/jpegsr9e.zip" - FILENAME "jpegsr9e.zip" - SHA512 db7a2fb44e5cc20d61956c46334948af034c07cdcc0d6e41d9bd4f6611c0fbed8943d0a05029ba1bfb9d993f4acd0df5e95d0bc1cfb5a889b86a55b6b75fdf64 + URLS "http://www.ijg.org/files/jpegsr${VERSION}.zip" + FILENAME "jpegsr${VERSION}.zip" + SHA512 f43e7cab21fb60d41c7a6842f5859ebeac34267f985870d999cc2e7e9e90ee552d667f054c0f162ef5e5ebaab87e285631432a7ca8441ba9837c4caa4fdf51ac ) vcpkg_extract_source_archive( SOURCE_PATH diff --git a/ports/ijg-libjpeg/vcpkg.json b/ports/ijg-libjpeg/vcpkg.json index 7e9cffae66..34fd9605c3 100644 --- a/ports/ijg-libjpeg/vcpkg.json +++ b/ports/ijg-libjpeg/vcpkg.json @@ -1,7 +1,6 @@ { "name": "ijg-libjpeg", - "version-string": "9e", - "port-version": 2, + "version-string": "9f", "description": "Independent JPEG Group's JPEG software", "homepage": "http://www.ijg.org/", "license": null, diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index c8a0477fd7..3dff7c0463 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -157,7 +157,6 @@ ignition-msgs1:x64-uwp=fail ignition-msgs5:arm-uwp=fail ignition-msgs5:arm64-windows=fail ignition-msgs5:x64-uwp=fail -ijg-libjpeg:x64-windows-static-md=fail intel-mkl:arm-uwp=fail intel-mkl:arm64-osx=fail intel-mkl:arm64-windows=fail diff --git a/versions/baseline.json b/versions/baseline.json index 676e0fb369..13f28fa05f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3765,8 +3765,8 @@ "port-version": 1 }, "ijg-libjpeg": { - "baseline": "9e", - "port-version": 2 + "baseline": "9f", + "port-version": 0 }, "im3d": { "baseline": "2022-10-11", diff --git a/versions/i-/ijg-libjpeg.json b/versions/i-/ijg-libjpeg.json index 409a8618e0..1ba9e35813 100644 --- a/versions/i-/ijg-libjpeg.json +++ b/versions/i-/ijg-libjpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7f8d1987d79b0d6cb043fbe2b57482e63387f01", + "version-string": "9f", + "port-version": 0 + }, { "git-tree": "4a22e20a63c3679dab4839e7a87566b411cf023c", "version-string": "9e",