[gdk-pixbuf] Fix features and deps (#38272)

Amends #38033. Fixes #38270.
microsoft · Apr 22, 2024 · 7e840a5 · 7e840a5
1 parent 4d46928
commit 7e840a5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 12 deletions.
diff --git a/ports/gdk-pixbuf/portfile.cmake b/ports/gdk-pixbuf/portfile.cmake
@@ -21,14 +21,20 @@ endif()
 
 if("png" IN_LIST FEATURES)
     list(APPEND OPTIONS -Dpng=enabled)
+else()
+    list(APPEND OPTIONS -Dpng=disabled)
 endif()
 
 if("tiff" IN_LIST FEATURES)
     list(APPEND OPTIONS -Dtiff=enabled)
+else()
+    list(APPEND OPTIONS -Dtiff=disabled)
 endif()
 
 if("jpeg" IN_LIST FEATURES)
     list(APPEND OPTIONS -Djpeg=enabled)
+else()
+    list(APPEND OPTIONS -Djpeg=disabled)
 endif()
 
 if(CMAKE_HOST_WIN32 AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")

diff --git a/ports/gdk-pixbuf/vcpkg.json b/ports/gdk-pixbuf/vcpkg.json
@@ -1,28 +1,29 @@
 {
   "name": "gdk-pixbuf",
   "version": "2.42.10",
-  "port-version": 4,
+  "port-version": 5,
   "description": "Image loading library.",
   "homepage": "https://gitlab.gnome.org/GNOME/gdk-pixbuf",
   "license": "LGPL-2.1-or-later",
   "supports": "!xbox",
   "dependencies": [
-    "gettext",
+    {
+      "name": "gettext",
+      "host": true,
+      "features": [
+        "tools"
+      ]
+    },
+    "gettext-libintl",
     "glib",
     {
       "name": "glib",
       "host": true
     },
-    "libpng",
-    {
-      "name": "tiff",
-      "default-features": false
-    },
     {
       "name": "vcpkg-tool-meson",
       "host": true
-    },
-    "zlib"
+    }
   ],
   "default-features": [
     "jpeg",
@@ -44,11 +45,20 @@
       ]
     },
     "png": {
-      "description": "Enable PNG loader (requires libpng)"
+      "description": "Enable PNG loader (requires libpng)",
+      "dependencies": [
+        "libpng"
+      ]
     },
     "tiff": {
       "description": "Enable TIFF loader (requires libtiff)",
-      "supports": "!windows"
+      "supports": "!windows",
+      "dependencies": [
+        {
+          "name": "tiff",
+          "default-features": false
+        }
+      ]
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2958,7 +2958,7 @@
     },
     "gdk-pixbuf": {
       "baseline": "2.42.10",
-      "port-version": 4
+      "port-version": 5
     },
     "gemmlowp": {
       "baseline": "2021-09-28",

diff --git a/versions/g-/gdk-pixbuf.json b/versions/g-/gdk-pixbuf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "42ac551a9c1a0035116dd3fa21f6d5e0c34085f3",
+      "version": "2.42.10",
+      "port-version": 5
+    },
     {
       "git-tree": "6483e54d3f776f24e4260ea759ad854b0dfddafb",
       "version": "2.42.10",