Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Aug 12, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93cc8e5
[openimageio] Add dependency libheif
Aug 11, 2020
0c918b8
[pangolin] Fix link to linux system lib libutil
Aug 11, 2020
7e23a9f
[libheif] Install extra headers for other ports(oiio)
Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/libheif/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 12 additions & 0 deletions ports/libheif/install-extra-headers.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions ports/libheif/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions ports/openimageio/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ports/pangolin/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ports/pangolin/fix-dependency-python.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
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()
find_package(PythonLibs QUIET)
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
Expand Down