mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 09:28:07 +08:00
[OpenImageIO] Fix featrue ffmpeg install (#24623)
* [OpenImageIO] Enable featrue ffmpeg with oiio * x-add-version * Also disable docs. Co-authored-by: Lily Wang <v-lilywang@microsoft.com> Co-authored-by: Billy Robert O'Neal <bion@microsoft.com>
This commit is contained in:
parent
f68e901854
commit
673c55fb04
17
ports/openimageio/fix-ffmpeg-tool.patch
Normal file
17
ports/openimageio/fix-ffmpeg-tool.patch
Normal file
@ -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"
|
@ -8,6 +8,7 @@ vcpkg_from_github(
|
|||||||
fix-dependencies.patch
|
fix-dependencies.patch
|
||||||
fix-config-cmake.patch
|
fix-config-cmake.patch
|
||||||
fix-openjpeg-linkage.patch
|
fix-openjpeg-linkage.patch
|
||||||
|
fix-ffmpeg-tool.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
|
file(REMOVE_RECURSE "${SOURCE_PATH}/ext")
|
||||||
@ -53,6 +54,8 @@ vcpkg_cmake_configure(
|
|||||||
-DBUILD_MISSING_DEPS=OFF
|
-DBUILD_MISSING_DEPS=OFF
|
||||||
-DSTOP_ON_WARNING=OFF
|
-DSTOP_ON_WARNING=OFF
|
||||||
-DVERBOSE=ON
|
-DVERBOSE=ON
|
||||||
|
-DBUILD_DOCS=OFF
|
||||||
|
-DINSTALL_DOCS=OFF
|
||||||
)
|
)
|
||||||
|
|
||||||
vcpkg_cmake_install()
|
vcpkg_cmake_install()
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "openimageio",
|
"name": "openimageio",
|
||||||
"version": "2.3.10.1",
|
"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.",
|
"description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
|
||||||
"homepage": "https://github.com/OpenImageIO/oiio",
|
"homepage": "https://github.com/OpenImageIO/oiio",
|
||||||
"license": "BSD-3-Clause",
|
"license": "BSD-3-Clause",
|
||||||
|
@ -5142,7 +5142,7 @@
|
|||||||
},
|
},
|
||||||
"openimageio": {
|
"openimageio": {
|
||||||
"baseline": "2.3.10.1",
|
"baseline": "2.3.10.1",
|
||||||
"port-version": 3
|
"port-version": 4
|
||||||
},
|
},
|
||||||
"openjpeg": {
|
"openjpeg": {
|
||||||
"baseline": "2.4.0",
|
"baseline": "2.4.0",
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "4c60e9a4adf07bdd6ff8bf766f295af17d8a0818",
|
||||||
|
"version": "2.3.10.1",
|
||||||
|
"port-version": 4
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca",
|
"git-tree": "2fa8debd832d46f5ad96798be8a335b8a251c2ca",
|
||||||
"version": "2.3.10.1",
|
"version": "2.3.10.1",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user