From 9a751370f3bb773568178eef0fbc1994b6aad453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 12 Aug 2020 09:35:03 -0700
Subject: [PATCH] [vcpkg baseline] Fix openimageio and pangolin build failures
 on Linux (#12856)

* [openimageio] Add dependency libheif

* [pangolin] Fix link to linux system lib libutil

* [libheif] Install extra headers for other ports(oiio)
---
 ports/libheif/CONTROL                      |  1 +
 ports/libheif/install-extra-headers.patch  | 12 ++++++++++++
 ports/libheif/portfile.cmake               |  1 +
 ports/openimageio/CONTROL                  |  4 ++--
 ports/pangolin/CONTROL                     |  2 +-
 ports/pangolin/fix-dependency-python.patch |  4 ++--
 6 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 ports/libheif/install-extra-headers.patch

diff --git a/ports/libheif/CONTROL b/ports/libheif/CONTROL
index be0476d4de..c6dc343560 100644
--- a/ports/libheif/CONTROL
+++ b/ports/libheif/CONTROL
@@ -1,5 +1,6 @@
 Source: libheif
 Version: 1.7.0
+Port-Version: 1
 Homepage: http://www.libheif.org/
 Description: Open h.265 video codec implementation. 
 Build-Depends: x265, libde265
diff --git a/ports/libheif/install-extra-headers.patch b/ports/libheif/install-extra-headers.patch
new file mode 100644
index 0000000000..eb32ee8a40
--- /dev/null
+++ b/ports/libheif/install-extra-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/libheif/CMakeLists.txt b/libheif/CMakeLists.txt
+index 6d683ec..dc2c4eb 100644
+--- a/libheif/CMakeLists.txt
++++ b/libheif/CMakeLists.txt
+@@ -17,6 +17,7 @@ set(libheif_headers
+     heif_plugin_registry.h
+     heif_limits.h
+     heif_plugin.h
++    heif_cxx.h
+     logging.h
+     ${CMAKE_CURRENT_BINARY_DIR}/heif_version.h
+ )
diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake
index 838734b2d7..97068d449b 100644
--- a/ports/libheif/portfile.cmake
+++ b/ports/libheif/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         dont_build_examples_and_gdk_pixbuf.patch
         remove_finding_pkgconfig.patch
+        install-extra-headers.patch
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index 1a7e6feacd..3612d396d1 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,9 +1,9 @@
 Source: openimageio
 Version: 2.1.16.0
-Port-Version: 2
+Port-Version: 3
 Homepage: https://github.com/OpenImageIO/oiio
 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
-Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace, fmt
+Build-Depends: libjpeg-turbo, tiff, libpng, libheif, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace, fmt
 
 Feature: libraw
 Build-Depends: libraw
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL
index a8c3a60e8f..8fb88660e8 100644
--- a/ports/pangolin/CONTROL
+++ b/ports/pangolin/CONTROL
@@ -1,6 +1,6 @@
 Source: pangolin
 Version: 0.5
-Port-Version: 8
+Port-Version: 9
 Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
 Homepage: https://github.com/stevenlovegrove/Pangolin
 Description: Lightweight GUI Library
diff --git a/ports/pangolin/fix-dependency-python.patch b/ports/pangolin/fix-dependency-python.patch
index 82b1ea83ea..67eae1288c 100644
--- a/ports/pangolin/fix-dependency-python.patch
+++ b/ports/pangolin/fix-dependency-python.patch
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7f364a7..b6567a2 100644
+index 7f364a7..9e0baac 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -213,6 +213,9 @@ endif()
@@ -7,7 +7,7 @@ index 7f364a7..b6567a2 100644
  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)
++    set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util)
 +  endif()
    list(APPEND HEADERS
      ${INCDIR}/console/ConsoleInterpreter.h