mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-28 11:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[openimageio] Update to version 2.1.16.0 (#11767)

Browse Source
This commit is contained in:
Lily 2020-07-08 04:48:51 +08:00 committed by GitHub
parent 279a28e81d
commit 12333a6b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/openimageio/CONTROL
View File

@ -1,8 +1,8 @@
Source: openimageio
Version: 2.1.9.0
Version: 2.1.16.0
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
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
Feature: libraw
Build-Depends: libraw

14
ports/openimageio/fix-config-cmake.patch
View File

@ -1,12 +1,12 @@
diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
index c6e1a13..3d784f3 100644
index c578a1b..298362a 100644
--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
@@ -6,5 +6,5 @@ include(CMakeFindDependencyMacro)
# e.g. if switching to Boost::Boost instead of using ${Boost_LIBRARY_DIRS} the add:
# find_dependency(Boost @Boost_VERSION@)
@@ -14,6 +14,6 @@ set (@PROJECT_NAME@_PLUGIN_SEARCH_PATH "@PLUGIN_SEARCH_PATH_NATIVE@")
#...logic to determine installedPrefix from the own location...
#set (@PROJECT_NAME@_CONFIG_DIR "${installedPrefix}/@CONFIG_INSTALL_DIR@")
-include("${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake")
-include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/OpenImageIOTargets.cmake")
check_required_components("@PROJECT_NAME@")
\ No newline at end of file
check_required_components ("@PROJECT_NAME@")

13
ports/openimageio/fix-dependfmt.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
index 4f1dfaf..1a17d1e 100644
--- a/src/cmake/externalpackages.cmake
+++ b/src/cmake/externalpackages.cmake
@@ -385,5 +385,7 @@ macro (find_or_download_fmt)
checked_find_package (fmt REQUIRED)
endmacro()
-find_or_download_fmt()
+find_package(fmt CONFIG REQUIRED)
+get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+checked_find_package (fmt CONFIG REQUIRED)
include_directories (${FMT_INCLUDES})

6
ports/openimageio/fix_static_build.patch
View File

@ -1,12 +1,12 @@
diff --git a/src/cmake/compiler.cmake b/src/cmake/compiler.cmake
index 4f4f31c..a18895e 100644
index 1468be3..ed4167a 100644
--- a/src/cmake/compiler.cmake
+++ b/src/cmake/compiler.cmake
@@ -451,7 +451,7 @@ set (EXTRA_DSO_LINK_ARGS "" CACHE STRING "Extra command line definitions when bu
@@ -482,7 +482,7 @@ set (EXTRA_DSO_LINK_ARGS "" CACHE STRING "Extra command line definitions when bu
#
option (BUILD_SHARED_LIBS "Build shared libraries (set to OFF to build static libs)" ON)
if (NOT BUILD_SHARED_LIBS)
- add_definitions (-D${PROJECT_NAME}_STATIC_DEFINE=1)
- add_definitions (-D${PROJ_NAME}_STATIC_DEFINE=1)
+ add_definitions (-DOIIO_STATIC_DEFINE=1)
endif ()

5
ports/openimageio/portfile.cmake
View File

@ -1,14 +1,15 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OpenImageIO/oiio
REF fdd982a9922ff508b8b22e5d024356b582572f46 #2.1.9.0
SHA512 1d076cb035b1b2cb603343465ed810ca47223211870d58f48c177d40d71a9cf82e53548b0c70127daf5dbd06f1b24772919e49e55110d914a542bcb62b99f6e8
REF e028a5264bd229e128b37a4362f7eb9c73ea82cc #2.1.16.0
SHA512 be5741e139c3c1d2fe62d6706833e9b158b6b00e1a57d141626f28cd3653f63e587b76de676b6b45d1a2330a0e71ebb2f1d00c108b68509cc418b6026424cfda
HEAD_REF master
PATCHES
fix-dependency.patch
fix_static_build.patch
fix-tools-path.patch
fix-config-cmake.patch
fix-dependfmt.patch
)
file(REMOVE_RECURSE "${SOURCE_PATH}/ext")