From c0a7e9b30cd47fa583dba50910e2d74661766f2d Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 31 Aug 2020 02:01:22 -0700
Subject: [PATCH 1/2] [pangolin] Refix dependency and fix dependency glew

---
 ports/pangolin/CONTROL                     |  7 ++++++-
 ports/pangolin/fix-dependency-glew.patch   | 16 ++++++++++++++++
 ports/pangolin/fix-dependency-python.patch | 14 --------------
 ports/pangolin/portfile.cmake              | 10 ++++++++--
 4 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 ports/pangolin/fix-dependency-glew.patch
 delete mode 100644 ports/pangolin/fix-dependency-python.patch

diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
index 8fb88660e8de8b..d05fe2cf6e76a5 100644
--- a/ports/pangolin/CONTROL
+++ b/ports/pangolin/CONTROL
@@ -1,7 +1,12 @@
 Source: pangolin
 Version: 0.5
-Port-Version: 9
+Port-Version: 10
 Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
 Homepage: https://github.com/stevenlovegrove/Pangolin
 Description: Lightweight GUI Library
 Supports: !uwp & !osx & !(windows&static)
+Default-Features: python
+
+Feature: python
+Build-Depends: python3
+Description: Build with python
\ No newline at end of file
diff --git a/ports/pangolin/fix-dependency-glew.patch b/ports/pangolin/fix-dependency-glew.patch
new file mode 100644
index 00000000000000..3c31d8fee15169
--- /dev/null
+++ b/ports/pangolin/fix-dependency-glew.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4047714..6282693 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,6 +62,11 @@ if(_OSX_)
+     set(CMAKE_MACOSX_RPATH ON)
+ endif()
+ 
++if (NOT BUILD_EXTERN_GLEW)
++    find_package(glew CONFIG REQUIRED)
++    link_libraries(GLEW::glew)
++endif()
++
+ # Overide with cmake -DCMAKE_BUILD_TYPE=Debug {dir}
+ if( NOT CMAKE_BUILD_TYPE AND NOT _WIN_ )
+    message("Build type not set (defaults to release)")
diff --git a/ports/pangolin/fix-dependency-python.patch b/ports/pangolin/fix-dependency-python.patch
deleted file mode 100644
index 67eae1288cf54a..00000000000000
--- a/ports/pangolin/fix-dependency-python.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7f364a7..9e0baac 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -213,6 +213,9 @@ endif()
- find_package(PythonLibs QUIET)
- if(BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND PYTHONLIBS_FOUND AND NOT _WIN_)
-   set(HAVE_PYTHON 1)
-+  if (UNIX)
-+    set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util)
-+  endif()
-   list(APPEND HEADERS
-     ${INCDIR}/console/ConsoleInterpreter.h
-     ${INCDIR}/console/ConsoleView.h
diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake
index 4f48fc1c66beca..c02225b577ccea 100644
--- a/ports/pangolin/portfile.cmake
+++ b/ports/pangolin/portfile.cmake
@@ -10,17 +10,23 @@ vcpkg_from_github(
         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
-        fix-dependency-python.patch
+        fix-dependency-glew.patch
 )
 
 file(REMOVE ${SOURCE_PATH}/CMakeModules/FindGLEW.cmake)
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_CRT)
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+    INVERTED_FEATURES
+    python CMAKE_DISABLE_FIND_PACKAGE_PythonLibs
+)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS
+    OPTIONS ${FEATURE_OPTIONS}
         -DBUILD_EXTERN_GLEW=OFF
         -DBUILD_EXTERN_LIBPNG=OFF
         -DBUILD_EXTERN_LIBJPEG=OFF

From 06a581cfc586ad29ee8d6804f6c10603b4f8cf8c Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Mon, 31 Aug 2020 19:45:12 -0700
Subject: [PATCH 2/2] [pangolin] Re-fix dependency glew

---
 ports/pangolin/fix-dependency-glew.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/pangolin/fix-dependency-glew.patch b/ports/pangolin/fix-dependency-glew.patch
index 3c31d8fee15169..cd597724b2971b 100644
--- a/ports/pangolin/fix-dependency-glew.patch
+++ b/ports/pangolin/fix-dependency-glew.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4047714..6282693 100644
+index 4047714..e4e149c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -62,6 +62,11 @@ if(_OSX_)
@@ -7,8 +7,8 @@ index 4047714..6282693 100644
  endif()
  
 +if (NOT BUILD_EXTERN_GLEW)
-+    find_package(glew CONFIG REQUIRED)
-+    link_libraries(GLEW::glew)
++    find_package(GLEW REQUIRED)
++    link_libraries(GLEW::GLEW)
 +endif()
 +
  # Overide with cmake -DCMAKE_BUILD_TYPE=Debug {dir}