diff options
| author | Billy O'Neal <bion@microsoft.com> | 2021-07-14 12:46:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 12:46:05 -0700 |
| commit | 957d2024b8d6ef44164559645dd898c306066964 (patch) | |
| tree | 7efb14324d139bc22556cdf9d3896469a5846399 /ports/opensubdiv | |
| parent | d369df7ecf194005eaca46f07368779cd486badd (diff) | |
| download | vcpkg-957d2024b8d6ef44164559645dd898c306066964.tar.gz vcpkg-957d2024b8d6ef44164559645dd898c306066964.zip | |
Update to Ubuntu 20.04. (#18892)
* Update Ubuntu to 20.04.
* [tfhe] Disable -Wall -Werror
* [sophus] Disable -Werror.
* Fix typo in deployment of CUDA.
* Add libxxf86vm-dev for opensubdiv.
* [opensubdiv] Fix OpenCL search on Ubuntu 20.04, and document libxxf86vm-dev dependency
* [msgpack11] Disable -Werror.
* [qtwayland, qt5wayland] Add system library notice.
* Add python-is-python3 to unbreak tensorflow, v8, and others
* [graphqlparser] Remove directive rejected by Bison 3.5.1
* [ogdf] Mark as failing in ci.baseline.txt. Issue filed https://github.com/microsoft/vcpkg/issues/18936
* [bde] Mark failing in ci.baseline.txt, issue filed https://github.com/microsoft/vcpkg/issues/18937
* [soem] Patch out -Werror
* Update pool.
Diffstat (limited to 'ports/opensubdiv')
| -rw-r--r-- | ports/opensubdiv/fix-version-search.patch | 13 | ||||
| -rw-r--r-- | ports/opensubdiv/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/opensubdiv/vcpkg.json | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/ports/opensubdiv/fix-version-search.patch b/ports/opensubdiv/fix-version-search.patch new file mode 100644 index 000000000..797347285 --- /dev/null +++ b/ports/opensubdiv/fix-version-search.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindOpenCL.cmake b/cmake/FindOpenCL.cmake +index 485e55e..1c98b91 100644 +--- a/cmake/FindOpenCL.cmake ++++ b/cmake/FindOpenCL.cmake +@@ -177,7 +177,7 @@ if(_OPENCL_CPP_INCLUDE_DIRS) + + if(EXISTS "${OPENCL_INCLUDE_DIRS}/CL/cl.h") + +- file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_.*$") ++ file(STRINGS "${OPENCL_INCLUDE_DIRS}/CL/cl.h" LINES REGEX "^#define CL_VERSION_[0-9]+_[0-9]+.*$") + + foreach(LINE ${LINES}) + diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index defd00a5a..03ec368c2 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -8,14 +8,15 @@ vcpkg_from_github( HEAD_REF master
PATCHES
fix_compile-option.patch
+ fix-version-search.patch
)
if(VCPKG_TARGET_IS_LINUX)
message(
"OpenSubdiv currently requires the following libraries from the system package manager:
- xinerama
+ xinerama xxf86vm
-These can be installed on Ubuntu systems via sudo apt install libxinerama-dev")
+These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev")
endif()
vcpkg_find_acquire_program(PYTHON2)
diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index 42a86d483..dc6b41f65 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opensubdiv", "version-semver": "3.4.3", - "port-version": 1, + "port-version": 2, "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", "supports": "!arm & !uwp" |