From e9ad77d61b9a539b8deedd87f65bb3d0d22de54e Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 15 Jan 2021 18:16:57 -0800
Subject: [PATCH 1/2] [simage] Fix optional dependencies

---
 ports/simage/CONTROL        |  3 ++-
 ports/simage/portfile.cmake | 18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/ports/simage/CONTROL b/ports/simage/CONTROL
index f88751b8db1425..e25840834342e1 100644
--- a/ports/simage/CONTROL
+++ b/ports/simage/CONTROL
@@ -1,5 +1,6 @@
 Source: simage
 Version: 1.8.0
+Port-Version: 1
 Description: Image file format library abstraction layer
-Build-Depends: giflib (linux|uwp), libjpeg-turbo (linux|uwp), libpng (linux|uwp), libsndfile (linux|uwp), tiff (linux|uwp), libvorbis (linux|uwp)
+Build-Depends: giflib (!windows&!osx), libjpeg-turbo (!windows&!osx), libpng (!windows&!osx), libsndfile, tiff (!windows&!osx), libvorbis, zlib (!windows&!osx)
 Homepage: https://github.com/coin3d/simage
diff --git a/ports/simage/portfile.cmake b/ports/simage/portfile.cmake
index 59fbf4557f1d4f..6b890c8a5c75b3 100644
--- a/ports/simage/portfile.cmake
+++ b/ports/simage/portfile.cmake
@@ -20,7 +20,15 @@ else()
     set(SIMAGE_BUILD_SHARED_LIBS ON)
 endif()
 
-if(VCPKG_TARGET_IS_UWP)
+set(OSX_OR_WINDOWS OFF)
+if((VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP) OR VCPKG_TARGET_IS_OSX)
+    set(OSX_OR_WINDOWS ON)
+endif()
+
+if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_UWP)
+    set(SIMAGE_USE_AVIENC ON)
+    set(SIMAGE_USE_GDIPLUS ON)
+else()
     set(SIMAGE_USE_AVIENC OFF)
     set(SIMAGE_USE_GDIPLUS OFF)
 endif()
@@ -32,6 +40,14 @@ vcpkg_configure_cmake(
         -DSIMAGE_BUILD_SHARED_LIBS=${SIMAGE_BUILD_SHARED_LIBS}
         -DSIMAGE_USE_AVIENC=${SIMAGE_USE_AVIENC}
         -DSIMAGE_USE_GDIPLUS=${SIMAGE_USE_GDIPLUS}
+        -DCMAKE_DISABLE_FIND_PACKAGE_FLAC=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
+        -DCMAKE_DISABLE_FIND_PACKAGE_ZLIB=${OSX_OR_WINDOWS}
+        -DCMAKE_DISABLE_FIND_PACKAGE_GIF=${OSX_OR_WINDOWS}
+        -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${OSX_OR_WINDOWS}
+        -DCMAKE_DISABLE_FIND_PACKAGE_PNG=${OSX_OR_WINDOWS}
+        -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=${OSX_OR_WINDOWS}
 )
 
 vcpkg_install_cmake()

From f93870837934e50661159644a8887cdd3df2c72b Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Sat, 16 Jan 2021 13:57:35 -0800
Subject: [PATCH 2/2] [simage] Add to versions db

---
 port_versions/baseline.json  | 2 +-
 port_versions/s-/simage.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index 9d7d99eb3a3377..26919cc63a7b08 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -5274,7 +5274,7 @@
     },
     "simage": {
       "baseline": "1.8.0",
-      "port-version": 0
+      "port-version": 1
     },
     "simde": {
       "baseline": "0.7.0",
diff --git a/port_versions/s-/simage.json b/port_versions/s-/simage.json
index 9f0b909c935411..e245aca0bee948 100644
--- a/port_versions/s-/simage.json
+++ b/port_versions/s-/simage.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7efea762708b2fa21ac7919656bfcdfccbd84339",
+      "version-string": "1.8.0",
+      "port-version": 1
+    },
     {
       "git-tree": "d73e98a3ac5a4ed61f96dce0e08628170ea803ad",
       "version-string": "1.8.0",