include protobuf

.github/workflows/rpcs3.yml

@@ -456,7 +456,12 @@ jobs:
       VCPKG_TRIPLET: x64-windows
       VCPKG_BUILD_TYPE: release
       VCPKG_ROOT: "${{github.workspace}}/vcpkg"
-      VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
+      VCPKG_BINARY_SOURCES: 'clear;nuget,https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json,readwrite'
+      X_VCPKG_NUGET_ID: "GitHub"
+      X_VCPKG_NUGET_USER: "${{ github.actor }}"
+      X_VCPKG_NUGET_PASSWORD: "${{ secrets.GITHUB_TOKEN }}"
+      NUGET_CREDENTIALPROVIDERS_AUTODETECT: 'false'
+      VCPKG_MAX_CONCURRENCY: '1'
     name: RPCS3 Windows Clang (Clang-CL)
     steps:
       - name: Checkout repository
@@ -471,17 +476,18 @@ jobs:
           .\vcpkg\bootstrap-vcpkg.bat
 
       - name: 'Setup NuGet Credentials for vcpkg'
+        shell: pwsh
         run: |
-          `./vcpkg/vcpkg fetch nuget | tail -n 1` \
-          sources add \
-          -source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" \
-          -storepasswordincleartext \
-          -name "GitHub" \
-          -username "${{ github.repository_owner }}" \
-          -password "${{ secrets.GITHUB_TOKEN }}"
-          `./vcpkg/vcpkg fetch nuget | tail -n 1` \
-          setapikey "${{ secrets.GITHUB_TOKEN }}" \
-          -source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
+          dotnet nuget locals all --clear        
+          $configPath = "${{ github.workspace }}\nuget.config"
+          dotnet new nugetconfig --force --output "${{ github.workspace }}"
+          dotnet nuget add source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" `
+            --name "GitHub" `
+            --username "${{ github.actor }}" `
+            --password "${{ secrets.GITHUB_TOKEN }}" `
+            --store-password-in-clear-text `
+            --configfile "$configPath"
+          echo "VCPKG_NUGET_CONFIG=$configPath" >> $env:GITHUB_ENV
 
       - name: Restore LLVM Cache
         uses: actions/cache/restore@main

3rdparty/protobuf/CMakeLists.txt

@@ -20,7 +20,10 @@ else()
 	option(protobuf_DISABLE_RTTI "Remove runtime type information in the binaries" OFF)
 	option(protobuf_FORCE_FETCH_DEPENDENCIES "Force all dependencies to be downloaded from GitHub.  Local installations will be ignored." OFF)
 	option(protobuf_LOCAL_DEPENDENCIES_ONLY "Prevent downloading any dependencies from GitHub. If this option is set, the dependency must be available locally as an installed package." OFF)
-
+	if(VCPKG_TOOLCHAIN)
+	    set(protobuf_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
+	    message(STATUS "VCPKG detected: Building Protobuf as a shared library")
+	endif()
 	add_subdirectory(protobuf EXCLUDE_FROM_ALL)
 	target_include_directories(3rdparty_protobuf SYSTEM INTERFACE protobuf/src)
 	target_link_libraries(3rdparty_protobuf INTERFACE libprotobuf)

vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "rpcs3",
   "version-string": "1.0",
-  "builtin-baseline": "b94ab47c998b93fe72b0f501eaac70f96328019e",
+  "builtin-baseline": "7c45dcccbe6463539a6b92c264258043d267c8f6",
   "dependencies": [
     "curl",
     {
@@ -15,6 +15,7 @@
     },
     "libpng",
     "opencv",
+    "protobuf",
     "qtbase",
     "qtmultimedia",
     "qtsvg",