3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg baseline] Fix openimageio and pangolin build failures on Linux (#12856)

Browse Source 
* [openimageio] Add dependency libheif

* [pangolin] Fix link to linux system lib libutil

* [libheif] Install extra headers for other ports(oiio)
This commit is contained in:
Jack·Boos·Yu 2020-08-12 09:35:03 -07:00 committed by GitHub
parent 0a16cad007
commit 9a751370f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ports/libheif/CONTROL
View File

@ -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

12
ports/libheif/install-extra-headers.patch Normal file
View File

@ -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
)

1
ports/libheif/portfile.cmake
View File

@ -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(

4
ports/openimageio/CONTROL
View File

@ -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

2
ports/pangolin/CONTROL
View File

@ -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

4
ports/pangolin/fix-dependency-python.patch
View File

@ -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