microsoft · theblackunknown · Feb 12, 2020 · Mar 7, 2020
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
 Source: openimageio
-Version: 2.1.9.0
+Version: 2.1.11.2
 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
@@ -45,4 +45,4 @@ Build-Depends: pybind11
 Description: Enable Python bindings support for openimageio
 
 Feature: tools
-Description: Build openimageio tools
+Description: Build openimageio tools
diff --git a/ports/openimageio/fix-config-cmake.patch b/ports/openimageio/fix-config-cmake.patch
diff --git a/ports/openimageio/fix-dependency.patch b/ports/openimageio/fix-dependency.patch
@@ -1,5 +1,5 @@
 diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 2f4f7ce..16035df 100644
+index fc30448..b63be5c 100644
 --- a/src/cmake/externalpackages.cmake
 +++ b/src/cmake/externalpackages.cmake
 @@ -169,10 +169,17 @@ checked_find_package (PNG REQUIRED)
@@ -63,7 +63,7 @@ index 2f4f7ce..16035df 100644
      list (APPEND qt5_modules OpenGL)
  endif ()
  option (USE_QT "Use Qt if found" ON)
-+if (USE_QT)
++if(USE_QT)
  checked_find_package (Qt5 COMPONENTS ${qt5_modules})
 +endif()
  if (USE_QT AND NOT Qt5_FOUND AND APPLE)

diff --git a/ports/openimageio/fix_static_build.patch b/ports/openimageio/fix_static_build.patch
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
@@ -1,14 +1,12 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF fdd982a9922ff508b8b22e5d024356b582572f46 #2.1.9.0
-    SHA512 1d076cb035b1b2cb603343465ed810ca47223211870d58f48c177d40d71a9cf82e53548b0c70127daf5dbd06f1b24772919e49e55110d914a542bcb62b99f6e8
+    REF Release-2.1.11.2
+    SHA512 11ea3da1c19f1c4b9a101390fdf7411b6d7cf800e525766d3e37a36ee38489890f5a1417c171c139992a60cd01ee0b161065a3a14c75a0eb701685b11763aa46
     HEAD_REF master
     PATCHES
         fix-dependency.patch
-        fix_static_build.patch
         fix-tools-path.patch
-        fix-config-cmake.patch
 )
 
 file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
@@ -41,9 +39,34 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     tools       OIIO_BUILD_TOOLS
 )
 
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-vcpkg_add_to_path("${PYTHON3_DIR}")
+if(VCPKG_TARGET_IS_LINUX)
+    # Because pybind11 dependency relies on system python, it will match python 2.7 by default
+    # At least make sure it is present
+    vcpkg_find_acquire_program(PYTHON2)
+    get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY)
+    vcpkg_add_to_path("${PYTHON2_DIR}")
+
+    find_library(LIBPYTHON2.7
+        NAMES
+            libpython2.7.so
+        PATHS
+            "/usr/lib"
+        PATH_SUFFIXES
+            "x86_64-linux-gnu"
+    )
+    message(STATUS "Building on Linux, Python shared library located at ${LIBPYTHON2.7}")
+    if(NOT LIBPYTHON2.7)
+        message(FATAL_ERROR
+            "Python shared library required on Linux systems, build or install it with your package manager"
+            "\ne.g. apt-get install libpython2.7"
+        )
+    endif()
+    set(OPTIONS_PYTHON_LIBRARY "-DPYTHON_LIBRARY:FILEPATH=${LIBPYTHON2.7}")
+else()
+    vcpkg_find_acquire_program(PYTHON3)
+    get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+    vcpkg_add_to_path("${PYTHON3_DIR}")
+endif()
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -59,6 +82,7 @@ vcpkg_configure_cmake(
         -DBUILD_MISSING_PYBIND11=OFF
         -DBUILD_MISSING_DEPS=OFF
         -DVERBOSE=ON
+        ${OPTIONS_PYTHON_LIBRARY}
 )
 
 vcpkg_install_cmake()