update ceph source to reef 18.1.2

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

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/openimageio/fix-dependency.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/openimageio/fix-dependency.patch
new file mode 100644 (file)
index 0000000..d594570
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/openimageio/fix-dependency.patch
@@ -0,0 +1,122 @@
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake\r
+index e7261af3..195f46cb 100644\r
+--- a/src/cmake/externalpackages.cmake\r
++++ b/src/cmake/externalpackages.cmake\r
+@@ -102,7 +102,6 @@ if (MSVC AND NOT LINKSTATIC)\r
+     add_definitions (-DOPENEXR_DLL) # Is this needed for new versions?\r
+ endif ()\r
+ \r
+-\r
+ # JPEG -- prefer Turbo-JPEG to regular libjpeg\r
+ checked_find_package (JPEGTurbo\r
+                       DEFINITIONS -DUSE_JPEG_TURBO=1\r
+@@ -145,7 +144,7 @@ checked_find_package (HDF5\r
+                    ISDEPOF      Field3D)\r
+ checked_find_package (OpenColorIO\r
+                    DEFINITIONS  -DUSE_OCIO=1 -DUSE_OPENCOLORIO=1)\r
+-checked_find_package (OpenCV\r
++checked_find_package (OpenCV CONFIG\r
+                    DEFINITIONS  -DUSE_OPENCV=1)\r
+ \r
+ # Intel TBB\r
+@@ -155,7 +154,7 @@ checked_find_package (TBB 2017\r
+                    ISDEPOF      OpenVDB)\r
+ \r
+ checked_find_package (DCMTK VERSION_MIN 3.6.1)  # For DICOM images\r
+-checked_find_package (FFmpeg VERSION_MIN 2.6)\r
++checked_find_package (FFMPEG)\r
+ checked_find_package (Field3D\r
+                    DEPS         HDF5\r
+                    DEFINITIONS  -DUSE_FIELD3D=1)\r
+@@ -163,18 +162,25 @@ checked_find_package (GIF\r
+                       VERSION_MIN 4\r
+                       RECOMMEND_MIN 5.0\r
+                       RECOMMEND_MIN_REASON "for stability and thread safety")\r
+-checked_find_package (Libheif VERSION_MIN 1.3)  # For HEIF/HEIC format\r
+-checked_find_package (LibRaw\r
++checked_find_package (libheif CONFIG)  # For HEIF/HEIC format\r
++checked_find_package (LibRaw CONFIG\r
+                       RECOMMEND_MIN 0.18\r
+                       RECOMMEND_MIN_REASON "for ACES support and better camera metadata"\r
+-                      PRINT LibRaw_r_LIBRARIES )\r
+-checked_find_package (OpenJpeg VERSION_MIN 2.0)\r
++                      PRINT LibRaw_LIBRARIES )\r
++checked_find_package (OpenJPEG CONFIG)\r
+ checked_find_package (OpenVDB\r
+                       VERSION_MIN 5.0\r
+                       DEPS         TBB\r
+                       DEFINITIONS  -DUSE_OPENVDB=1)\r
+-checked_find_package (PTex)\r
+-checked_find_package (WebP)\r
++checked_find_package (ptex CONFIG)\r
++set(PTEX_FOUND ${ptex_FOUND})\r
++set(PTEX_LIBRARIES Ptex::Ptex)\r
++checked_find_package (WebP CONFIG)\r
++if(WebP_FOUND)\r
++    set(WEBP_FOUND TRUE)\r
++    add_library(WebP::WebP ALIAS WebP::webp)\r
++    add_library(WebP::WebPDemux ALIAS WebP::webpdemux)\r
++endif()\r
+ \r
+ option (USE_R3DSDK "Enable R3DSDK (RED camera) support" OFF)\r
+ checked_find_package (R3DSDK)  # RED camera\r
+@@ -287,5 +293,7 @@ macro (find_or_download_fmt)\r
+     checked_find_package (fmt REQUIRED)\r
+ endmacro()\r
+ \r
+-find_or_download_fmt()\r
++find_package(fmt CONFIG REQUIRED)\r
++get_property(FMT_INCLUDES TARGET fmt::fmt PROPERTY INTERFACE_INCLUDE_DIRECTORIES)\r
++checked_find_package (fmt CONFIG REQUIRED)\r
+ include_directories (${FMT_INCLUDES})\r
+diff --git a/src/ffmpeg.imageio/CMakeLists.txt b/src/ffmpeg.imageio/CMakeLists.txt\r
+index 6cf07636..8e77b1ed 100644\r
+--- a/src/ffmpeg.imageio/CMakeLists.txt\r
++++ b/src/ffmpeg.imageio/CMakeLists.txt\r
+@@ -11,7 +11,7 @@ if (NOT MSVC)\r
+                              PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations")\r
+ endif()\r
+ \r
+-if (FFmpeg_FOUND)\r
++if (FFMPEG_FOUND)\r
+     add_oiio_plugin (ffmpeginput.cpp\r
+                      INCLUDE_DIRS ${FFMPEG_INCLUDES}\r
+                      LINK_LIBRARIES ${FFMPEG_LIBRARIES}\r
+diff --git a/src/field3d.imageio/CMakeLists.txt b/src/field3d.imageio/CMakeLists.txt\r
+index a9e54e3f..00fac073 100644\r
+--- a/src/field3d.imageio/CMakeLists.txt\r
++++ b/src/field3d.imageio/CMakeLists.txt\r
+@@ -10,6 +10,6 @@ if (Field3D_FOUND)\r
+     add_oiio_plugin (field3dinput.cpp field3doutput.cpp\r
+                      INCLUDE_DIRS ${FIELD3D_INCLUDES}\r
+                      LINK_LIBRARIES Field3D::Field3D\r
+-                                    # ${HDF5_LIBRARIES}\r
++                                    ${HDF5_LIBRARIES}\r
+                                     ${SZIP_LIBRARY})\r
+ endif()\r
+diff --git a/src/heif.imageio/CMakeLists.txt b/src/heif.imageio/CMakeLists.txt\r
+index fed80015..884d1312 100644\r
+--- a/src/heif.imageio/CMakeLists.txt\r
++++ b/src/heif.imageio/CMakeLists.txt\r
+@@ -4,7 +4,7 @@\r
+ \r
+ if (Libheif_FOUND)\r
+     add_oiio_plugin (heifinput.cpp heifoutput.cpp\r
+-                     LINK_LIBRARIES Libheif::Libheif\r
++                     LINK_LIBRARIES heif\r
+                      DEFINITIONS "-DUSE_HEIF=1")\r
+ else ()\r
+     message (WARNING "heif plugin will not be built")\r
+diff --git a/src/raw.imageio/CMakeLists.txt b/src/raw.imageio/CMakeLists.txt\r
+index 81a0ff54..23326a0a 100644\r
+--- a/src/raw.imageio/CMakeLists.txt\r
++++ b/src/raw.imageio/CMakeLists.txt\r
+@@ -5,7 +5,7 @@\r
+ if (LIBRAW_FOUND)\r
+     add_oiio_plugin (rawinput.cpp\r
+                      INCLUDE_DIRS ${LibRaw_INCLUDE_DIR}\r
+-                     LINK_LIBRARIES ${LibRaw_r_LIBRARIES}\r
++                     LINK_LIBRARIES ${LibRaw_LIBRARIES}\r
+                      DEFINITIONS "-DUSE_LIBRAW=1")\r
+ else ()\r
+     message (WARNING "Raw plugin will not be built")\r