mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 19:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Patch Tuesday for January 2023 (#36143)

Browse Source
This commit is contained in:
Billy O'Neal 2024-01-16 19:51:14 -08:00 committed by GitHub
parent 763a397e30
commit 91b17dd72a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/jasper/check-for-atomics-support.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d2e9f9..110c245 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -591,6 +591,7 @@ set(JAS_HAVE_WIN32_THREADS FALSE)
if(JAS_ENABLE_MULTITHREADING_SUPPORT)
check_c_source_compiles("
#include <threads.h>
+ #include <stdatomic.h>
int main() {
thrd_t thread;
mtx_t mutex;

1
ports/jasper/portfile.cmake
View File

@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
no_stdc_check.patch
fix-library-name.patch
check-for-atomics-support.patch # https://github.com/jasper-software/jasper/pull/370
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)

1
ports/jasper/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "jasper",
"version": "4.1.0",
"port-version": 1,
"description": "Open source implementation of the JPEG-2000 Part-1 standard",
"homepage": "https://github.com/jasper-software/jasper",
"license": null,

4
ports/portable-snippets/CMakeLists.txt
View File

@ -62,6 +62,10 @@ foreach (subdir ${subdirs})
else ()
add_library(${module} STATIC ${entries})
if (MSVC)
target_compile_definitions(${module} PUBLIC __STDC_NO_THREADS__=1)
endif ()
set_target_properties(
${module}
PROPERTIES

2
ports/portable-snippets/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "portable-snippets",
"version-date": "2019-09-20",
"port-version": 3,
"port-version": 4,
"description": "Collection of miscellaneous portable C snippets",
"homepage": "https://github.com/nemequ/portable-snippets",
"license": null,

2
scripts/azure-pipelines/android/Dockerfile
View File

@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.4
FROM ubuntu:20.04
FROM ubuntu:focal-20231211
ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip

4
scripts/azure-pipelines/azure-pipelines.yml
View File

@ -4,9 +4,9 @@
variables:
android-pool: 'PrAnd-1ES-Pool'
linux-pool: 'PrLin-1ES-Pool'
windows-pool: 'PrWin-2023-12-12'
windows-pool: 'PrWin-2024-01-11'
osx-pool: 'PrOsx-2023-09-11'
linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-12-05'
linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2024-01-11'
parameters:
- name: vcpkgToolSha

2
scripts/azure-pipelines/windows/deploy-pwsh.ps1
View File

@ -5,5 +5,5 @@
# REPLACE WITH UTILITY-PREFIX.ps1
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/PowerShell-7.4.0-win-x64.msi'
$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/PowerShell-7.4.1-win-x64.msi'
InstallMSI -Url $PwshUrl -Name 'PowerShell Core'

4
versions/baseline.json
View File

@ -3630,7 +3630,7 @@
},
"jasper": {
"baseline": "4.1.0",
"port-version": 0
"port-version": 1
},
"jbig2dec": {
"baseline": "0.20",
@ -6754,7 +6754,7 @@
},
"portable-snippets": {
"baseline": "2019-09-20",
"port-version": 3
"port-version": 4
},
"portaudio": {
"baseline": "19.7",

5
versions/j-/jasper.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3155b993a1ac52e0101edecb422a74513fc3a470",
"version": "4.1.0",
"port-version": 1
},
{
"git-tree": "bbbc1e3a2819d3e823e778a5a35045cc44946c23",
"version": "4.1.0",

5
versions/p-/portable-snippets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e84e5d30ffa9c566c1a27ff12416163694c8ff26",
"version-date": "2019-09-20",
"port-version": 4
},
{
"git-tree": "cb5584d76235e5a975e7c201d244c385cfd1dae7",
"version-date": "2019-09-20",