[log4cplus/muparser/nmslib] Update to the latest version (#13585)

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

10 files changed, 36 insertions, 196 deletions

diff --git a/ports/log4cplus/CONTROL b/ports/log4cplus/CONTROL
index 99771644a..9a288a1b3 100644
--- a/ports/log4cplus/CONTROL
+++ b/ports/log4cplus/CONTROL
@@ -1,5 +1,5 @@
 Source: log4cplus
-Version: 2.0.4-1
+Version: 2.0.5
 Homepage: https://github.com/log4cplus/log4cplus
 Description: A simple to use C++ logging API providing thread--safe, flexible, and arbitrarily granular control over log management and configuration
 Build-Depends: catch
diff --git a/ports/log4cplus/fix-usage-error.patch b/ports/log4cplus/fix-usage-error.patch
deleted file mode 100644
index 4a2753ffc..000000000
--- a/ports/log4cplus/fix-usage-error.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --git a/qt4debugappender/CMakeLists.txt b/qt4debugappender/CMakeLists.txt
-index 2f28be5..0a98704 100644
---- a/qt4debugappender/CMakeLists.txt
-+++ b/qt4debugappender/CMakeLists.txt
-@@ -4,15 +4,17 @@ set (qt4debugappender_sources
- if (${BUILD_SHARED_LIBS})
-   add_definitions (-D${log4cplus}_EXPORTS)
- endif ()
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
- 
- find_package (Qt4 REQUIRED)
- include (${QT_USE_FILE})
- 
- set (qt4debugappender log4cplusqt4debugappender${log4cplus_postfix})
- add_library (${qt4debugappender} ${qt4debugappender_sources})
-+if (UNICODE)
-+  target_compile_definitions (${qt4debugappender} PUBLIC UNICODE)
-+  target_compile_definitions (${qt4debugappender} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
- target_link_libraries (${qt4debugappender}
-   ${log4cplus}
-   ${QT_LIBRARIES}
-diff --git a/qt5debugappender/CMakeLists.txt b/qt5debugappender/CMakeLists.txt
-index 9570e76..de6fecf 100644
---- a/qt5debugappender/CMakeLists.txt
-+++ b/qt5debugappender/CMakeLists.txt
-@@ -4,15 +4,17 @@ set (qt5debugappender_sources
- if (${BUILD_SHARED_LIBS})
-   add_definitions (-D${log4cplus}_EXPORTS)
- endif ()
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
- 
- find_package (Qt5Core REQUIRED)
- #include (${QT_USE_FILE})
- 
- set (qt5debugappender log4cplusqt5debugappender${log4cplus_postfix})
- add_library (${qt5debugappender} ${qt5debugappender_sources})
-+if (UNICODE)
-+  target_compile_definitions (${qt5debugappender} PUBLIC UNICODE)
-+  target_compile_definitions (${qt5debugappender} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
- target_link_libraries (${qt5debugappender}
-   ${log4cplus}
-   ${Qt5Widgets_LIBRARIES}
-diff --git a/simpleserver/CMakeLists.txt b/simpleserver/CMakeLists.txt
-index e535120..5202f42 100644
---- a/simpleserver/CMakeLists.txt
-+++ b/simpleserver/CMakeLists.txt
-@@ -1,14 +1,15 @@
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
--
- message (STATUS "Threads: ${CMAKE_THREAD_LIBS_INIT}")
--
- set (loggingserver_sources loggingserver.cxx)
- 
- message (STATUS "Sources: ${loggingserver_sources}")
- 
--add_executable (loggingserver ${loggingserver_sources})
--target_link_libraries (loggingserver ${log4cplus})
-+set (loggingserver loggingserver${log4cplus_postfix})
-+add_executable (${loggingserver} ${loggingserver_sources})
-+if (UNICODE)
-+  target_compile_definitions (${loggingserver} PUBLIC UNICODE)
-+  target_compile_definitions (${loggingserver} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
-+target_link_libraries (${loggingserver} ${log4cplus})
- 
--install(TARGETS loggingserver DESTINATION ${CMAKE_INSTALL_BINDIR})
-+install(TARGETS ${loggingserver} DESTINATION ${CMAKE_INSTALL_BINDIR})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b7b7ad8..91e0c63 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -67,9 +67,6 @@ endif ()
- 
- # Define _GNU_SOURCE so that functions like `pipe2()` are visible.
- add_definitions (-D_GNU_SOURCE=1)
--if (UNICODE)
--  add_definitions (-DUNICODE -D_UNICODE -UMBCS -U_MBCS)
--endif (UNICODE)
- if (WIN32)
-   add_definitions (-DMINGW_HAS_SECURE_API=1)
-   add_definitions (-D_WIN32_WINNT=${_WIN32_WINNT})
-@@ -85,6 +82,12 @@ endif (WIN32)
- 
- add_library (${log4cplus} ${log4cplus_sources})
- 
-+if (UNICODE)
-+  target_compile_definitions (${log4cplus} PUBLIC UNICODE)
-+  target_compile_definitions (${log4cplus} PUBLIC _UNICODE)
-+  add_definitions (-UMBCS -U_MBCS)
-+endif (UNICODE)
-+
- set (log4cplus_LIBS ${CMAKE_THREAD_LIBS_INIT})
- if (LIBRT)
-   list (APPEND log4cplus_LIBS ${LIBRT})
diff --git a/ports/log4cplus/portfile.cmake b/ports/log4cplus/portfile.cmake
index 28056958d..a8862e725 100644
--- a/ports/log4cplus/portfile.cmake
+++ b/ports/log4cplus/portfile.cmake
@@ -1,12 +1,9 @@
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO log4cplus/log4cplus
-    REF REL_2_0_4
-    SHA512 194e37b8de7be377dabe911d1cec831de41f5ce14dd617b5333739a7ab8dbc3061aa24351abe811588db507aa1563a637023b26684fb21bbfc88d24b4e4ce062
+    REF 9d00f7d10f2507f68f9ab5fea8b842735d9c6cfe # REL_2_0_5
+    SHA512 b64a1d3a60584b2ba3a58470a0b0ec4c22eb0c054c0ef8ef3808fcba5604860fbd5b2d96148939ea15d3bf2ff1e40e684710dc81b57b73232851a486251f648d
     HEAD_REF master
-    PATCHES fix-usage-error.patch
 )
 
 vcpkg_from_github(
@@ -29,7 +26,10 @@ file(
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DLOG4CPLUS_BUILD_TESTING=OFF -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF -DWITH_UNIT_TESTS=OFF
+    OPTIONS 
+        -DLOG4CPLUS_BUILD_TESTING=OFF 
+        -DLOG4CPLUS_BUILD_LOGGINGSERVER=OFF 
+        -DWITH_UNIT_TESTS=OFF
 )
 
 vcpkg_install_cmake()
@@ -42,5 +42,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/log4cplus)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/log4cplus/LICENSE ${CURRENT_PACKAGES_DIR}/share/log4cplus/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/muparser/CONTROL b/ports/muparser/CONTROL
index 734214a49..b41faa900 100644
--- a/ports/muparser/CONTROL
+++ b/ports/muparser/CONTROL
@@ -1,4 +1,5 @@
 Source: muparser
-Version: 2.2.6.1
+Version: 2.3.2
 Homepage: https://github.com/beltoforion/muparser
-Description:  Fast math parser library 
+Description:  Fast math parser library
+Supports: !uwp
diff --git a/ports/muparser/portfile.cmake b/ports/muparser/portfile.cmake
index aa3839598..db4bc987e 100644
--- a/ports/muparser/portfile.cmake
+++ b/ports/muparser/portfile.cmake
@@ -1,25 +1,26 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "uwp")
 
 vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO beltoforion/muparser
-  REF v2.2.6.1
-  SHA512 01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
-  HEAD_REF master
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO beltoforion/muparser
+    REF 207d5b77c05c9111ff51ab91082701221220c477 # v2.3.2
+    SHA512 75cebef831eeb08c92c08d2b29932a4af550edbda56c2adb6bc86b1228775294013a07d51974157b39460e60dab937b0b641553cd7ddeef72ba0b23f65c52bf4
+    HEAD_REF master
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS -DENABLE_SAMPLES=OFF
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
+    OPTIONS 
+        -DENABLE_SAMPLES=OFF
+        -DENABLE_OPENMP=OFF
+    OPTIONS_DEBUG 
+        -DDISABLE_INSTALL_HEADERS=ON
 )
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/muparser RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file
diff --git a/ports/nmslib/CONTROL b/ports/nmslib/CONTROL
index 288fc7377..4faefb975 100644
--- a/ports/nmslib/CONTROL
+++ b/ports/nmslib/CONTROL
@@ -1,9 +1,5 @@
 Source: nmslib

-Version: 1.8.2

+Version: 2.0.6

 Homepage: https://github.com/searchivarius/nmslib

 Description: Non-Metric Space Library (NMSLIB) is an efficient similarity search library and a toolkit for evaluation of k-NN methods for generic non-metric spaces.

-#

-# ## Extras are currently unsupported for Windows, waiting for fixes.

-# Feature: extra

-# Description: Build extra algorithms and tools for nmslib. Note that this feature requires a large bunch of dependencies.

-# Build-Depends: gsl, eigen3, boost-system, boost-filesystem, boost-timer, boost-foreach, boost-format, boost-math, boost-random, boost-dynamic-bitset, boost-program-options

+Supports: !(arm|uwp)
\ No newline at end of file
diff --git a/ports/nmslib/fix-cmake-order.patch b/ports/nmslib/fix-cmake-order.patch
deleted file mode 100644
index 8b465ae47..000000000
--- a/ports/nmslib/fix-cmake-order.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/similarity_search/CMakeLists.txt b/similarity_search/CMakeLists.txt
-index 1451b30..a9f1616 100644
---- a/similarity_search/CMakeLists.txt
-+++ b/similarity_search/CMakeLists.txt
-@@ -109,9 +109,6 @@ if (WITH_EXTRAS)
-       message (FATAL_ERROR "Could not locate GSL.")
-   endif (GSL_FOUND)
- 
--  include_directories (${PROJECT_SOURCE_DIR}/lshkit/include)
--  add_subdirectory (lshkit)
--
-   find_package(Eigen3 3 REQUIRED)
-   if (EIGEN3_FOUND)
-     message (STATUS "Found Eigen3.")
-@@ -139,6 +136,8 @@ if (WITH_EXTRAS)
-   else ()
-     message (FATAL_ERROR "Could not locate BOOST.")
-   endif ()
-+
-+  add_subdirectory (lshkit)
- endif()
- 
- add_subdirectory (src)
diff --git a/ports/nmslib/fix-headers.patch b/ports/nmslib/fix-headers.patch
index ee6db36df..f06fd06a8 100644
--- a/ports/nmslib/fix-headers.patch
+++ b/ports/nmslib/fix-headers.patch
@@ -1,5 +1,5 @@
 diff --git a/similarity_search/src/method/hnsw.cc b/similarity_search/src/method/hnsw.cc
-index f5c7fca..4780746 100644
+index 2741701..7587f7f 100644
 --- a/similarity_search/src/method/hnsw.cc
 +++ b/similarity_search/src/method/hnsw.cc
 @@ -27,7 +27,7 @@
@@ -12,7 +12,7 @@ index f5c7fca..4780746 100644
  #include "portable_simd.h"
  #include "knnquery.h"
 diff --git a/similarity_search/src/method/hnsw_distfunc_opt.cc b/similarity_search/src/method/hnsw_distfunc_opt.cc
-index 168ee81..408d95d 100644
+index 4c691bd..6f1a9e6 100644
 --- a/similarity_search/src/method/hnsw_distfunc_opt.cc
 +++ b/similarity_search/src/method/hnsw_distfunc_opt.cc
 @@ -30,7 +30,7 @@
@@ -25,7 +25,7 @@ index 168ee81..408d95d 100644
  
  #include "sort_arr_bi.h"
 diff --git a/similarity_search/src/method/pivot_neighb_invindx.cc b/similarity_search/src/method/pivot_neighb_invindx.cc
-index b6473bd..6dcb00f 100644
+index c6113c7..a7d818b 100644
 --- a/similarity_search/src/method/pivot_neighb_invindx.cc
 +++ b/similarity_search/src/method/pivot_neighb_invindx.cc
 @@ -21,7 +21,7 @@
@@ -38,12 +38,12 @@ index b6473bd..6dcb00f 100644
  #include "portable_simd.h"
  #include "space.h"
 diff --git a/similarity_search/src/method/small_world_rand.cc b/similarity_search/src/method/small_world_rand.cc
-index e8280cb..6bdb0f7 100644
+index e67ea97..92fe70a 100644
 --- a/similarity_search/src/method/small_world_rand.cc
 +++ b/similarity_search/src/method/small_world_rand.cc
-@@ -16,7 +16,7 @@
- #include <memory>
+@@ -17,7 +17,7 @@
  #include <iostream>
+ #include <cstddef>
  // This is only for _mm_prefetch
 -#include <mmintrin.h>
 +#include <xmmintrin.h>
@@ -51,7 +51,7 @@ index e8280cb..6bdb0f7 100644
  #if defined(_WIN32) || defined(WIN32)
  #include <intrin.h>
 diff --git a/similarity_search/src/method/vptree.cc b/similarity_search/src/method/vptree.cc
-index 04f481e..c71eed5 100644
+index 4da3b5f..d77e419 100644
 --- a/similarity_search/src/method/vptree.cc
 +++ b/similarity_search/src/method/vptree.cc
 @@ -20,7 +20,7 @@
@@ -75,18 +75,3 @@ index 326b26b..413d66d 100644
  
  #include <logging.h>
  #include <idtype.h>
-diff --git a/similarity_search/test/test_pow.cc b/similarity_search/test/test_pow.cc
-index 1b46a68..faaa84e 100644
---- a/similarity_search/test/test_pow.cc
-+++ b/similarity_search/test/test_pow.cc
-@@ -29,8 +29,8 @@ using namespace std;
- 
- const float MAX_REL_DIFF = 1e-6f;
- 
--vector<float>   addExps = { 0, 0.125, 0.25, 0.5 };
--vector<float>   vals    = { 0.1, 0.5, 1, 1.5, 2, 4};
-+vector<float>   addExps = { 0, 0.125f, 0.25f, 0.5f };
-+vector<float>   vals    = { 0.1f, 0.5f, 1, 1.5f, 2, 4};
- vector<float>   signs   = { 1, -1};
- 
- template <typename T> bool runTest() {
diff --git a/ports/nmslib/portfile.cmake b/ports/nmslib/portfile.cmake
index d250c0977..fc5b3d145 100644
--- a/ports/nmslib/portfile.cmake
+++ b/ports/nmslib/portfile.cmake
@@ -1,29 +1,21 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp")
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO nmslib/nmslib
-    REF c9fc0b862f09260b558cf81e94e0d58aca15d9e9
-    SHA512 ac9c79e3ac991dd58f239f7e0b2bd6c3185907aa283bc42098aadddac87b361867f002664cc14853822f92a491d95269578bea01aa00477e39a40424320000a1
+    REF 5482e077d1c8637499f86231bcd3979cb7fa6aef # v2.0.6
+    SHA512 e529c8d1d97e972f8314be9837e10f4ebab57d4a5f19a66341bb8e163dfe53d1d640a3909a708b021a52d0e6c2537954d749cb80e71757469700a3e9e173ceca
     HEAD_REF master
     PATCHES
         fix-headers.patch
-        fix-cmake-order.patch
 )
 
-set(WITH_EXTRAS OFF)
-if("extra" IN_LIST FEATURES)
-    set(WITH_EXTRAS ON)
-endif()
-
 # TODO: check SSE and AVX avability and set corresponding tags
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/similarity_search
     PREFER_NINJA
-    OPTIONS
-        -DWITH_EXTRAS=${WITH_EXTRAS}
 )
 
 vcpkg_install_cmake()
@@ -50,5 +42,4 @@ endforeach()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 # Put the license file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/nmslib/)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/nmslib/README.md ${CURRENT_PACKAGES_DIR}/share/nmslib/copyright)
+file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 891f2d97b..dbaef250c 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1073,8 +1073,6 @@ msmpi:x64-uwp=fail
 munit:arm-uwp=fail
 munit:arm64-windows=fail
 munit:x64-uwp=fail
-muparser:arm-uwp=fail
-muparser:x64-uwp=fail
 murmurhash:arm-uwp=fail
 murmurhash:x64-uwp=fail
 murmurhash:arm64-windows=fail
@@ -1111,9 +1109,6 @@ networkdirect-sdk:x64-osx=fail
 networkdirect-sdk:x64-uwp=fail
 networkdirect-sdk:x86-windows=fail
 ngspice:x64-windows-static=fail
-nmslib:arm64-windows=fail
-nmslib:arm-uwp=fail
-nmslib:x64-uwp=fail
 nng:arm-uwp=fail
 nng:x64-uwp=fail
 nrf-ble-driver:arm-uwp=fail