From 673c55fb043ebef6397235e87b39bd86305450c2 Mon Sep 17 00:00:00 2001 From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Date: Fri, 13 May 2022 08:06:27 +0800 Subject: [PATCH] [OpenImageIO] Fix featrue ffmpeg install (#24623) * [OpenImageIO] Enable featrue ffmpeg with oiio * x-add-version * Also disable docs. Co-authored-by: Lily Wang Co-authored-by: Billy Robert O'Neal --- ports/openimageio/fix-ffmpeg-tool.patch | 17 +++++++++++++++++ ports/openimageio/portfile.cmake | 3 +++ ports/openimageio/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openimageio.json | 5 +++++ 5 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 ports/openimageio/fix-ffmpeg-tool.patch diff --git a/ports/openimageio/fix-ffmpeg-tool.patch b/ports/openimageio/fix-ffmpeg-tool.patch new file mode 100644 index 0000000000..e185a30031 --- /dev/null +++ b/ports/openimageio/fix-ffmpeg-tool.patch @@ -0,0 +1,17 @@ +diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt +index 5840206..cc52e4c 100644 +--- a/src/ffmpeg.imageio/CMakeLists.txt ++++ b/src/ffmpeg.imageio/CMakeLists.txt +@@ -2,9 +2,10 @@ + # SPDX-License-Identifier: BSD-3-Clause + # https://github.com/OpenImageIO/oiio + +-if (FFmpeg_FOUND) ++if (USE_FFMPEG) ++ find_package(FFMPEG REQUIRED) + add_oiio_plugin (ffmpeginput.cpp +- INCLUDE_DIRS ${FFMPEG_INCLUDES} ++ INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} + LINK_LIBRARIES ${FFMPEG_LIBRARIES} + ${BZIP2_LIBRARIES} + DEFINITIONS "-DUSE_FFMPEG" diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake index 4f93c86cf9..950ebf63a7 100644 --- a/ports/openimageio/portfile.cmake +++ b/ports/openimageio/portfile.cmake @@ -8,6 +8,7 @@ vcpkg_from_github( fix-dependencies.patch fix-config-cmake.patch fix-openjpeg-linkage.patch + fix-ffmpeg-tool.patch ) file(REMOVE_RECURSE "${SOURCE_PATH}/ext") @@ -53,6 +54,8 @@ vcpkg_cmake_configure( -DBUILD_MISSING_DEPS=OFF -DSTOP_ON_WARNING=OFF -DVERBOSE=ON + -DBUILD_DOCS=OFF + -DINSTALL_DOCS=OFF ) vcpkg_cmake_install() diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json index e361f99552..9136d46481 100644 --- a/ports/openimageio/vcpkg.json +++ b/ports/openimageio/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openimageio", "version": "2.3.10.1", - "port-version": 3, + "port-version": 4, "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.", "homepage": "https://github.com/OpenImageIO/oiio", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 1cb0aac565..6beb053629 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5142,7 +5142,7 @@ }, "openimageio": { "baseline": "2.3.10.1", - "port-version": 3 + "port-version": 4 }, "openjpeg": { "baseline": "2.4.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 821542404b..0fac6cd2e7 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c60e9a4adf07bdd6ff8bf766f295af17d8a0818", + "version": "2.3.10.1", + "port-version": 4 + }, { "git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca", "version": "2.3.10.1",