3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[gdk-pixbuf] jpeg and tiff support windows (#38369)

Browse Source 
Amends https://github.com/microsoft/vcpkg/pull/38033.
Fixes #38360.
This commit is contained in:
Kai Pastor 2024-05-02 04:46:26 +02:00 committed by GitHub
parent 3a882b3efc
commit 3d5961e8c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/gdk-pixbuf/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "gdk-pixbuf", "name": "gdk-pixbuf",
"version": "2.42.10", "version": "2.42.10",
"port-version": 5, "port-version": 6,
"description": "Image loading library.", "description": "Image loading library.",
"homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf", "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
"license": "LGPL-2.1-or-later", "license": "LGPL-2.1-or-later",
@ -39,7 +39,6 @@
}, },
"jpeg": { "jpeg": {
"description": "Enable JPEG loader (requires libjpeg)", "description": "Enable JPEG loader (requires libjpeg)",
"supports": "!windows",
"dependencies": [ "dependencies": [
"libjpeg-turbo" "libjpeg-turbo"
] ]
@ -52,7 +51,6 @@
}, },
"tiff": { "tiff": {
"description": "Enable TIFF loader (requires libtiff)", "description": "Enable TIFF loader (requires libtiff)",
"supports": "!windows",
"dependencies": [ "dependencies": [
{ {
"name": "tiff", "name": "tiff",

3
scripts/ci.baseline.txt
View File

@ -363,6 +363,8 @@ gamenetworkingsockets:x64-android=fail
# VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 # VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474
# gazebo is broken due it depend on old ports that already in the new versions. # gazebo is broken due it depend on old ports that already in the new versions.
# There is an open PR that try to fix that. # There is an open PR that try to fix that.
gazebo:x64-windows=fail
gazebo:x86-windows=fail
gazebo:x64-linux=fail gazebo:x64-linux=fail
gdk-pixbuf:arm-neon-android=fail gdk-pixbuf:arm-neon-android=fail
gdk-pixbuf:arm64-android=fail gdk-pixbuf:arm64-android=fail
@ -420,6 +422,7 @@ gstreamer:x64-android=fail
# upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629. # upstream issue https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1629.
gstreamer:x64-windows-static = skip gstreamer:x64-windows-static = skip
gstreamer:x64-windows-static-md = skip gstreamer:x64-windows-static-md = skip
gtk:x64-windows-static-md=fail
gul14:arm-neon-android=fail gul14:arm-neon-android=fail
gul14:arm64-android=fail gul14:arm64-android=fail
gul14:x64-android=fail gul14:x64-android=fail

2
versions/baseline.json
View File

@ -2962,7 +2962,7 @@
}, },
"gdk-pixbuf": { "gdk-pixbuf": {
"baseline": "2.42.10", "baseline": "2.42.10",
"port-version": 5 "port-version": 6
}, },
"gemmlowp": { "gemmlowp": {
"baseline": "2021-09-28", "baseline": "2021-09-28",

5
versions/g-/gdk-pixbuf.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "20f10a57d8a363c929b92c881e25750db32f59fe",
"version": "2.42.10",
"port-version": 6
},
{ {
"git-tree": "42ac551a9c1a0035116dd3fa21f6d5e0c34085f3", "git-tree": "42ac551a9c1a0035116dd3fa21f6d5e0c34085f3",
"version": "2.42.10", "version": "2.42.10",