ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/openimageio/fix-dependency.patch

   1 diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
   2 index e7261af3..195f46cb 100644
   3 --- a/src/cmake/externalpackages.cmake
   4 +++ b/src/cmake/externalpackages.cmake
   5 @@ -102,7 +102,6 @@ if (MSVC AND NOT LINKSTATIC)
   6      add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?
   7  endif ()
   8
   9 -
  10  # JPEG -- prefer Turbo-JPEG to regular libjpeg
  11  checked_find_package (JPEGTurbo
  12                        DEFINITIONS -DUSE_JPEG_TURBO=1
  13 @@ -145,7 +144,7 @@ checked_find_package (HDF5
  14                     ISDEPOF      Field3D)
  15  checked_find_package (OpenColorIO
  16                     DEFINITIONS  -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1)
  17 -checked_find_package (OpenCV
  18 +checked_find_package (OpenCV CONFIG
  19                     DEFINITIONS  -DUSE_OPENCV=1)
  20
  21  # Intel TBB
  22 @@ -155,7 +154,7 @@ checked_find_package (TBB 2017
  23                     ISDEPOF      OpenVDB)
  24
  25  checked_find_package (DCMTK VERSION_MIN 3.6.1)  # For DICOM images
  26 -checked_find_package (FFmpeg VERSION_MIN 2.6)
  27 +checked_find_package (FFMPEG)
  28  checked_find_package (Field3D
  29                     DEPS         HDF5
  30                     DEFINITIONS  -DUSE_FIELD3D=1)
  31 @@ -163,18 +162,25 @@ checked_find_package (GIF
  32                        VERSION_MIN 4
  33                        RECOMMEND_MIN 5.0
  34                        RECOMMEND_MIN_REASON "for stability and thread safety")
  35 -checked_find_package (Libheif VERSION_MIN 1.3)  # For HEIF/HEIC format
  36 -checked_find_package (LibRaw
  37 +checked_find_package (libheif CONFIG)  # For HEIF/HEIC format
  38 +checked_find_package (LibRaw CONFIG
  39                        RECOMMEND_MIN 0.18
  40                        RECOMMEND_MIN_REASON "for ACES support and better camera metadata"
  41 -                      PRINT LibRaw_r_LIBRARIES )
  42 -checked_find_package (OpenJpeg VERSION_MIN 2.0)
  43 +                      PRINT LibRaw_LIBRARIES )
  44 +checked_find_package (OpenJPEG CONFIG)
  45  checked_find_package (OpenVDB
  46                        VERSION_MIN 5.0
  47                        DEPS         TBB
  48                        DEFINITIONS  -DUSE_OPENVDB=1)
  49 -checked_find_package (PTex)
  50 -checked_find_package (WebP)
  51 +checked_find_package (ptex CONFIG)
  52 +set(PTEX_FOUND ${ptex_FOUND})
  53 +set(PTEX_LIBRARIES Ptex::Ptex)
  54 +checked_find_package (WebP CONFIG)
  55 +if(WebP_FOUND)
  56 +    set(WEBP_FOUND TRUE)
  57 +    add_library(WebP::WebP ALIAS WebP::webp)
  58 +    add_library(WebP::WebPDemux ALIAS WebP::webpdemux)
  59 +endif()
  60
  61  option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)
  62  checked_find_package (R3DSDK)  # RED camera
  63 @@ -287,5 +293,7 @@ macro (find_or_download_fmt)
  64      checked_find_package (fmt REQUIRED)
  65  endmacro()
  66
  67 -find_or_download_fmt()
  68 +find_package(fmt CONFIG REQUIRED)
  69 +get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
  70 +checked_find_package (fmt CONFIG REQUIRED)
  71  include_directories (${FMT_INCLUDES})
  72 diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt
  73 index 6cf07636..8e77b1ed 100644
  74 --- a/src/ffmpeg.imageio/CMakeLists.txt
  75 +++ b/src/ffmpeg.imageio/CMakeLists.txt
  76 @@ -11,7 +11,7 @@ if (NOT MSVC)
  77                               PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")
  78  endif()
  79
  80 -if (FFmpeg_FOUND)
  81 +if (FFMPEG_FOUND)
  82      add_oiio_plugin (ffmpeginput.cpp
  83                       INCLUDE_DIRS ${FFMPEG_INCLUDES}
  84                       LINK_LIBRARIES ${FFMPEG_LIBRARIES}
  85 diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt
  86 index a9e54e3f..00fac073 100644
  87 --- a/src/field3d.imageio/CMakeLists.txt
  88 +++ b/src/field3d.imageio/CMakeLists.txt
  89 @@ -10,6 +10,6 @@ if (Field3D_FOUND)
  90      add_oiio_plugin (field3dinput.cpp field3doutput.cpp
  91                       INCLUDE_DIRS ${FIELD3D_INCLUDES}
  92                       LINK_LIBRARIES Field3D::Field3D
  93 -                                    # ${HDF5_LIBRARIES}
  94 +                                    ${HDF5_LIBRARIES}
  95                                      ${SZIP_LIBRARY})
  96  endif()
  97 diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt
  98 index fed80015..884d1312 100644
  99 --- a/src/heif.imageio/CMakeLists.txt
 100 +++ b/src/heif.imageio/CMakeLists.txt
 101 @@ -4,7 +4,7 @@
 102
 103  if (Libheif_FOUND)
 104      add_oiio_plugin (heifinput.cpp heifoutput.cpp
 105 -                     LINK_LIBRARIES Libheif::Libheif
 106 +                     LINK_LIBRARIES heif
 107                       DEFINITIONS "-DUSE_HEIF=1")
 108  else ()
 109      message (WARNING "heif plugin will not be built")
 110 diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt
 111 index 81a0ff54..23326a0a 100644
 112 --- a/src/raw.imageio/CMakeLists.txt
 113 +++ b/src/raw.imageio/CMakeLists.txt
 114 @@ -5,7 +5,7 @@
 115  if (LIBRAW_FOUND)
 116      add_oiio_plugin (rawinput.cpp
 117                       INCLUDE_DIRS ${LibRaw_INCLUDE_DIR}
 118 -                     LINK_LIBRARIES ${LibRaw_r_LIBRARIES}
 119 +                     LINK_LIBRARIES ${LibRaw_LIBRARIES}
 120                       DEFINITIONS "-DUSE_LIBRAW=1")
 121  else ()
 122      message (WARNING "Raw plugin will not be built")