[Scummvm-git-logs] scummvm branch-2-5 -> e6ed1dee5b728fe8ebc928b741e0404cd8e76b5e

[sluicebox]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
116e58a76f CI: Update vcpkg to fix PCRE downloads
e6ed1dee5b CREATE_PROJECT: Update MSVC jpeg debug lib name


Commit: 116e58a76f0194bb37be1f1629ddc61231acfe4b
    https://github.com/scummvm/scummvm/commit/116e58a76f0194bb37be1f1629ddc61231acfe4b
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-11-11T14:28:33-06:00

Commit Message:
CI: Update vcpkg to fix PCRE downloads

PCRE changed their download server.

https://github.com/microsoft/vcpkg/issues/21201

Changed paths:
    .github/workflows/ci.yml


diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58c9d21ad7..fc54a93b2c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,7 +40,7 @@ jobs:
         uses: lukka/run-vcpkg at v7
         id: runvcpkg
         with:
-          vcpkgGitCommitId: b67fab9861239e33b722b9a44f5c96dec6ca807e
+          vcpkgGitCommitId: 70033dbb31527fb3e69654731f540f59c87787f9
           vcpkgTriplet: '${{ matrix.triplet }}'
           vcpkgArguments: '${{ matrix.vcpkgPackages }}'
 #      - name: Upload libs


Commit: e6ed1dee5b728fe8ebc928b741e0404cd8e76b5e
    https://github.com/scummvm/scummvm/commit/e6ed1dee5b728fe8ebc928b741e0404cd8e76b5e
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-11-11T14:28:39-06:00

Commit Message:
CREATE_PROJECT: Update MSVC jpeg debug lib name

Required for CI; libjpeg-turbo debug builds no longer have a "d"
suffix when building with vcpkg.

Changed paths:
    devtools/create_project/msvc.cpp


diff --git a/devtools/create_project/msvc.cpp b/devtools/create_project/msvc.cpp
index 353fe5be23..a2c38e62eb 100644
--- a/devtools/create_project/msvc.cpp
+++ b/devtools/create_project/msvc.cpp
@@ -69,7 +69,7 @@ std::string MSVCProvider::getLibraryFromFeature(const char *feature, const Build
 		{     "mpeg2", "mpeg2.lib",                 0,               0,                                                 "libmpeg2.lib" },
 		{    "theora", "theora.lib",                0,               0,                                                 "libtheora_static.lib" },
 		{  "freetype", "freetype.lib",              "freetyped.lib", 0,                                                 0 },
-		{      "jpeg", "jpeg.lib",                  "jpegd.lib",     0,                                                 "jpeg-static.lib" },
+		{      "jpeg", "jpeg.lib",                  0,               0,                                                 "jpeg-static.lib" },
 		{"fluidsynth", "fluidsynth.lib",            0,               0,                                                 "libfluidsynth.lib" },
 		{ "fluidlite", "fluidlite.lib",             0,               0,                                                 0 },
 		{   "libcurl", "libcurl.lib",               "libcurl-d.lib", "ws2_32.lib wldap32.lib crypt32.lib normaliz.lib", 0 },