diff --git a/ports/rocksdb/0003-use-find-package.patch b/ports/rocksdb/0003-use-find-package.patch index 3ee0da9d17..821a48b280 100644 --- a/ports/rocksdb/0003-use-find-package.patch +++ b/ports/rocksdb/0003-use-find-package.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 526dfcf60..241f706b7 100644 +index 7b4f47a..3d90152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -97,7 +97,7 @@ endif() +@@ -87,7 +87,7 @@ endif() include(CMakeDependentOption) @@ -10,8 +10,8 @@ index 526dfcf60..241f706b7 100644 +if(MSVC AND NOT VCPKG_TOOLCHAIN) option(WITH_GFLAGS "build with GFlags" OFF) option(WITH_XPRESS "build with windows built in compression" OFF) - include(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty.inc) -@@ -142,10 +142,7 @@ else() + option(ROCKSDB_SKIP_THIRDPARTY "skip thirdparty.inc" OFF) +@@ -136,10 +136,7 @@ else() endif() if(WITH_SNAPPY) @@ -23,7 +23,7 @@ index 526dfcf60..241f706b7 100644 add_definitions(-DSNAPPY) list(APPEND THIRDPARTY_LIBS Snappy::snappy) endif() -@@ -169,16 +166,19 @@ else() +@@ -163,16 +160,19 @@ else() endif() if(WITH_LZ4) @@ -47,7 +47,7 @@ index 526dfcf60..241f706b7 100644 endif() endif() -@@ -438,9 +438,9 @@ endif() +@@ -402,9 +402,9 @@ endif() option(WITH_TBB "build with Threading Building Blocks (TBB)" OFF) if(WITH_TBB) diff --git a/ports/rocksdb/0005-do-not-install-cmake-modules.patch b/ports/rocksdb/0005-do-not-install-cmake-modules.patch index 08bf304978..dc86cb419c 100644 --- a/ports/rocksdb/0005-do-not-install-cmake-modules.patch +++ b/ports/rocksdb/0005-do-not-install-cmake-modules.patch @@ -1,10 +1,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 241f706b7..5c0a417c6 100644 +index 3d90152..b0c5d31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1075,7 +1075,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) - - install(DIRECTORY include/rocksdb COMPONENT devel DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +@@ -1206,7 +1206,7 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + endforeach() + endforeach() - install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) + #install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index d87195643c..a265bc7c68 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO facebook/rocksdb - REF fcf3d75f3f022a6a55ff1222d6b06f8518d38c7c # v6.27.3 - SHA512 da78886dbd21339fbc9081e3f3de3aeac5b1124a0e4a879c936fae5248177bfc58ec5397d200e15ceeaf9cda2fb3850145e007a18ac0ba632dba084cc4064bfb + REF eb9a80fe1f18017b4d7f4084e8f2554f12234822 # v7.7.3 + SHA512 6606a18a75c0794bc962b10c22aab9ae44e426b127972f2cb4b4d52a34f52181a0c66007fc17a5d1ee4d43de4c490b3754d805c6f7d02c280196a60d7a14dd2f HEAD_REF master PATCHES 0002-only-build-one-flavor.patch diff --git a/ports/rocksdb/vcpkg.json b/ports/rocksdb/vcpkg.json index a69ead1df9..cad78aa6eb 100644 --- a/ports/rocksdb/vcpkg.json +++ b/ports/rocksdb/vcpkg.json @@ -1,8 +1,9 @@ { "name": "rocksdb", - "version": "6.27.3", + "version": "7.7.3", "description": "A library that provides an embeddable, persistent key-value store for fast storage", "homepage": "https://github.com/facebook/rocksdb", + "license": "GPL-2.0-only AND Apache-2.0", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/versions/baseline.json b/versions/baseline.json index 19459d81bc..db562df26a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6641,7 +6641,7 @@ "port-version": 1 }, "rocksdb": { - "baseline": "6.27.3", + "baseline": "7.7.3", "port-version": 0 }, "rpclib": { diff --git a/versions/r-/rocksdb.json b/versions/r-/rocksdb.json index ecd1ee147a..3cf9f2f5fe 100644 --- a/versions/r-/rocksdb.json +++ b/versions/r-/rocksdb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1b0ad6702e484372e6608e77d244a1f1d5cf9d1e", + "version": "7.7.3", + "port-version": 0 + }, { "git-tree": "609a9d8753d7bb5e410ac6adbe53f097abdd0a76", "version": "6.27.3",