update boost to 1_84_0, disable patch that's no longer needed

3 files changed, 15 insertions, 67 deletions

diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk
index c17e863..e2ee239 100644
--- a/contrib/depends/packages/boost.mk
+++ b/contrib/depends/packages/boost.mk
@@ -1,19 +1,18 @@
-package=boost                                                                                                                                                                                                                      
-$(package)_version=1_64_0
-$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/1.64.0/
+package=boost
+$(package)_version=1_84_0
+$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/1.84.0/
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
-$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332
+$(package)_sha256_hash=cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454
 $(package)_dependencies=libiconv
-$(package)_patches=fix_aroptions.patch fix_arm_arch.patch
 
 define $(package)_set_vars
 $(package)_config_opts_release=variant=release
-$(package)_config_opts_debug=variant=debug
-$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam
+$(package)_config_opts_debug=variant=debug --build-dir=stage/debug
+$(package)_config_opts=--layout=system --user-config=user-config.jam
 $(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
-$(package)_config_opts_linux=threadapi=pthread runtime-link=shared
+$(package)_config_opts_linux=threadapi=pthread runtime-link=static
 $(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android
-$(package)_config_opts_darwin=--toolset=darwin runtime-link=shared
+$(package)_config_opts_darwin=--toolset=darwin runtime-link=static
 $(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
 $(package)_config_opts_x86_64_mingw32=address-model=64
 $(package)_config_opts_i686_mingw32=address-model=32
@@ -22,16 +21,14 @@ $(package)_toolset_$(host_os)=gcc
 $(package)_archiver_$(host_os)=$($(package)_ar)
 $(package)_toolset_darwin=darwin
 $(package)_archiver_darwin=$($(package)_libtool)
-$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,locale
+$(package)_config_libraries=system,filesystem,thread,timer,date_time,chrono,regex,serialization,atomic,program_options,locale,log
 $(package)_cxxflags=-std=c++11
 $(package)_cxxflags_linux=-fPIC
-$(package)_cxxflags_android=-fPIC
 $(package)_cxxflags_freebsd=-fPIC
+$(package)_cxxflags_android=-fPIC
 endef
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/fix_aroptions.patch &&\
-  patch -p1 < $($(package)_patch_dir)/fix_arm_arch.patch &&\
   echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\"  <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
 endef
 
@@ -40,9 +37,9 @@ define $(package)_config_cmds
 endef
 
 define $(package)_build_cmds
-  ./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage
+  ./b2 -d2 -j2 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) $($(package)_config_opts_release) stage
 endef
 
 define $(package)_stage_cmds
-  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install
+  ./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) $($(package)_config_opts_release) install
 endef
diff --git a/contrib/depends/packages/polyseed.mk b/contrib/depends/packages/polyseed.mk
index 383a0e6..881e356 100644
--- a/contrib/depends/packages/polyseed.mk
+++ b/contrib/depends/packages/polyseed.mk
@@ -4,15 +4,14 @@ $(package)_download_path=https://github.com/MrCyjaneK/$(package)/archive/refs/ta
 $(package)_download_file=v$($(package)_version).tar.gz
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=7f5c583a1f48ee6d63174dd1f1485d00b02d76d6df0181bc42c54558502c8443
-$(package)_patches=force-static-mingw.patch 0001-disable-soname.patch
+$(package)_patches=force-static-mingw.patch
 
 define $(package)_preprocess_cmds
-    patch -p1 < $($(package)_patch_dir)/force-static-mingw.patch &&\
-    patch -p1 < $($(package)_patch_dir)/0001-disable-soname.patch
+    patch -p1 < $($(package)_patch_dir)/force-static-mingw.patch
 endef
 
 define $(package)_config_cmds
-    CC="$($(package)_cc)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" .
+    CC="$($(package)_cc)" cmake -DCMAKE_INSTALL_PREFIX="$(host_prefix)" -DSTATIC=ON .
 endef
 
 define $(package)_set_vars
diff --git a/contrib/depends/patches/polyseed/0001-disable-soname.patch b/contrib/depends/patches/polyseed/0001-disable-soname.patch
deleted file mode 100644
index bd97dd3..0000000
--- a/contrib/depends/patches/polyseed/0001-disable-soname.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From aabafcfc0572651436d024a635483c49042fad7f Mon Sep 17 00:00:00 2001
-From: Czarek Nakamoto <cyjan@mrcyjanek.net>
-Date: Thu, 28 Mar 2024 00:32:51 +0100
-Subject: [PATCH] disable soname
-
----
- CMakeLists.txt | 16 +++++++++-------
- 1 file changed, 9 insertions(+), 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8a8e7c2..5301353 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,6 +36,7 @@ include_directories(polyseed
- target_compile_definitions(polyseed PRIVATE POLYSEED_SHARED)
- set_target_properties(polyseed PROPERTIES VERSION 2.0.0
-                                           SOVERSION 2
-+                                          NO_SONAME 1
-                                           C_STANDARD 11
-                                           C_STANDARD_REQUIRED ON)
-
-@@ -45,16 +46,17 @@ include_directories(polyseed_static
-   include/)
- target_compile_definitions(polyseed_static PRIVATE POLYSEED_STATIC)
- set_target_properties(polyseed_static PROPERTIES OUTPUT_NAME polyseed
-+                                                 NO_SONAME 1
-                                                  C_STANDARD 11
-                                                  C_STANDARD_REQUIRED ON)
-
--add_executable(polyseed-tests
--  tests/tests.c)
--include_directories(polyseed-tests
--  include/)
--target_compile_definitions(polyseed-tests PRIVATE POLYSEED_STATIC)
--target_link_libraries(polyseed-tests
--  PRIVATE polyseed_static)
-+# add_executable(polyseed-tests
-+#   tests/tests.c)
-+# include_directories(polyseed-tests
-+#   include/)
-+# target_compile_definitions(polyseed-tests PRIVATE POLYSEED_STATIC)
-+# target_link_libraries(polyseed-tests
-+#   PRIVATE polyseed_static)
-
- include(GNUInstallDirs)
- install(TARGETS polyseed polyseed_static
---
-2.39.2