update ceph source to reef 18.1.2

[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / assimp / irrlicht.patch

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/assimp/irrlicht.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/assimp/irrlicht.patch
new file mode 100644 (file)
index 0000000..3457056
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/assimp/irrlicht.patch
@@ -0,0 +1,61 @@
+diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt\r
+index f5553e5..5cffa0c 100644\r
+--- a/code/CMakeLists.txt\r
++++ b/code/CMakeLists.txt\r
+@@ -862,7 +862,7 @@ SET( Extra_SRCS\r
+ SOURCE_GROUP( Extra FILES ${Extra_SRCS})\r
+ \r
+ # irrXML\r
+-  find_package(irrXML CONFIG REQUIRED)\r
++  find_package(irrlicht CONFIG REQUIRED)\r
+ \r
+ # polyclipping\r
+   find_package(polyclipping CONFIG REQUIRED)\r
+@@ -1033,7 +1033,7 @@ TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC\r
+ \r
+   TARGET_LINK_LIBRARIES(assimp\r
+       polyclipping::polyclipping\r
+-      irrXML::irrXML\r
++      Irrlicht\r
+       minizip::minizip\r
+       ZLIB::ZLIB\r
+       kubazip::kubazip\r
+diff --git a/code/X3D/FIReader.cpp b/code/X3D/FIReader.cpp\r
+index 525a084..0cbca48 100644\r
+--- a/code/X3D/FIReader.cpp\r
++++ b/code/X3D/FIReader.cpp\r
+@@ -654,8 +654,8 @@ public:\r
+         return currentNodeType;\r
+     }\r
+ \r
+-    virtual int getAttributeCount() const /*override*/ {\r
+-        return static_cast<int>(attributes.size());\r
++    virtual unsigned int getAttributeCount() const /*override*/ {\r
++        return static_cast<unsigned int>(attributes.size());\r
+     }\r
+ \r
+     virtual const char* getAttributeName(int idx) const /*override*/ {\r
+@@ -1733,7 +1733,7 @@ public:\r
+         return reader->getNodeType();\r
+     }\r
+ \r
+-    virtual int getAttributeCount() const /*override*/ {\r
++    virtual unsigned int getAttributeCount() const /*override*/ {\r
+         return reader->getAttributeCount();\r
+     }\r
+ \r
+diff --git a/include/assimp/irrXMLWrapper.h b/include/assimp/irrXMLWrapper.h\r
+index 77cfd5e..ba584a0 100644\r
+--- a/include/assimp/irrXMLWrapper.h\r
++++ b/include/assimp/irrXMLWrapper.h\r
+@@ -133,8 +133,8 @@ public:\r
+ \r
+     // ----------------------------------------------------------------------------------\r
+     //! Returns size of file in bytes\r
+-    virtual int getSize()   {\r
+-        return (int)data.size();\r
++    virtual long getSize() const override {\r
++        return (long)data.size();\r
+     }\r
+ \r
+ private:\r