From 02466202b2371054897cdb7e6c978062f9d4cb8f Mon Sep 17 00:00:00 2001
From: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Date: Wed, 21 Oct 2020 01:59:20 +0800
Subject: [pangolin] Fix the link error in static build (#14082)

---
 ports/pangolin/CONTROL                    | 4 ++--
 ports/pangolin/fix-dependeny-ffmpeg.patch | 2 +-
 ports/pangolin/portfile.cmake             | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
index 5fb73b084..b27c40d4d 100644
--- a/ports/pangolin/CONTROL
+++ b/ports/pangolin/CONTROL
@@ -1,7 +1,7 @@
 Source: pangolin
 Version: 0.5
-Port-Version: 10
+Port-Version: 11
 Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
 Homepage: https://github.com/stevenlovegrove/Pangolin
 Description: Lightweight GUI Library
-Supports: !uwp & !osx & !(windows&static)
+Supports: !uwp & !osx
diff --git a/ports/pangolin/fix-dependeny-ffmpeg.patch b/ports/pangolin/fix-dependeny-ffmpeg.patch
index 2c52bb710..bb1581e4f 100644
--- a/ports/pangolin/fix-dependeny-ffmpeg.patch
+++ b/ports/pangolin/fix-dependeny-ffmpeg.patch
@@ -38,7 +38,7 @@ index 4f77e5a..151762f 100644
  
  IF(AVCODEC_INCLUDE_DIR AND AVFORMAT_INCLUDE_DIR AND AVUTIL_INCLUDE_DIR AND SWSCALE_INCLUDE_DIR AND AVCODEC_LIBRARY AND AVFORMAT_LIBRARY AND AVUTIL_LIBRARY AND SWSCALE_LIBRARY AND AVUTIL_HAVE_PIXDESC)
 +   IF (WIN32)
-+      SET(AVFORMAT_LIBRARY ${AVFORMAT_LIBRARY} Ws2_32 Secur32 Bcrypt)
++      SET(AVFORMAT_LIBRARY ${AVFORMAT_LIBRARY} Ws2_32 Secur32 Bcrypt strmiids mfplat mfuuid)
 +   ENDIF()
     SET(FFMPEG_FOUND TRUE)
 -   SET(FFMPEG_LIBRARIES ${AVCODEC_LIBRARY} ${AVFORMAT_LIBRARY} ${AVUTIL_LIBRARY} ${SWSCALE_LIBRARY})
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index 682262e82..79080b126 100644
--- a/ports/pangolin/portfile.cmake
+++ b/ports/pangolin/portfile.cmake
@@ -1,3 +1,5 @@
+vcpkg_fail_port_install(ON_TARGET "OSX" "UWP")
+
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
@@ -6,7 +8,7 @@ vcpkg_from_github(
     REF v0.5
     SHA512 7ebeec108f33f1aa8b1ad08e3ca128a837b22d33e3fc580021f981784043b023a1bf563bbfa8b51d46863db770b336d24fc84ee3d836b85e0da1848281b2a5b2
     HEAD_REF master
-	PATCHES
+    PATCHES
         deprecated_constants.patch # Change from upstream pangolin to address build failures from latest ffmpeg library
         fix-includepath-error.patch # include path has one more ../
         fix-dependeny-ffmpeg.patch
-- 
cgit v1.2.3