[rkcommon] update to 1.14.2 (#41632)

microsoft · Oct 18, 2024 · faca711 · faca711
1 parent 317e219
commit faca711
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/ports/rkcommon/fix-static.patch b/ports/rkcommon/fix-static.patch
@@ -1,10 +1,10 @@
 diff --git a/rkcommon/CMakeLists.txt b/rkcommon/CMakeLists.txt
-index 3f80e4de3..72ac948b2 100644
+index 2bfb993..9d61267 100644
 --- a/rkcommon/CMakeLists.txt
 +++ b/rkcommon/CMakeLists.txt
-@@ -55,6 +55,10 @@ endif()
-
- target_compile_definitions(${PROJECT_NAME} PUBLIC ${EXTRA_COMPILE_DEFINITIONS})
+@@ -55,6 +55,10 @@ if (RKCOMMON_TASKING_INTERNAL)
+   target_compile_definitions(${PROJECT_NAME} PRIVATE -DENKITS_BUILD_DLL)
+ endif()
 
 +if(BUILD_SHARED_LIBS)
 +    target_compile_definitions(${PROJECT_NAME} PUBLIC rkcommon_SHARED)
@@ -14,7 +14,7 @@ index 3f80e4de3..72ac948b2 100644
    target_compile_definitions(${PROJECT_NAME} PUBLIC -DRKCOMMON_ADDRSAN)
  endif()
 diff --git a/rkcommon/common.h b/rkcommon/common.h
-index 175ecfa84..b43f34ab9 100644
+index a205770..07bf930 100644
 --- a/rkcommon/common.h
 +++ b/rkcommon/common.h
 @@ -26,7 +26,7 @@ typedef int ssize_t;

diff --git a/ports/rkcommon/portfile.cmake b/ports/rkcommon/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO  ospray/rkcommon
-    REF 0b8856cd9278474b56dc5bcff516a4b9482cf147
-    SHA512 836e888e33406f6825b8f5570894402460b3ae65a68ca8aeecf2c8e712f70e9392fdbb2131d538dbf47fc48a0664568e1fd60968452c7517cfeb17c0e608fecf
+    REF "v${VERSION}"
+    SHA512 48ced20506344250fd2b91875f8282c3b39828ac3eb0c8c0e2505dcc5cdb85a8f36dd328294f165aab66bdfe836b81b7a2c9f6f5c7ab49d281df5a3f95075548
     HEAD_REF master
     PATCHES fix-static.patch
 )

diff --git a/ports/rkcommon/vcpkg.json b/ports/rkcommon/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rkcommon",
-  "version": "1.10.0",
+  "version": "1.14.2",
   "description": "This project represents a common set of C++ infrastructure and CMake utilities used by various components of Intel® oneAPI Rendering Toolkit.",
   "homepage": "https://github.com/ospray/rkcommon/",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -7905,7 +7905,7 @@
       "port-version": 0
     },
     "rkcommon": {
-      "baseline": "1.10.0",
+      "baseline": "1.14.2",
       "port-version": 0
     },
     "rmlui": {

diff --git a/versions/r-/rkcommon.json b/versions/r-/rkcommon.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8cb7b4f4e7f1977f1596d7fd84fc52c3cf1349b7",
+      "version": "1.14.2",
+      "port-version": 0
+    },
     {
       "git-tree": "49683a2cd8b631ffd2d2f47bc8affc258a5f836e",
       "version": "1.10.0",