diff options
| author | Yann Lanthony <yann.lanthony@gmail.com> | 2018-07-03 09:55:31 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-03 00:55:31 -0700 |
| commit | 67d6200cdb9ebdb56c1940f8ac4f91362b6e5c66 (patch) | |
| tree | 6bde053f11f6a048039318e141fd37565d5742b0 /ports/openimageio/fix_libraw.patch | |
| parent | 608067628921adb6fe70a2526d229d57dcdf89ac (diff) | |
| download | vcpkg-67d6200cdb9ebdb56c1940f8ac4f91362b6e5c66.tar.gz vcpkg-67d6200cdb9ebdb56c1940f8ac4f91362b6e5c66.zip | |
[openimageio] build with libraw support (#3830)
* [openimageio] build with libraw
* patch: replace 'LibRaw_r_LIBRARIES' occurrences by 'LibRaw_LIBRARIES' since libraw port installs 'raw_r' library as 'raw'
* activate USE_LIBRAW
* declare dependency to libraw in CONTROL file
* [openimageio] 'libraw' as Feature
* [openimageio] Use PATCHES parameter of vcpkg_from_github()
Diffstat (limited to 'ports/openimageio/fix_libraw.patch')
| -rw-r--r-- | ports/openimageio/fix_libraw.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/ports/openimageio/fix_libraw.patch b/ports/openimageio/fix_libraw.patch new file mode 100644 index 000000000..0870a567f --- /dev/null +++ b/ports/openimageio/fix_libraw.patch @@ -0,0 +1,40 @@ +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 5eeb7d3..3e8bfcb 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -336,7 +336,7 @@ if (USE_LIBRAW) + message (STATUS "Looking for LibRaw with ${LIBRAW_PATH}") + endif () + find_package (LibRaw) +- if (LibRaw_r_LIBRARIES AND LibRaw_INCLUDE_DIR) ++ if (LibRaw_LIBRARIES AND LibRaw_INCLUDE_DIR) + set (LIBRAW_FOUND TRUE) + include_directories (${LibRaw_INCLUDE_DIR}) + if (NOT LibRaw_FIND_QUIETLY) +@@ -350,7 +350,7 @@ if (USE_LIBRAW) + if (LINKSTATIC) + find_package (Jasper) + find_library (LCMS2_LIBRARIES NAMES lcms2) +- set (LibRaw_r_LIBRARIES ${LibRaw_r_LIBRARIES} ${JASPER_LIBRARIES} ${LCMS2_LIBRARIES}) ++ set (LibRaw_LIBRARIES ${LibRaw_LIBRARIES} ${JASPER_LIBRARIES} ${LCMS2_LIBRARIES}) + endif () + else () + message (STATUS "Not using LibRaw") +@@ -494,4 +494,3 @@ if (USE_DICOM) + endif() + # end DCMTK setup + ########################################################################### +- +diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt +index e3608a2..f503035 100644 +--- a/src/raw.imageio/CMakeLists.txt ++++ b/src/raw.imageio/CMakeLists.txt +@@ -1,7 +1,7 @@ + if (USE_LIBRAW AND LIBRAW_FOUND) + add_oiio_plugin (rawinput.cpp + INCLUDE_DIRS ${LibRaw_INCLUDE_DIR} +- LINK_LIBRARIES ${LibRaw_r_LIBRARIES} ++ LINK_LIBRARIES ${LibRaw_LIBRARIES} + DEFINITIONS "-DUSE_LIBRAW=1") + else () + message (WARNING "Raw plugin will not be built") |