Please find below a git diff to update boost from 1.66.0 to 1.67.0 (Not to the latest). The diff also includes patches to unbreak all consumers. The most annoying and biggest part contains the renamed boost_python,boost_python3 to boost_numpy27,boost_python38. Since this is off the table, the next update should be easier.
However, this update was created at the request of aja to update and unbreak productivity/gnucash. aja put it through a full amd64 bulk. Thanks! It would be great if this is tested under !amd64. I'm not in a position to commit this after Sunday. aja or anybody else, please feel free to take it. Thanks. Here is the changlog from upstream: https://www.boost.org/users/history/version_1_67_0.html For web interface lovers see: https://github.com/openbsd/ports/compare/master...sizeofvoid:boost Rafael Sadowski diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile index 502bec831e5..fea99e81d6d 100644 --- a/audio/py-tagpy/Makefile +++ b/audio/py-tagpy/Makefile @@ -5,7 +5,7 @@ COMMENT= Python bindings to TagLib audio file tag library MODPY_EGG_VERSION = 2013.1 DISTNAME = tagpy-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 11 +REVISION = 12 CATEGORIES = audio devel @@ -14,7 +14,8 @@ HOMEPAGE = http://mathema.tician.de/software/tagpy # MIT PERMIT_PACKAGE = Yes -WANTLIB += boost_python${MODPY_MAJOR_VERSION:M3}-mt m pthread ${COMPILER_LIBCXX} tag ${MODPY_WANTLIB} +WANTLIB += ${COMPILER_LIBCXX} boost_python${MODPY_VERSION:C/\.//g}-mt m +WANTLIB += ${MODPY_WANTLIB} tag COMPILER = base-clang ports-gcc base-gcc @@ -28,19 +29,14 @@ FLAVOR?= LIB_DEPENDS = lang/python/${MODPY_VERSION} \ audio/taglib \ - devel/boost>=1.53.0p5 + devel/boost>=1.67.0 CONFIGURE_ARGS += --boost-compiler=gcc42 \ --boost-lib-dir=${LOCALBASE}/lib \ --boost-inc-dir=${LOCALBASE}/include \ --taglib-lib-dir=${LOCALBASE}/lib \ --taglib-inc-dir=${LOCALBASE}/include/taglib \ - -.if ${FLAVOR:Mpython3} -CONFIGURE_ARGS += --boost-python-libname=boost_python${MODPY_MAJOR_VERSION}-mt -.else -CONFIGURE_ARGS += --boost-python-libname=boost_python-mt -.endif + --boost-python-libname=boost_python${MODPY_VERSION:C/\.//g}-mt do-configure: cd ${WRKSRC} && env ${CONFIGURE_ENV} ${MODPY_BIN} ./configure.py ${CONFIGURE_ARGS} diff --git a/converters/libpst/Makefile b/converters/libpst/Makefile index b929fc31b7a..de0343cad7d 100644 --- a/converters/libpst/Makefile +++ b/converters/libpst/Makefile @@ -7,7 +7,7 @@ COMMENT-python= python interface to libpst DISTNAME= libpst-0.6.75 -REVISION-python= 0 +REVISION-python= 1 SHARED_LIBS += pst 3.0 # 5.17 @@ -31,7 +31,7 @@ WANTLIB-main += glib-2.0 gobject-2.0 gsf-1 jpeg pcre png zstd WANTLIB-main += tiff webp xml2 z m pthread ${COMPILER_LIBCXX} lzma WANTLIB-python += ${WANTLIB} iconv -WANTLIB-python += pst boost_python3-mt +WANTLIB-python += pst boost_python${MODPY_VERSION:C/\.//g}-mt COMPILER = base-clang ports-gcc base-gcc @@ -49,7 +49,7 @@ LIB_DEPENDS-main= devel/libgsf \ graphics/gd LIB_DEPENDS-python= ${BASE_PKGPATH} \ - devel/boost + devel/boost>=1.67.0 USE_GMAKE= Yes diff --git a/devel/boost/Makefile b/devel/boost/Makefile index 44c62b409f8..3e404fac9bc 100644 --- a/devel/boost/Makefile +++ b/devel/boost/Makefile @@ -7,18 +7,16 @@ COMMENT-md= machine-dependent libraries for boost # XXX if updating, try to remove -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR # XXX in archivers/innoextract -VERSION= 1.66.0 +VERSION= 1.67.0 DISTNAME= boost_${VERSION:S/./_/g} PKGNAME-main= boost-${VERSION} PKGNAME-md= boost-md-${VERSION} -REVISION-main= 11 -REVISION-md= 5 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=boost/} EXTRACT_SUFX= .tar.bz2 FIX_EXTRACT_PERMISSIONS = Yes -SO_VERSION= 10.0 +SO_VERSION= 11.0 BOOST_LIBS= boost_atomic-mt \ boost_chrono-mt boost_chrono \ boost_container-mt boost_container \ @@ -37,10 +35,10 @@ BOOST_LIBS= boost_atomic-mt \ boost_math_tr1l-mt boost_math_tr1l \ boost_prg_exec_monitor-mt boost_prg_exec_monitor \ boost_program_options-mt boost_program_options \ - boost_python-mt boost_python \ - boost_python3-mt boost_python3 \ - boost_numpy boost_numpy-mt \ - boost_numpy3 boost_numpy3-mt \ + boost_numpy27-mt boost_numpy27 \ + boost_numpy38-mt boost_numpy38 \ + boost_python27-mt boost_python27 \ + boost_python38-mt boost_python38 \ boost_random-mt boost_random \ boost_regex-mt boost_regex \ boost_serialization-mt boost_serialization \ @@ -51,7 +49,8 @@ BOOST_LIBS= boost_atomic-mt \ boost_unit_test_framework-mt boost_unit_test_framework \ boost_wserialization-mt boost_wserialization \ boost_wave-mt \ - boost_type_erasure-mt boost_type_erasure + boost_type_erasure-mt boost_type_erasure \ + boost_contract boost_contract-mt # MD BOOST_LIBS+= boost_context-mt \ @@ -94,6 +93,8 @@ LIB_DEPENDS= archivers/bzip2 \ textproc/icu4c LIB_DEPENDS-md= devel/boost + +WANTLIB-md+= ${COMPILER_LIBCXX} m WANTLIB-md+= boost_chrono-mt boost_filesystem-mt boost_system-mt WANTLIB-md+= boost_system boost_thread-mt @@ -139,11 +140,7 @@ PY3_BOOTSTRAP= --with-python=${LOCALBASE}/bin/python${MODPY_DEFAULT_VERSION_3} \ --with-python-version=${MODPY_DEFAULT_VERSION_3} \ PY2_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_2} - -# XXX defensive; py3.7 has an 'm' suffix but this is removed in 3.8 -PY3_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3:S/3.7/3.7m/} -# can revert to this after default is switched: -#PY3_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3} +PY3_INC= ${LOCALBASE}/include/python${MODPY_DEFAULT_VERSION_3} # temporary dir to stash libs when rebuilding with py2 PY3_DIR= ${WRKDIR}/lib.py3 diff --git a/devel/boost/distinfo b/devel/boost/distinfo index 68e3f56aabc..4e4bfd99efb 100644 --- a/devel/boost/distinfo +++ b/devel/boost/distinfo @@ -1,2 +1,2 @@ -SHA256 (boost_1_66_0.tar.bz2) = VyGBglPmoJiVgxkvlngsSpjrYgSWUxbfn1rXWBkiXKk= -SIZE (boost_1_66_0.tar.bz2) = 85995778 +SHA256 (boost_1_67_0.tar.bz2) = JoTJcplO5X/FYy4DvwRHRvbrRdSSDDQ5N6Rl/Welrbo= +SIZE (boost_1_67_0.tar.bz2) = 87336566 diff --git a/devel/boost/patches/patch-Jamroot b/devel/boost/patches/patch-Jamroot index 948ac6a828a..8bca5b636ed 100644 --- a/devel/boost/patches/patch-Jamroot +++ b/devel/boost/patches/patch-Jamroot @@ -2,9 +2,9 @@ $OpenBSD: patch-Jamroot,v 1.6 2018/01/31 21:54:49 rsadowski Exp $ Index: Jamroot --- Jamroot.orig +++ Jamroot -@@ -134,8 +134,9 @@ import threadapi-feature ; +@@ -139,8 +139,9 @@ import option ; path-constant BOOST_ROOT : . ; - constant BOOST_VERSION : 1.66.0 ; + constant BOOST_VERSION : 1.67.0 ; constant BOOST_JAMROOT_MODULE : $(__name__) ; +constant SO_VERSION : ${SO_VERSION} ; diff --git a/devel/boost/patches/patch-boost_asio_detail_config_hpp b/devel/boost/patches/patch-boost_asio_detail_config_hpp index cd0455b7591..ef570f26863 100644 --- a/devel/boost/patches/patch-boost_asio_detail_config_hpp +++ b/devel/boost/patches/patch-boost_asio_detail_config_hpp @@ -9,14 +9,14 @@ libestdc++ provides <string_view> starting with gcc-7.1.0: Index: boost/asio/detail/config.hpp --- boost/asio/detail/config.hpp.orig +++ boost/asio/detail/config.hpp -@@ -773,7 +773,9 @@ - # if !defined(BOOST_ASIO_DISABLE_STD_STRING_VIEW) +@@ -803,7 +803,9 @@ + # if !defined(BOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW) # if defined(__clang__) # if (__cplusplus >= 201402) -# if __has_include(<experimental/string_view>) +# if __has_include(<string_view>) +# define BOOST_ASIO_HAS_STD_STRING_VIEW 1 +# elif __has_include(<experimental/string_view>) - # define BOOST_ASIO_HAS_STD_STRING_VIEW 1 # define BOOST_ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 # endif // __has_include(<experimental/string_view>) + # endif // (__cplusplus >= 201402) diff --git a/devel/boost/patches/patch-boost_config_compiler_clang_hpp b/devel/boost/patches/patch-boost_config_compiler_clang_hpp index 6ab9f4ab1a2..14226a1cae9 100644 --- a/devel/boost/patches/patch-boost_config_compiler_clang_hpp +++ b/devel/boost/patches/patch-boost_config_compiler_clang_hpp @@ -34,7 +34,7 @@ Index: boost/config/compiler/clang.hpp # define BOOST_HAS_INT128 #endif -@@ -316,7 +316,9 @@ +@@ -320,7 +320,9 @@ #endif // Clang has supported the 'unused' attribute since the first release. diff --git a/devel/boost/patches/patch-boost_functional_hash_detail_limits_hpp b/devel/boost/patches/patch-boost_functional_hash_detail_limits_hpp deleted file mode 100644 index 9d957f3b7b3..00000000000 --- a/devel/boost/patches/patch-boost_functional_hash_detail_limits_hpp +++ /dev/null @@ -1,38 +0,0 @@ -$OpenBSD: patch-boost_functional_hash_detail_limits_hpp,v 1.2 2015/07/01 08:41:59 jasper Exp $ ---- boost/functional/hash/detail/limits.hpp.orig Sat Jan 24 15:37:21 2015 -+++ boost/functional/hash/detail/limits.hpp Fri Jun 26 11:43:46 2015 -@@ -16,11 +16,7 @@ - - #include <boost/limits.hpp> - --// On OpenBSD, numeric_limits is not reliable for long doubles, but --// the macros defined in <float.h> are and support long double when STLport --// doesn't. -- --#if defined(__OpenBSD__) || defined(_STLP_NO_LONG_DOUBLE) -+#if defined(_STLP_NO_LONG_DOUBLE) - #include <float.h> - #endif - -@@ -31,7 +27,7 @@ namespace boost - template <class T> - struct limits : std::numeric_limits<T> {}; - --#if defined(__OpenBSD__) || defined(_STLP_NO_LONG_DOUBLE) -+#if defined(_STLP_NO_LONG_DOUBLE) - template <> - struct limits<long double> - : std::numeric_limits<long double> -@@ -51,11 +47,9 @@ namespace boost - BOOST_STATIC_CONSTANT(int, digits = LDBL_MANT_DIG); - BOOST_STATIC_CONSTANT(int, max_exponent = LDBL_MAX_EXP); - BOOST_STATIC_CONSTANT(int, min_exponent = LDBL_MIN_EXP); --#if defined(_STLP_NO_LONG_DOUBLE) - BOOST_STATIC_CONSTANT(int, radix = FLT_RADIX); --#endif - }; --#endif // __OpenBSD__ -+#endif - } - } - diff --git a/devel/boost/patches/patch-boost_test_impl_execution_monitor_ipp b/devel/boost/patches/patch-boost_test_impl_execution_monitor_ipp index b940285c341..a5a39a4d60b 100644 --- a/devel/boost/patches/patch-boost_test_impl_execution_monitor_ipp +++ b/devel/boost/patches/patch-boost_test_impl_execution_monitor_ipp @@ -2,7 +2,7 @@ $OpenBSD: patch-boost_test_impl_execution_monitor_ipp,v 1.3 2017/12/26 19:18:49 Index: boost/test/impl/execution_monitor.ipp --- boost/test/impl/execution_monitor.ipp.orig +++ boost/test/impl/execution_monitor.ipp -@@ -376,14 +376,18 @@ system_signal_exception::report() const +@@ -386,14 +386,18 @@ system_signal_exception::report() const report_error( execution_exception::system_error, "signal: the expiration of a timer set by timer_settimer()" ); break; diff --git a/devel/boost/patches/patch-boost_type_traits_is_convertible_hpp b/devel/boost/patches/patch-boost_type_traits_is_convertible_hpp index 44061ff2e41..341896b51a1 100644 --- a/devel/boost/patches/patch-boost_type_traits_is_convertible_hpp +++ b/devel/boost/patches/patch-boost_type_traits_is_convertible_hpp @@ -6,7 +6,7 @@ which doesn't work for the decltype(x,y) case. Index: boost/type_traits/is_convertible.hpp --- boost/type_traits/is_convertible.hpp.orig +++ boost/type_traits/is_convertible.hpp -@@ -83,7 +83,7 @@ namespace detail { +@@ -87,7 +87,7 @@ namespace detail { static void test_aux(To1); template<typename From1, typename To1> diff --git a/devel/boost/patches/patch-libs_context_build_Jamfile_v2 b/devel/boost/patches/patch-libs_context_build_Jamfile_v2 index dc028df730a..f3a8106ad9f 100644 --- a/devel/boost/patches/patch-libs_context_build_Jamfile_v2 +++ b/devel/boost/patches/patch-libs_context_build_Jamfile_v2 @@ -6,7 +6,7 @@ The second "clang" should be "gcc". Index: libs/context/build/Jamfile.v2 --- libs/context/build/Jamfile.v2.orig +++ libs/context/build/Jamfile.v2 -@@ -326,7 +326,7 @@ alias asm_sources +@@ -318,7 +318,7 @@ alias asm_sources <address-model>32 <architecture>power <binary-format>elf diff --git a/devel/boost/patches/patch-libs_python_src_converter_builtin_converters_cpp b/devel/boost/patches/patch-libs_python_src_converter_builtin_converters_cpp deleted file mode 100644 index ade43d4d410..00000000000 --- a/devel/boost/patches/patch-libs_python_src_converter_builtin_converters_cpp +++ /dev/null @@ -1,31 +0,0 @@ -$OpenBSD: patch-libs_python_src_converter_builtin_converters_cpp,v 1.1 2020/01/30 01:42:34 kmos Exp $ - -From 660487c43fde76f3e64f1cb2e644500da92fe582 Mon Sep 17 00:00:00 2001 -From: Bernhard Rosenkraenzer <[email protected]> -Date: Fri, 9 Feb 2018 18:20:30 +0100 -Subject: [PATCH] Fix build with Python 3.7 - -Python 3.7 changes the return type of _PyUnicode_AsString() -from void* to const char* -- causing the build of boost-python -to fail. - -Index: libs/python/src/converter/builtin_converters.cpp ---- libs/python/src/converter/builtin_converters.cpp.orig -+++ libs/python/src/converter/builtin_converters.cpp -@@ -45,10 +45,15 @@ namespace - { - return PyString_Check(obj) ? PyString_AsString(obj) : 0; - } --#else -+#elif PY_VERSION_HEX < 0x03070000 - void* convert_to_cstring(PyObject* obj) - { - return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0; -+ } -+#else -+ void* convert_to_cstring(PyObject* obj) -+ { -+ return PyUnicode_Check(obj) ? const_cast<void*>(reinterpret_cast<const void*>(_PyUnicode_AsString(obj))) : 0; - } - #endif - diff --git a/devel/boost/patches/patch-tools_build_src_engine_execunix_c b/devel/boost/patches/patch-tools_build_src_engine_execunix_c index 3bb26f15eb2..9e5871c7a8b 100644 --- a/devel/boost/patches/patch-tools_build_src_engine_execunix_c +++ b/devel/boost/patches/patch-tools_build_src_engine_execunix_c @@ -3,7 +3,7 @@ $OpenBSD: patch-tools_build_src_engine_execunix_c,v 1.1 2018/12/13 19:52:46 sthe Index: tools/build/src/engine/execunix.c --- tools/build/src/engine/execunix.c.orig +++ tools/build/src/engine/execunix.c -@@ -488,6 +488,7 @@ void exec_wait() +@@ -503,6 +503,7 @@ void exec_wait() sigemptyset(&sigmask); sigaddset(&sigmask, SIGCHLD); sigprocmask(SIG_BLOCK, &sigmask, NULL); diff --git a/devel/boost/patches/patch-tools_build_src_tools_gcc_jam b/devel/boost/patches/patch-tools_build_src_tools_gcc_jam index aa2041259af..78a42beae7b 100644 --- a/devel/boost/patches/patch-tools_build_src_tools_gcc_jam +++ b/devel/boost/patches/patch-tools_build_src_tools_gcc_jam @@ -2,16 +2,16 @@ $OpenBSD: patch-tools_build_src_tools_gcc_jam,v 1.6 2018/12/24 23:35:41 jca Exp Index: tools/build/src/tools/gcc.jam --- tools/build/src/tools/gcc.jam.orig +++ tools/build/src/tools/gcc.jam -@@ -685,7 +685,7 @@ class gcc-pch-generator : pch-generator +@@ -573,7 +573,7 @@ class gcc-pch-generator : pch-generator # Return result of base class and pch-file property as # usage-requirements. return -- [ property-set.create <pch-file>$(pch-file) <cflags>-Winvalid-pch ] -+ [ property-set.create <pch-file>$(pch-file) ] - $(pch-file) +- [ $(pch-file[1]).add-raw <pch-file>$(pch-file[2-]) <cflags>-Winvalid-pch ] ++ [ $(pch-file[1]).add-raw <pch-file>$(pch-file[2-]) ] + $(pch-file[2-]) ; } -@@ -756,7 +756,7 @@ actions compile.c.pch +@@ -625,7 +625,7 @@ actions compile.c.pch # Declare flags and action for compilation. toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ; @@ -20,33 +20,12 @@ Index: tools/build/src/tools/gcc.jam toolset.flags gcc.compile OPTIONS <optimization>space : -Os ; toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ; -@@ -1189,6 +1189,7 @@ rule link ( targets * : sources * : properties * ) - - actions link bind LIBRARIES - { -+ echo "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - -@@ -1199,10 +1200,10 @@ rule link.dll ( targets * : sources * : properties * ) - quote-rpath $(targets) ; - } - --# Differs from 'link' above only by -shared. -+# Differs from 'link' above only by -shared and -fPIC. - actions link.dll bind LIBRARIES - { -- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) -+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared -fPIC $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS) - } - - ### -@@ -1354,7 +1355,7 @@ cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; +@@ -1140,7 +1140,7 @@ cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ; ## cpu-flags gcc OPTIONS : x86 : atom : -march=atom ; # Sparc -cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ; -+cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 ; ++cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : ; cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ; cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ; cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ; diff --git a/devel/boost/pkg/PLIST-main b/devel/boost/pkg/PLIST-main index 7f74fda86ce..a5f70c457d5 100644 --- a/devel/boost/pkg/PLIST-main +++ b/devel/boost/pkg/PLIST-main @@ -644,6 +644,15 @@ include/boost/asio/error.hpp include/boost/asio/execution_context.hpp include/boost/asio/executor.hpp include/boost/asio/executor_work_guard.hpp +include/boost/asio/experimental/ +include/boost/asio/experimental.hpp +include/boost/asio/experimental/co_spawn.hpp +include/boost/asio/experimental/detached.hpp +include/boost/asio/experimental/impl/ +include/boost/asio/experimental/impl/co_spawn.hpp +include/boost/asio/experimental/impl/detached.hpp +include/boost/asio/experimental/impl/redirect_error.hpp +include/boost/asio/experimental/redirect_error.hpp include/boost/asio/generic/ include/boost/asio/generic/basic_endpoint.hpp include/boost/asio/generic/datagram_protocol.hpp @@ -871,9 +880,11 @@ include/boost/atomic/atomic.hpp include/boost/atomic/atomic_flag.hpp include/boost/atomic/capabilities.hpp include/boost/atomic/detail/ +include/boost/atomic/detail/addressof.hpp include/boost/atomic/detail/atomic_flag.hpp include/boost/atomic/detail/atomic_template.hpp include/boost/atomic/detail/bitwise_cast.hpp +include/boost/atomic/detail/bitwise_fp_cast.hpp include/boost/atomic/detail/caps_gcc_alpha.hpp include/boost/atomic/detail/caps_gcc_arm.hpp include/boost/atomic/detail/caps_gcc_atomic.hpp @@ -886,18 +897,29 @@ include/boost/atomic/detail/caps_msvc_arm.hpp include/boost/atomic/detail/caps_msvc_x86.hpp include/boost/atomic/detail/caps_windows.hpp include/boost/atomic/detail/config.hpp +include/boost/atomic/detail/extra_fp_operations.hpp +include/boost/atomic/detail/extra_fp_operations_fwd.hpp +include/boost/atomic/detail/extra_fp_ops_emulated.hpp +include/boost/atomic/detail/extra_fp_ops_generic.hpp include/boost/atomic/detail/extra_operations.hpp include/boost/atomic/detail/extra_operations_fwd.hpp +include/boost/atomic/detail/extra_ops_emulated.hpp include/boost/atomic/detail/extra_ops_gcc_arm.hpp include/boost/atomic/detail/extra_ops_gcc_ppc.hpp include/boost/atomic/detail/extra_ops_gcc_x86.hpp include/boost/atomic/detail/extra_ops_generic.hpp include/boost/atomic/detail/extra_ops_msvc_arm.hpp include/boost/atomic/detail/extra_ops_msvc_x86.hpp +include/boost/atomic/detail/float_sizes.hpp +include/boost/atomic/detail/fp_operations.hpp +include/boost/atomic/detail/fp_operations_fwd.hpp +include/boost/atomic/detail/fp_ops_emulated.hpp +include/boost/atomic/detail/fp_ops_generic.hpp include/boost/atomic/detail/hwcaps_gcc_arm.hpp include/boost/atomic/detail/hwcaps_gcc_ppc.hpp include/boost/atomic/detail/hwcaps_gcc_x86.hpp include/boost/atomic/detail/int_sizes.hpp +include/boost/atomic/detail/integral_extend.hpp include/boost/atomic/detail/interlocked.hpp include/boost/atomic/detail/link.hpp include/boost/atomic/detail/lockpool.hpp @@ -925,12 +947,18 @@ include/boost/atomic/detail/ops_windows.hpp include/boost/atomic/detail/pause.hpp include/boost/atomic/detail/platform.hpp include/boost/atomic/detail/storage_type.hpp +include/boost/atomic/detail/string_ops.hpp include/boost/atomic/detail/type_traits/ include/boost/atomic/detail/type_traits/conditional.hpp +include/boost/atomic/detail/type_traits/integral_constant.hpp +include/boost/atomic/detail/type_traits/is_floating_point.hpp include/boost/atomic/detail/type_traits/is_function.hpp +include/boost/atomic/detail/type_traits/is_iec559.hpp include/boost/atomic/detail/type_traits/is_integral.hpp include/boost/atomic/detail/type_traits/is_signed.hpp +include/boost/atomic/detail/type_traits/is_trivially_default_constructible.hpp include/boost/atomic/detail/type_traits/make_signed.hpp +include/boost/atomic/detail/type_traits/make_unsigned.hpp include/boost/atomic/fences.hpp include/boost/beast/ include/boost/beast.hpp @@ -952,7 +980,6 @@ include/boost/beast/core/detail/clamp.hpp include/boost/beast/core/detail/config.hpp include/boost/beast/core/detail/cpu_info.hpp include/boost/beast/core/detail/empty_base_optimization.hpp -include/boost/beast/core/detail/in_place_init.hpp include/boost/beast/core/detail/integer_sequence.hpp include/boost/beast/core/detail/ostream.hpp include/boost/beast/core/detail/sha1.hpp @@ -1046,11 +1073,13 @@ include/boost/beast/version.hpp include/boost/beast/websocket/ include/boost/beast/websocket.hpp include/boost/beast/websocket/detail/ +include/boost/beast/websocket/detail/error.hpp include/boost/beast/websocket/detail/frame.hpp include/boost/beast/websocket/detail/hybi13.hpp include/boost/beast/websocket/detail/mask.hpp include/boost/beast/websocket/detail/pausation.hpp include/boost/beast/websocket/detail/pmd_extension.hpp +include/boost/beast/websocket/detail/stream_base.hpp include/boost/beast/websocket/detail/type_traits.hpp include/boost/beast/websocket/detail/utf8_checker.hpp include/boost/beast/websocket/error.hpp @@ -1071,6 +1100,7 @@ include/boost/beast/websocket/rfc6455.hpp include/boost/beast/websocket/role.hpp include/boost/beast/websocket/ssl.hpp include/boost/beast/websocket/stream.hpp +include/boost/beast/websocket/stream_fwd.hpp include/boost/beast/websocket/teardown.hpp include/boost/beast/zlib/ include/boost/beast/zlib.hpp @@ -1788,6 +1818,8 @@ include/boost/config/detail/select_compiler_config.hpp include/boost/config/detail/select_platform_config.hpp include/boost/config/detail/select_stdlib_config.hpp include/boost/config/detail/suffix.hpp +include/boost/config/header_deprecated.hpp +include/boost/config/helper_macros.hpp include/boost/config/no_tr1/ include/boost/config/no_tr1/cmath.hpp include/boost/config/no_tr1/complex.hpp @@ -1814,6 +1846,7 @@ include/boost/config/platform/vms.hpp include/boost/config/platform/vxworks.hpp include/boost/config/platform/win32.hpp include/boost/config/platform/zos.hpp +include/boost/config/pragma_message.hpp include/boost/config/requires_threads.hpp include/boost/config/stdlib/ include/boost/config/stdlib/dinkumware.hpp @@ -1888,6 +1921,7 @@ include/boost/container/detail/std_fwd.hpp include/boost/container/detail/transform_iterator.hpp include/boost/container/detail/tree.hpp include/boost/container/detail/type_traits.hpp +include/boost/container/detail/value_functors.hpp include/boost/container/detail/value_init.hpp include/boost/container/detail/variadic_templates_tools.hpp include/boost/container/detail/version_type.hpp @@ -1932,6 +1966,14 @@ include/boost/container/throw_exception.hpp include/boost/container/uses_allocator.hpp include/boost/container/uses_allocator_fwd.hpp include/boost/container/vector.hpp +include/boost/container_hash/ +include/boost/container_hash/detail/ +include/boost/container_hash/detail/float_functions.hpp +include/boost/container_hash/detail/hash_float.hpp +include/boost/container_hash/detail/limits.hpp +include/boost/container_hash/extensions.hpp +include/boost/container_hash/hash.hpp +include/boost/container_hash/hash_fwd.hpp include/boost/context/ include/boost/context/all.hpp include/boost/context/continuation.hpp @@ -1944,6 +1986,7 @@ include/boost/context/detail/config.hpp include/boost/context/detail/disable_overload.hpp include/boost/context/detail/exception.hpp include/boost/context/detail/exchange.hpp +include/boost/context/detail/externc.hpp include/boost/context/detail/fcontext.hpp include/boost/context/detail/index_sequence.hpp include/boost/context/detail/invoke.hpp @@ -1953,6 +1996,10 @@ include/boost/context/execution_context.hpp include/boost/context/execution_context_v1.hpp include/boost/context/execution_context_v2.hpp include/boost/context/execution_context_v2_void.ipp +include/boost/context/fiber.hpp +include/boost/context/fiber_fcontext.hpp +include/boost/context/fiber_ucontext.hpp +include/boost/context/fiber_winfib.hpp include/boost/context/fixedsize_stack.hpp include/boost/context/flags.hpp include/boost/context/pooled_fixedsize_stack.hpp @@ -1966,6 +2013,72 @@ include/boost/context/stack_context.hpp include/boost/context/stack_traits.hpp include/boost/context/windows/ include/boost/context/windows/protected_fixedsize_stack.hpp +include/boost/contract/ +include/boost/contract.hpp +include/boost/contract/assert.hpp +include/boost/contract/base_types.hpp +include/boost/contract/call_if.hpp +include/boost/contract/check.hpp +include/boost/contract/constructor.hpp +include/boost/contract/core/ +include/boost/contract/core/access.hpp +include/boost/contract/core/check_macro.hpp +include/boost/contract/core/config.hpp +include/boost/contract/core/constructor_precondition.hpp +include/boost/contract/core/exception.hpp +include/boost/contract/core/specify.hpp +include/boost/contract/core/virtual.hpp +include/boost/contract/destructor.hpp +include/boost/contract/detail/ +include/boost/contract/detail/assert.hpp +include/boost/contract/detail/auto_ptr.hpp +include/boost/contract/detail/check.hpp +include/boost/contract/detail/checking.hpp +include/boost/contract/detail/condition/ +include/boost/contract/detail/condition/cond_base.hpp +include/boost/contract/detail/condition/cond_inv.hpp +include/boost/contract/detail/condition/cond_post.hpp +include/boost/contract/detail/condition/cond_subcontracting.hpp +include/boost/contract/detail/config.hpp +include/boost/contract/detail/debug.hpp +include/boost/contract/detail/decl.hpp +include/boost/contract/detail/declspec.hpp +include/boost/contract/detail/inlined/ +include/boost/contract/detail/inlined.hpp +include/boost/contract/detail/inlined/core/ +include/boost/contract/detail/inlined/core/exception.hpp +include/boost/contract/detail/inlined/detail/ +include/boost/contract/detail/inlined/detail/checking.hpp +include/boost/contract/detail/inlined/old.hpp +include/boost/contract/detail/name.hpp +include/boost/contract/detail/none.hpp +include/boost/contract/detail/noop.hpp +include/boost/contract/detail/operation/ +include/boost/contract/detail/operation/constructor.hpp +include/boost/contract/detail/operation/destructor.hpp +include/boost/contract/detail/operation/function.hpp +include/boost/contract/detail/operation/public_function.hpp +include/boost/contract/detail/operation/static_public_function.hpp +include/boost/contract/detail/operator_safe_bool.hpp +include/boost/contract/detail/preprocessor/ +include/boost/contract/detail/preprocessor/keyword/ +include/boost/contract/detail/preprocessor/keyword/private.hpp +include/boost/contract/detail/preprocessor/keyword/protected.hpp +include/boost/contract/detail/preprocessor/keyword/public.hpp +include/boost/contract/detail/preprocessor/keyword/utility/ +include/boost/contract/detail/preprocessor/keyword/utility/is.hpp +include/boost/contract/detail/preprocessor/keyword/virtual.hpp +include/boost/contract/detail/static_local_var.hpp +include/boost/contract/detail/tvariadic.hpp +include/boost/contract/detail/type_traits/ +include/boost/contract/detail/type_traits/member_function_types.hpp +include/boost/contract/detail/type_traits/mirror.hpp +include/boost/contract/detail/type_traits/optional.hpp +include/boost/contract/function.hpp +include/boost/contract/old.hpp +include/boost/contract/override.hpp +include/boost/contract/public_function.hpp +include/boost/contract_macro.hpp include/boost/convert/ include/boost/convert.hpp include/boost/convert/base.hpp @@ -2634,10 +2747,6 @@ include/boost/functional/factory.hpp include/boost/functional/forward_adapter.hpp include/boost/functional/hash/ include/boost/functional/hash.hpp -include/boost/functional/hash/detail/ -include/boost/functional/hash/detail/float_functions.hpp -include/boost/functional/hash/detail/hash_float.hpp -include/boost/functional/hash/detail/limits.hpp include/boost/functional/hash/extensions.hpp include/boost/functional/hash/hash.hpp include/boost/functional/hash/hash_fwd.hpp @@ -3786,6 +3895,7 @@ include/boost/geometry/algorithms/correct.hpp include/boost/geometry/algorithms/correct_closure.hpp include/boost/geometry/algorithms/covered_by.hpp include/boost/geometry/algorithms/crosses.hpp +include/boost/geometry/algorithms/densify.hpp include/boost/geometry/algorithms/detail/ include/boost/geometry/algorithms/detail/as_range.hpp include/boost/geometry/algorithms/detail/assign_box_corners.hpp @@ -3933,7 +4043,6 @@ include/boost/geometry/algorithms/detail/overlaps/implementation.hpp include/boost/geometry/algorithms/detail/overlaps/interface.hpp include/boost/geometry/algorithms/detail/overlay/ include/boost/geometry/algorithms/detail/overlay/add_rings.hpp -include/boost/geometry/algorithms/detail/overlay/aggregate_operations.hpp include/boost/geometry/algorithms/detail/overlay/append_no_duplicates.hpp include/boost/geometry/algorithms/detail/overlay/append_no_dups_or_spikes.hpp include/boost/geometry/algorithms/detail/overlay/assign_parents.hpp @@ -3981,7 +4090,6 @@ include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp include/boost/geometry/algorithms/detail/overlay/stream_info.hpp include/boost/geometry/algorithms/detail/overlay/traversal.hpp include/boost/geometry/algorithms/detail/overlay/traversal_info.hpp -include/boost/geometry/algorithms/detail/overlay/traversal_intersection_patterns.hpp include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp include/boost/geometry/algorithms/detail/overlay/traversal_switch_detector.hpp include/boost/geometry/algorithms/detail/overlay/traverse.hpp @@ -4105,7 +4213,6 @@ include/boost/geometry/core/radian_access.hpp include/boost/geometry/core/radius.hpp include/boost/geometry/core/reverse_dispatch.hpp include/boost/geometry/core/ring_type.hpp -include/boost/geometry/core/srs.hpp include/boost/geometry/core/tag.hpp include/boost/geometry/core/tag_cast.hpp include/boost/geometry/core/tags.hpp @@ -4431,6 +4538,161 @@ include/boost/geometry/policies/robustness/robust_point_type.hpp include/boost/geometry/policies/robustness/robust_type.hpp include/boost/geometry/policies/robustness/segment_ratio.hpp include/boost/geometry/policies/robustness/segment_ratio_type.hpp +include/boost/geometry/srs/ +include/boost/geometry/srs/epsg.hpp +include/boost/geometry/srs/esri.hpp +include/boost/geometry/srs/iau2000.hpp +include/boost/geometry/srs/projection.hpp +include/boost/geometry/srs/projections/ +include/boost/geometry/srs/projections/code.hpp +include/boost/geometry/srs/projections/epsg.hpp +include/boost/geometry/srs/projections/epsg_params.hpp +include/boost/geometry/srs/projections/epsg_traits.hpp +include/boost/geometry/srs/projections/esri.hpp +include/boost/geometry/srs/projections/esri_params.hpp +include/boost/geometry/srs/projections/esri_traits.hpp +include/boost/geometry/srs/projections/exception.hpp +include/boost/geometry/srs/projections/factory.hpp +include/boost/geometry/srs/projections/iau2000.hpp +include/boost/geometry/srs/projections/iau2000_params.hpp +include/boost/geometry/srs/projections/iau2000_traits.hpp +include/boost/geometry/srs/projections/impl/ +include/boost/geometry/srs/projections/impl/aasincos.hpp +include/boost/geometry/srs/projections/impl/adjlon.hpp +include/boost/geometry/srs/projections/impl/base_dynamic.hpp +include/boost/geometry/srs/projections/impl/base_static.hpp +include/boost/geometry/srs/projections/impl/dms_parser.hpp +include/boost/geometry/srs/projections/impl/factory_entry.hpp +include/boost/geometry/srs/projections/impl/function_overloads.hpp +include/boost/geometry/srs/projections/impl/geocent.hpp +include/boost/geometry/srs/projections/impl/pj_auth.hpp +include/boost/geometry/srs/projections/impl/pj_datum_set.hpp +include/boost/geometry/srs/projections/impl/pj_datums.hpp +include/boost/geometry/srs/projections/impl/pj_ell_set.hpp +include/boost/geometry/srs/projections/impl/pj_ellps.hpp +include/boost/geometry/srs/projections/impl/pj_fwd.hpp +include/boost/geometry/srs/projections/impl/pj_gauss.hpp +include/boost/geometry/srs/projections/impl/pj_init.hpp +include/boost/geometry/srs/projections/impl/pj_inv.hpp +include/boost/geometry/srs/projections/impl/pj_mlfn.hpp +include/boost/geometry/srs/projections/impl/pj_msfn.hpp +include/boost/geometry/srs/projections/impl/pj_param.hpp +include/boost/geometry/srs/projections/impl/pj_phi2.hpp +include/boost/geometry/srs/projections/impl/pj_qsfn.hpp +include/boost/geometry/srs/projections/impl/pj_strerrno.hpp +include/boost/geometry/srs/projections/impl/pj_transform.hpp +include/boost/geometry/srs/projections/impl/pj_tsfn.hpp +include/boost/geometry/srs/projections/impl/pj_units.hpp +include/boost/geometry/srs/projections/impl/pj_zpoly1.hpp +include/boost/geometry/srs/projections/impl/proj_mdist.hpp +include/boost/geometry/srs/projections/impl/projects.hpp +include/boost/geometry/srs/projections/invalid_point.hpp +include/boost/geometry/srs/projections/par4.hpp +include/boost/geometry/srs/projections/proj/ +include/boost/geometry/srs/projections/proj/aea.hpp +include/boost/geometry/srs/projections/proj/aeqd.hpp +include/boost/geometry/srs/projections/proj/airy.hpp +include/boost/geometry/srs/projections/proj/aitoff.hpp +include/boost/geometry/srs/projections/proj/august.hpp +include/boost/geometry/srs/projections/proj/bacon.hpp +include/boost/geometry/srs/projections/proj/bipc.hpp +include/boost/geometry/srs/projections/proj/boggs.hpp +include/boost/geometry/srs/projections/proj/bonne.hpp +include/boost/geometry/srs/projections/proj/cass.hpp +include/boost/geometry/srs/projections/proj/cc.hpp +include/boost/geometry/srs/projections/proj/cea.hpp +include/boost/geometry/srs/projections/proj/chamb.hpp +include/boost/geometry/srs/projections/proj/collg.hpp +include/boost/geometry/srs/projections/proj/crast.hpp +include/boost/geometry/srs/projections/proj/denoy.hpp +include/boost/geometry/srs/projections/proj/eck1.hpp +include/boost/geometry/srs/projections/proj/eck2.hpp +include/boost/geometry/srs/projections/proj/eck3.hpp +include/boost/geometry/srs/projections/proj/eck4.hpp +include/boost/geometry/srs/projections/proj/eck5.hpp +include/boost/geometry/srs/projections/proj/eqc.hpp +include/boost/geometry/srs/projections/proj/eqdc.hpp +include/boost/geometry/srs/projections/proj/etmerc.hpp +include/boost/geometry/srs/projections/proj/fahey.hpp +include/boost/geometry/srs/projections/proj/fouc_s.hpp +include/boost/geometry/srs/projections/proj/gall.hpp +include/boost/geometry/srs/projections/proj/geocent.hpp +include/boost/geometry/srs/projections/proj/geos.hpp +include/boost/geometry/srs/projections/proj/gins8.hpp +include/boost/geometry/srs/projections/proj/gn_sinu.hpp +include/boost/geometry/srs/projections/proj/gnom.hpp +include/boost/geometry/srs/projections/proj/goode.hpp +include/boost/geometry/srs/projections/proj/gstmerc.hpp +include/boost/geometry/srs/projections/proj/hammer.hpp +include/boost/geometry/srs/projections/proj/hatano.hpp +include/boost/geometry/srs/projections/proj/healpix.hpp +include/boost/geometry/srs/projections/proj/igh.hpp +include/boost/geometry/srs/projections/proj/imw_p.hpp +include/boost/geometry/srs/projections/proj/isea.hpp +include/boost/geometry/srs/projections/proj/krovak.hpp +include/boost/geometry/srs/projections/proj/labrd.hpp +include/boost/geometry/srs/projections/proj/laea.hpp +include/boost/geometry/srs/projections/proj/lagrng.hpp +include/boost/geometry/srs/projections/proj/larr.hpp +include/boost/geometry/srs/projections/proj/lask.hpp +include/boost/geometry/srs/projections/proj/latlong.hpp +include/boost/geometry/srs/projections/proj/lcc.hpp +include/boost/geometry/srs/projections/proj/lcca.hpp +include/boost/geometry/srs/projections/proj/loxim.hpp +include/boost/geometry/srs/projections/proj/lsat.hpp +include/boost/geometry/srs/projections/proj/mbt_fps.hpp +include/boost/geometry/srs/projections/proj/mbtfpp.hpp +include/boost/geometry/srs/projections/proj/mbtfpq.hpp +include/boost/geometry/srs/projections/proj/merc.hpp +include/boost/geometry/srs/projections/proj/mill.hpp +include/boost/geometry/srs/projections/proj/mod_ster.hpp +include/boost/geometry/srs/projections/proj/moll.hpp +include/boost/geometry/srs/projections/proj/natearth.hpp +include/boost/geometry/srs/projections/proj/nell.hpp +include/boost/geometry/srs/projections/proj/nell_h.hpp +include/boost/geometry/srs/projections/proj/nocol.hpp +include/boost/geometry/srs/projections/proj/nsper.hpp +include/boost/geometry/srs/projections/proj/nzmg.hpp +include/boost/geometry/srs/projections/proj/ob_tran.hpp +include/boost/geometry/srs/projections/proj/ocea.hpp +include/boost/geometry/srs/projections/proj/oea.hpp +include/boost/geometry/srs/projections/proj/omerc.hpp +include/boost/geometry/srs/projections/proj/ortho.hpp +include/boost/geometry/srs/projections/proj/poly.hpp +include/boost/geometry/srs/projections/proj/putp2.hpp +include/boost/geometry/srs/projections/proj/putp3.hpp +include/boost/geometry/srs/projections/proj/putp4p.hpp +include/boost/geometry/srs/projections/proj/putp5.hpp +include/boost/geometry/srs/projections/proj/putp6.hpp +include/boost/geometry/srs/projections/proj/qsc.hpp +include/boost/geometry/srs/projections/proj/robin.hpp +include/boost/geometry/srs/projections/proj/rouss.hpp +include/boost/geometry/srs/projections/proj/rpoly.hpp +include/boost/geometry/srs/projections/proj/sconics.hpp +include/boost/geometry/srs/projections/proj/somerc.hpp +include/boost/geometry/srs/projections/proj/stere.hpp +include/boost/geometry/srs/projections/proj/sterea.hpp +include/boost/geometry/srs/projections/proj/sts.hpp +include/boost/geometry/srs/projections/proj/tcc.hpp +include/boost/geometry/srs/projections/proj/tcea.hpp +include/boost/geometry/srs/projections/proj/tmerc.hpp +include/boost/geometry/srs/projections/proj/tpeqd.hpp +include/boost/geometry/srs/projections/proj/urm5.hpp +include/boost/geometry/srs/projections/proj/urmfps.hpp +include/boost/geometry/srs/projections/proj/vandg.hpp +include/boost/geometry/srs/projections/proj/vandg2.hpp +include/boost/geometry/srs/projections/proj/vandg4.hpp +include/boost/geometry/srs/projections/proj/wag2.hpp +include/boost/geometry/srs/projections/proj/wag3.hpp +include/boost/geometry/srs/projections/proj/wag7.hpp +include/boost/geometry/srs/projections/proj/wink1.hpp +include/boost/geometry/srs/projections/proj/wink2.hpp +include/boost/geometry/srs/projections/proj4.hpp +include/boost/geometry/srs/projections/srid_traits.hpp +include/boost/geometry/srs/sphere.hpp +include/boost/geometry/srs/spheroid.hpp +include/boost/geometry/srs/srs.hpp +include/boost/geometry/srs/transformation.hpp include/boost/geometry/strategies/ include/boost/geometry/strategies/agnostic/ include/boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp @@ -4442,9 +4704,11 @@ include/boost/geometry/strategies/agnostic/point_in_poly_oriented_winding.hpp include/boost/geometry/strategies/agnostic/point_in_poly_winding.hpp include/boost/geometry/strategies/agnostic/simplify_douglas_peucker.hpp include/boost/geometry/strategies/area.hpp +include/boost/geometry/strategies/area_result.hpp include/boost/geometry/strategies/azimuth.hpp include/boost/geometry/strategies/buffer.hpp include/boost/geometry/strategies/cartesian/ +include/boost/geometry/strategies/cartesian/area.hpp include/boost/geometry/strategies/cartesian/area_surveyor.hpp include/boost/geometry/strategies/cartesian/azimuth.hpp include/boost/geometry/strategies/cartesian/box_in_box.hpp @@ -4459,6 +4723,7 @@ include/boost/geometry/strategies/cartesian/buffer_side_straight.hpp include/boost/geometry/strategies/cartesian/centroid_average.hpp include/boost/geometry/strategies/cartesian/centroid_bashein_detmer.hpp include/boost/geometry/strategies/cartesian/centroid_weighted_length.hpp +include/boost/geometry/strategies/cartesian/densify.hpp include/boost/geometry/strategies/cartesian/disjoint_segment_box.hpp include/boost/geometry/strategies/cartesian/distance_projected_point.hpp include/boost/geometry/strategies/cartesian/distance_projected_point_ax.hpp @@ -4491,6 +4756,7 @@ include/boost/geometry/strategies/default_comparable_distance_result.hpp include/boost/geometry/strategies/default_distance_result.hpp include/boost/geometry/strategies/default_length_result.hpp include/boost/geometry/strategies/default_strategy.hpp +include/boost/geometry/strategies/densify.hpp include/boost/geometry/strategies/disjoint.hpp include/boost/geometry/strategies/distance.hpp include/boost/geometry/strategies/distance_result.hpp @@ -4498,10 +4764,13 @@ include/boost/geometry/strategies/envelope.hpp include/boost/geometry/strategies/geographic/ include/boost/geometry/strategies/geographic/area.hpp include/boost/geometry/strategies/geographic/azimuth.hpp +include/boost/geometry/strategies/geographic/densify.hpp include/boost/geometry/strategies/geographic/disjoint_segment_box.hpp include/boost/geometry/strategies/geographic/distance.hpp include/boost/geometry/strategies/geographic/distance_andoyer.hpp include/boost/geometry/strategies/geographic/distance_cross_track.hpp +include/boost/geometry/strategies/geographic/distance_cross_track_box_box.hpp +include/boost/geometry/strategies/geographic/distance_cross_track_point_box.hpp include/boost/geometry/strategies/geographic/distance_thomas.hpp include/boost/geometry/strategies/geographic/distance_vincenty.hpp include/boost/geometry/strategies/geographic/envelope_segment.hpp @@ -4524,11 +4793,14 @@ include/boost/geometry/strategies/spherical/ include/boost/geometry/strategies/spherical/area.hpp include/boost/geometry/strategies/spherical/azimuth.hpp include/boost/geometry/strategies/spherical/compare.hpp +include/boost/geometry/strategies/spherical/densify.hpp include/boost/geometry/strategies/spherical/disjoint_segment_box.hpp include/boost/geometry/strategies/spherical/distance_cross_track.hpp +include/boost/geometry/strategies/spherical/distance_cross_track_box_box.hpp include/boost/geometry/strategies/spherical/distance_cross_track_point_box.hpp include/boost/geometry/strategies/spherical/distance_haversine.hpp include/boost/geometry/strategies/spherical/envelope_segment.hpp +include/boost/geometry/strategies/spherical/get_radius.hpp include/boost/geometry/strategies/spherical/intersection.hpp include/boost/geometry/strategies/spherical/point_in_poly_winding.hpp include/boost/geometry/strategies/spherical/side_by_cross_track.hpp @@ -4541,6 +4813,7 @@ include/boost/geometry/strategies/transform.hpp include/boost/geometry/strategies/transform/inverse_transformer.hpp include/boost/geometry/strategies/transform/map_transformer.hpp include/boost/geometry/strategies/transform/matrix_transformers.hpp +include/boost/geometry/strategies/transform/srs_transformer.hpp include/boost/geometry/strategies/within.hpp include/boost/geometry/util/ include/boost/geometry/util/add_const_if_c.hpp @@ -4568,6 +4841,7 @@ include/boost/geometry/util/readme.txt include/boost/geometry/util/select_calculation_type.hpp include/boost/geometry/util/select_coordinate_type.hpp include/boost/geometry/util/select_most_precise.hpp +include/boost/geometry/util/select_sequence_element.hpp include/boost/geometry/util/transform_variant.hpp include/boost/geometry/views/ include/boost/geometry/views/box_view.hpp @@ -5373,6 +5647,83 @@ include/boost/heap/pairing_heap.hpp include/boost/heap/policies.hpp include/boost/heap/priority_queue.hpp include/boost/heap/skew_heap.hpp +include/boost/hof/ +include/boost/hof.hpp +include/boost/hof/alias.hpp +include/boost/hof/always.hpp +include/boost/hof/apply.hpp +include/boost/hof/apply_eval.hpp +include/boost/hof/arg.hpp +include/boost/hof/capture.hpp +include/boost/hof/combine.hpp +include/boost/hof/compose.hpp +include/boost/hof/config.hpp +include/boost/hof/construct.hpp +include/boost/hof/decay.hpp +include/boost/hof/decorate.hpp +include/boost/hof/detail/ +include/boost/hof/detail/and.hpp +include/boost/hof/detail/callable_base.hpp +include/boost/hof/detail/can_be_called.hpp +include/boost/hof/detail/compressed_pair.hpp +include/boost/hof/detail/constexpr_deduce.hpp +include/boost/hof/detail/delegate.hpp +include/boost/hof/detail/forward.hpp +include/boost/hof/detail/holder.hpp +include/boost/hof/detail/intrinsics.hpp +include/boost/hof/detail/join.hpp +include/boost/hof/detail/make.hpp +include/boost/hof/detail/move.hpp +include/boost/hof/detail/noexcept.hpp +include/boost/hof/detail/pp.hpp +include/boost/hof/detail/recursive_constexpr_depth.hpp +include/boost/hof/detail/remove_rvalue_reference.hpp +include/boost/hof/detail/result_of.hpp +include/boost/hof/detail/result_type.hpp +include/boost/hof/detail/seq.hpp +include/boost/hof/detail/static_const_var.hpp +include/boost/hof/detail/unpack_tuple.hpp +include/boost/hof/detail/unwrap.hpp +include/boost/hof/detail/using.hpp +include/boost/hof/eval.hpp +include/boost/hof/first_of.hpp +include/boost/hof/fix.hpp +include/boost/hof/flip.hpp +include/boost/hof/flow.hpp +include/boost/hof/fold.hpp +include/boost/hof/function.hpp +include/boost/hof/function_param_limit.hpp +include/boost/hof/identity.hpp +include/boost/hof/if.hpp +include/boost/hof/implicit.hpp +include/boost/hof/indirect.hpp +include/boost/hof/infix.hpp +include/boost/hof/is_invocable.hpp +include/boost/hof/is_unpackable.hpp +include/boost/hof/lambda.hpp +include/boost/hof/lazy.hpp +include/boost/hof/lift.hpp +include/boost/hof/limit.hpp +include/boost/hof/match.hpp +include/boost/hof/mutable.hpp +include/boost/hof/pack.hpp +include/boost/hof/partial.hpp +include/boost/hof/pipable.hpp +include/boost/hof/placeholders.hpp +include/boost/hof/proj.hpp +include/boost/hof/protect.hpp +include/boost/hof/repeat.hpp +include/boost/hof/repeat_while.hpp +include/boost/hof/result.hpp +include/boost/hof/returns.hpp +include/boost/hof/reveal.hpp +include/boost/hof/reverse_fold.hpp +include/boost/hof/rotate.hpp +include/boost/hof/static.hpp +include/boost/hof/tap.hpp +include/boost/hof/unpack.hpp +include/boost/hof/unpack_sequence.hpp +include/boost/hof/version.hpp include/boost/icl/ include/boost/icl/associative_element_container.hpp include/boost/icl/associative_interval_container.hpp @@ -6159,6 +6510,7 @@ include/boost/log/core/record.hpp include/boost/log/core/record_view.hpp include/boost/log/detail/ include/boost/log/detail/adaptive_mutex.hpp +include/boost/log/detail/allocator_traits.hpp include/boost/log/detail/asio_fwd.hpp include/boost/log/detail/attachable_sstream_buf.hpp include/boost/log/detail/attr_output_impl.hpp @@ -6500,6 +6852,7 @@ include/boost/math/quadrature/detail/tanh_sinh_detail.hpp include/boost/math/quadrature/exp_sinh.hpp include/boost/math/quadrature/gauss.hpp include/boost/math/quadrature/gauss_kronrod.hpp +include/boost/math/quadrature/naive_monte_carlo.hpp include/boost/math/quadrature/sinh_sinh.hpp include/boost/math/quadrature/tanh_sinh.hpp include/boost/math/quadrature/trapezoidal.hpp @@ -6726,6 +7079,7 @@ include/boost/math/tools/detail/rational_horner3_8.hpp include/boost/math/tools/detail/rational_horner3_9.hpp include/boost/math/tools/fraction.hpp include/boost/math/tools/minima.hpp +include/boost/math/tools/numerical_differentiation.hpp include/boost/math/tools/polynomial.hpp include/boost/math/tools/polynomial_gcd.hpp include/boost/math/tools/precision.hpp @@ -7062,9 +7416,13 @@ include/boost/move/algo/adaptive_sort.hpp include/boost/move/algo/detail/ include/boost/move/algo/detail/adaptive_sort_merge.hpp include/boost/move/algo/detail/basic_op.hpp +include/boost/move/algo/detail/heap_sort.hpp include/boost/move/algo/detail/insertion_sort.hpp +include/boost/move/algo/detail/is_sorted.hpp include/boost/move/algo/detail/merge.hpp include/boost/move/algo/detail/merge_sort.hpp +include/boost/move/algo/detail/pdqsort.hpp +include/boost/move/algo/detail/set_difference.hpp include/boost/move/algo/move.hpp include/boost/move/algo/predicate.hpp include/boost/move/algo/unique.hpp @@ -7110,6 +7468,7 @@ include/boost/mp11/detail/mp_list.hpp include/boost/mp11/detail/mp_map_find.hpp include/boost/mp11/detail/mp_min_element.hpp include/boost/mp11/detail/mp_plus.hpp +include/boost/mp11/detail/mp_void.hpp include/boost/mp11/detail/mp_with_index.hpp include/boost/mp11/function.hpp include/boost/mp11/integer_sequence.hpp @@ -7123,9 +7482,11 @@ include/boost/mp11/utility.hpp include/boost/mpi/ include/boost/mpi.hpp include/boost/mpi/allocator.hpp +include/boost/mpi/cartesian_communicator.hpp include/boost/mpi/collectives/ include/boost/mpi/collectives.hpp include/boost/mpi/collectives/all_gather.hpp +include/boost/mpi/collectives/all_gatherv.hpp include/boost/mpi/collectives/all_reduce.hpp include/boost/mpi/collectives/all_to_all.hpp include/boost/mpi/collectives/broadcast.hpp @@ -7158,6 +7519,7 @@ include/boost/mpi/detail/ignore_skeleton_oarchive.hpp include/boost/mpi/detail/mpi_datatype_cache.hpp include/boost/mpi/detail/mpi_datatype_oarchive.hpp include/boost/mpi/detail/mpi_datatype_primitive.hpp +include/boost/mpi/detail/offsets.hpp include/boost/mpi/detail/packed_iprimitive.hpp include/boost/mpi/detail/packed_oprimitive.hpp include/boost/mpi/detail/point_to_point.hpp @@ -8962,7 +9324,6 @@ include/boost/phoenix/core/detail/argument.hpp include/boost/phoenix/core/detail/cpp03/ include/boost/phoenix/core/detail/cpp03/actor_operator.hpp include/boost/phoenix/core/detail/cpp03/actor_result_of.hpp -include/boost/phoenix/core/detail/cpp03/assign.hpp include/boost/phoenix/core/detail/cpp03/call.hpp include/boost/phoenix/core/detail/cpp03/expression.hpp include/boost/phoenix/core/detail/cpp03/function_equal.hpp @@ -8993,12 +9354,6 @@ include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_20.hpp include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_30.hpp include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_40.hpp include/boost/phoenix/core/detail/cpp03/preprocessed/argument_predefined_50.hpp -include/boost/phoenix/core/detail/cpp03/preprocessed/assign.hpp -include/boost/phoenix/core/detail/cpp03/preprocessed/assign_10.hpp -include/boost/phoenix/core/detail/cpp03/preprocessed/assign_20.hpp -include/boost/phoenix/core/detail/cpp03/preprocessed/assign_30.hpp -include/boost/phoenix/core/detail/cpp03/preprocessed/assign_40.hpp -include/boost/phoenix/core/detail/cpp03/preprocessed/assign_50.hpp include/boost/phoenix/core/detail/cpp03/preprocessed/call.hpp include/boost/phoenix/core/detail/cpp03/preprocessed/call_10.hpp include/boost/phoenix/core/detail/cpp03/preprocessed/call_20.hpp @@ -9153,6 +9508,11 @@ include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_30.hpp include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_40.hpp include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_50.hpp include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of.hpp +include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_10.hpp +include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_20.hpp +include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_30.hpp +include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_40.hpp +include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_eval_result_of_50.hpp include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr.hpp include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_10.hpp include/boost/phoenix/operator/detail/cpp03/preprocessed/mem_fun_ptr_expr_20.hpp @@ -9314,7 +9674,6 @@ include/boost/poly_collection/detail/is_constructible.hpp include/boost/poly_collection/detail/is_equality_comparable.hpp include/boost/poly_collection/detail/is_final.hpp include/boost/poly_collection/detail/is_invocable.hpp -include/boost/poly_collection/detail/is_likely_stateless_lambda.hpp include/boost/poly_collection/detail/is_nothrow_eq_comparable.hpp include/boost/poly_collection/detail/iterator_impl.hpp include/boost/poly_collection/detail/iterator_traits.hpp @@ -9329,7 +9688,6 @@ include/boost/poly_collection/detail/stride_iterator.hpp include/boost/poly_collection/detail/type_info_map.hpp include/boost/poly_collection/detail/type_restitution.hpp include/boost/poly_collection/detail/value_holder.hpp -include/boost/poly_collection/detail/workaround_dr1467.hpp include/boost/poly_collection/exception.hpp include/boost/poly_collection/function_collection.hpp include/boost/poly_collection/function_collection_fwd.hpp @@ -10264,6 +10622,7 @@ include/boost/ptr_container/detail/is_convertible.hpp include/boost/ptr_container/detail/map_iterator.hpp include/boost/ptr_container/detail/meta_functions.hpp include/boost/ptr_container/detail/move.hpp +include/boost/ptr_container/detail/ptr_container_disable_deprecated.hpp include/boost/ptr_container/detail/reversible_ptr_container.hpp include/boost/ptr_container/detail/scoped_deleter.hpp include/boost/ptr_container/detail/serialize_ptr_map_adapter.hpp @@ -11189,7 +11548,54 @@ include/boost/smart_ptr/shared_array.hpp include/boost/smart_ptr/shared_ptr.hpp include/boost/smart_ptr/weak_ptr.hpp include/boost/sort/ +include/boost/sort/block_indirect_sort/ +include/boost/sort/block_indirect_sort/blk_detail/ +include/boost/sort/block_indirect_sort/blk_detail/backbone.hpp +include/boost/sort/block_indirect_sort/blk_detail/block.hpp +include/boost/sort/block_indirect_sort/blk_detail/constants.hpp +include/boost/sort/block_indirect_sort/blk_detail/merge_blocks.hpp +include/boost/sort/block_indirect_sort/blk_detail/move_blocks.hpp +include/boost/sort/block_indirect_sort/blk_detail/parallel_sort.hpp +include/boost/sort/block_indirect_sort/block_indirect_sort.hpp +include/boost/sort/common/ +include/boost/sort/common/deque_cnc.hpp +include/boost/sort/common/file_vector.hpp +include/boost/sort/common/indirect.hpp +include/boost/sort/common/int_array.hpp +include/boost/sort/common/merge_block.hpp +include/boost/sort/common/merge_four.hpp +include/boost/sort/common/merge_vector.hpp +include/boost/sort/common/pivot.hpp +include/boost/sort/common/range.hpp +include/boost/sort/common/rearrange.hpp +include/boost/sort/common/scheduler.hpp +include/boost/sort/common/sort_basic.hpp +include/boost/sort/common/spinlock.hpp +include/boost/sort/common/stack_cnc.hpp +include/boost/sort/common/time_measure.hpp +include/boost/sort/common/util/ +include/boost/sort/common/util/algorithm.hpp +include/boost/sort/common/util/atomic.hpp +include/boost/sort/common/util/circular_buffer.hpp +include/boost/sort/common/util/insert.hpp +include/boost/sort/common/util/merge.hpp +include/boost/sort/common/util/search.hpp +include/boost/sort/common/util/traits.hpp +include/boost/sort/flat_stable_sort/ +include/boost/sort/flat_stable_sort/flat_stable_sort.hpp +include/boost/sort/heap_sort/ +include/boost/sort/heap_sort/heap_sort.hpp +include/boost/sort/insert_sort/ +include/boost/sort/insert_sort/insert_sort.hpp +include/boost/sort/parallel_stable_sort/ +include/boost/sort/parallel_stable_sort/parallel_stable_sort.hpp +include/boost/sort/pdqsort/ +include/boost/sort/pdqsort/pdqsort.hpp +include/boost/sort/sample_sort/ +include/boost/sort/sample_sort/sample_sort.hpp include/boost/sort/sort.hpp +include/boost/sort/spinsort/ +include/boost/sort/spinsort/spinsort.hpp include/boost/sort/spreadsort/ include/boost/sort/spreadsort/detail/ include/boost/sort/spreadsort/detail/constants.hpp @@ -11736,7 +12142,9 @@ include/boost/spirit/home/support/algorithm/ include/boost/spirit/home/support/algorithm/any.hpp include/boost/spirit/home/support/algorithm/any_if.hpp include/boost/spirit/home/support/algorithm/any_if_ns.hpp +include/boost/spirit/home/support/algorithm/any_if_ns_so.hpp include/boost/spirit/home/support/algorithm/any_ns.hpp +include/boost/spirit/home/support/algorithm/any_ns_so.hpp include/boost/spirit/home/support/argument.hpp include/boost/spirit/home/support/argument_expression.hpp include/boost/spirit/home/support/assert_msg.hpp @@ -11998,6 +12406,7 @@ include/boost/spirit/home/x3/support/traits/container_traits.hpp include/boost/spirit/home/x3/support/traits/handles_container.hpp include/boost/spirit/home/x3/support/traits/has_attribute.hpp include/boost/spirit/home/x3/support/traits/is_parser.hpp +include/boost/spirit/home/x3/support/traits/is_range.hpp include/boost/spirit/home/x3/support/traits/is_substitute.hpp include/boost/spirit/home/x3/support/traits/is_variant.hpp include/boost/spirit/home/x3/support/traits/make_attribute.hpp @@ -12314,7 +12723,9 @@ include/boost/spirit/include/support_adapt_adt_attributes.hpp include/boost/spirit/include/support_any.hpp include/boost/spirit/include/support_any_if.hpp include/boost/spirit/include/support_any_if_ns.hpp +include/boost/spirit/include/support_any_if_ns_so.hpp include/boost/spirit/include/support_any_ns.hpp +include/boost/spirit/include/support_any_ns_so.hpp include/boost/spirit/include/support_argument.hpp include/boost/spirit/include/support_ascii.hpp include/boost/spirit/include/support_attributes.hpp @@ -12695,6 +13106,7 @@ include/boost/thread/detail/memory.hpp include/boost/thread/detail/move.hpp include/boost/thread/detail/nullary_function.hpp include/boost/thread/detail/platform.hpp +include/boost/thread/detail/platform_time.hpp include/boost/thread/detail/singleton.hpp include/boost/thread/detail/thread.hpp include/boost/thread/detail/thread_group.hpp @@ -12773,13 +13185,12 @@ include/boost/thread/pthread/condition_variable_fwd.hpp include/boost/thread/pthread/mutex.hpp include/boost/thread/pthread/once.hpp include/boost/thread/pthread/once_atomic.hpp +include/boost/thread/pthread/pthread_helpers.hpp include/boost/thread/pthread/pthread_mutex_scoped_lock.hpp include/boost/thread/pthread/recursive_mutex.hpp include/boost/thread/pthread/shared_mutex.hpp -include/boost/thread/pthread/shared_mutex_assert.hpp include/boost/thread/pthread/thread_data.hpp include/boost/thread/pthread/thread_heap_alloc.hpp -include/boost/thread/pthread/timespec.hpp include/boost/thread/recursive_mutex.hpp include/boost/thread/reverse_lock.hpp include/boost/thread/scoped_thread.hpp @@ -12800,7 +13211,6 @@ include/boost/thread/tss.hpp include/boost/thread/user_scheduler.hpp include/boost/thread/v2/ include/boost/thread/v2/shared_mutex.hpp -include/boost/thread/v2/thread.hpp include/boost/thread/win32/ include/boost/thread/win32/basic_recursive_mutex.hpp include/boost/thread/win32/basic_timed_mutex.hpp @@ -12906,6 +13316,8 @@ include/boost/type_erasure/detail/get_placeholders.hpp include/boost/type_erasure/detail/get_signature.hpp include/boost/type_erasure/detail/instantiate.hpp include/boost/type_erasure/detail/macro.hpp +include/boost/type_erasure/detail/member11.hpp +include/boost/type_erasure/detail/meta.hpp include/boost/type_erasure/detail/normalize.hpp include/boost/type_erasure/detail/normalize_deduced.hpp include/boost/type_erasure/detail/null.hpp @@ -12983,6 +13395,7 @@ include/boost/type_traits/detail/common_type_impl.hpp include/boost/type_traits/detail/composite_member_pointer_type.hpp include/boost/type_traits/detail/composite_pointer_type.hpp include/boost/type_traits/detail/config.hpp +include/boost/type_traits/detail/detector.hpp include/boost/type_traits/detail/has_binary_operator.hpp include/boost/type_traits/detail/has_postfix_operator.hpp include/boost/type_traits/detail/has_prefix_operator.hpp @@ -12992,11 +13405,14 @@ include/boost/type_traits/detail/ice_not.hpp include/boost/type_traits/detail/ice_or.hpp include/boost/type_traits/detail/is_function_ptr_helper.hpp include/boost/type_traits/detail/is_function_ptr_tester.hpp +include/boost/type_traits/detail/is_likely_lambda.hpp include/boost/type_traits/detail/is_mem_fun_pointer_impl.hpp include/boost/type_traits/detail/is_mem_fun_pointer_tester.hpp include/boost/type_traits/detail/mp_defer.hpp include/boost/type_traits/detail/template_arity_spec.hpp include/boost/type_traits/detail/yes_no_type.hpp +include/boost/type_traits/detected.hpp +include/boost/type_traits/detected_or.hpp include/boost/type_traits/extent.hpp include/boost/type_traits/floating_point_promotion.hpp include/boost/type_traits/function_traits.hpp @@ -13063,6 +13479,7 @@ include/boost/type_traits/is_base_and_derived.hpp include/boost/type_traits/is_base_of.hpp include/boost/type_traits/is_base_of_tr1.hpp include/boost/type_traits/is_class.hpp +include/boost/type_traits/is_complete.hpp include/boost/type_traits/is_complex.hpp include/boost/type_traits/is_compound.hpp include/boost/type_traits/is_const.hpp @@ -13072,6 +13489,9 @@ include/boost/type_traits/is_copy_assignable.hpp include/boost/type_traits/is_copy_constructible.hpp include/boost/type_traits/is_default_constructible.hpp include/boost/type_traits/is_destructible.hpp +include/boost/type_traits/is_detected.hpp +include/boost/type_traits/is_detected_convertible.hpp +include/boost/type_traits/is_detected_exact.hpp include/boost/type_traits/is_empty.hpp include/boost/type_traits/is_enum.hpp include/boost/type_traits/is_final.hpp @@ -13080,12 +13500,14 @@ include/boost/type_traits/is_floating_point.hpp include/boost/type_traits/is_function.hpp include/boost/type_traits/is_fundamental.hpp include/boost/type_traits/is_integral.hpp +include/boost/type_traits/is_list_constructible.hpp include/boost/type_traits/is_lvalue_reference.hpp include/boost/type_traits/is_member_function_pointer.hpp include/boost/type_traits/is_member_object_pointer.hpp include/boost/type_traits/is_member_pointer.hpp include/boost/type_traits/is_nothrow_move_assignable.hpp include/boost/type_traits/is_nothrow_move_constructible.hpp +include/boost/type_traits/is_nothrow_swappable.hpp include/boost/type_traits/is_object.hpp include/boost/type_traits/is_pod.hpp include/boost/type_traits/is_pointer.hpp @@ -13104,6 +13526,7 @@ include/boost/type_traits/is_volatile.hpp include/boost/type_traits/make_signed.hpp include/boost/type_traits/make_unsigned.hpp include/boost/type_traits/make_void.hpp +include/boost/type_traits/nonesuch.hpp include/boost/type_traits/object_traits.hpp include/boost/type_traits/promote.hpp include/boost/type_traits/rank.hpp @@ -13542,6 +13965,7 @@ include/boost/utility/declval.hpp include/boost/utility/detail/ include/boost/utility/detail/in_place_factory_prefix.hpp include/boost/utility/detail/in_place_factory_suffix.hpp +include/boost/utility/detail/minstd_rand.hpp include/boost/utility/detail/result_of_iterate.hpp include/boost/utility/enable_if.hpp include/boost/utility/explicit_operator_bool.hpp @@ -13560,16 +13984,23 @@ include/boost/uuid/basic_name_generator.hpp include/boost/uuid/detail/ include/boost/uuid/detail/config.hpp include/boost/uuid/detail/md5.hpp -include/boost/uuid/detail/seed_rng.hpp +include/boost/uuid/detail/random_provider.hpp +include/boost/uuid/detail/random_provider_arc4random.ipp +include/boost/uuid/detail/random_provider_bcrypt.ipp +include/boost/uuid/detail/random_provider_detect_platform.hpp +include/boost/uuid/detail/random_provider_getentropy.ipp +include/boost/uuid/detail/random_provider_include_platform.hpp +include/boost/uuid/detail/random_provider_posix.ipp +include/boost/uuid/detail/random_provider_wincrypt.ipp include/boost/uuid/detail/sha1.hpp include/boost/uuid/detail/uuid_generic.ipp include/boost/uuid/detail/uuid_x86.ipp +include/boost/uuid/entropy_error.hpp include/boost/uuid/name_generator.hpp include/boost/uuid/name_generator_md5.hpp include/boost/uuid/name_generator_sha1.hpp include/boost/uuid/nil_generator.hpp include/boost/uuid/random_generator.hpp -include/boost/uuid/seed_rng.hpp include/boost/uuid/sha1.hpp include/boost/uuid/string_generator.hpp include/boost/uuid/uuid.hpp @@ -13794,9 +14225,13 @@ include/boost/wave/cpplexer/cpplexer_exceptions.hpp include/boost/wave/cpplexer/detect_include_guards.hpp include/boost/wave/cpplexer/re2clex/ include/boost/wave/cpplexer/re2clex/aq.hpp +include/boost/wave/cpplexer/re2clex/cpp.re include/boost/wave/cpplexer/re2clex/cpp_re.hpp +include/boost/wave/cpplexer/re2clex/cpp_re.inc include/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp include/boost/wave/cpplexer/re2clex/scanner.hpp +include/boost/wave/cpplexer/re2clex/strict_cpp.re +include/boost/wave/cpplexer/re2clex/strict_cpp_re.inc include/boost/wave/cpplexer/token_cache.hpp include/boost/wave/cpplexer/validate_universal_char.hpp include/boost/wave/grammars/ @@ -14046,6 +14481,10 @@ include/boost/xpressive/xpressive_typeof.hpp @lib lib/libboost_container-mt.so.${LIBboost_container-mt_VERSION} @static-lib lib/libboost_container.a @lib lib/libboost_container.so.${LIBboost_container_VERSION} +@static-lib lib/libboost_contract-mt.a +@lib lib/libboost_contract-mt.so.${LIBboost_contract-mt_VERSION} +@static-lib lib/libboost_contract.a +@lib lib/libboost_contract.so.${LIBboost_contract_VERSION} @static-lib lib/libboost_date_time-mt.a @lib lib/libboost_date_time-mt.so.${LIBboost_date_time-mt_VERSION} @static-lib lib/libboost_date_time.a @@ -14098,14 +14537,14 @@ include/boost/xpressive/xpressive_typeof.hpp @lib lib/libboost_math_tr1l-mt.so.${LIBboost_math_tr1l-mt_VERSION} @static-lib lib/libboost_math_tr1l.a @lib lib/libboost_math_tr1l.so.${LIBboost_math_tr1l_VERSION} -@static-lib lib/libboost_num${MODPY_PY_PREFIX}mt.a -@lib lib/libboost_num${MODPY_PY_PREFIX}mt.so.${LIBboost_num${MODPY_PY_PREFIX}mt_VERSION} -@static-lib lib/libboost_numpy.a -@lib lib/libboost_numpy.so.${LIBboost_numpy_VERSION} -@static-lib lib/libboost_numpy3-mt.a -@lib lib/libboost_numpy3-mt.so.${LIBboost_numpy3-mt_VERSION} -@static-lib lib/libboost_numpy3.a -@lib lib/libboost_numpy3.so.${LIBboost_numpy3_VERSION} +@static-lib lib/libboost_numpy27-mt.a +@lib lib/libboost_numpy27-mt.so.${LIBboost_numpy27-mt_VERSION} +@static-lib lib/libboost_numpy27.a +@lib lib/libboost_numpy27.so.${LIBboost_numpy27_VERSION} +@static-lib lib/libboost_numpy38-mt.a +@lib lib/libboost_numpy38-mt.so.${LIBboost_numpy38-mt_VERSION} +@static-lib lib/libboost_numpy38.a +@lib lib/libboost_numpy38.so.${LIBboost_numpy38_VERSION} @static-lib lib/libboost_prg_exec_monitor-mt.a @lib lib/libboost_prg_exec_monitor-mt.so.${LIBboost_prg_exec_monitor-mt_VERSION} @static-lib lib/libboost_prg_exec_monitor.a @@ -14114,14 +14553,14 @@ include/boost/xpressive/xpressive_typeof.hpp @lib lib/libboost_program_options-mt.so.${LIBboost_program_options-mt_VERSION} @static-lib lib/libboost_program_options.a @lib lib/libboost_program_options.so.${LIBboost_program_options_VERSION} -@static-lib lib/libboost_python-mt.a -@lib lib/libboost_python-mt.so.${LIBboost_python-mt_VERSION} -@static-lib lib/libboost_python.a -@lib lib/libboost_python.so.${LIBboost_python_VERSION} -@static-lib lib/libboost_python3-mt.a -@lib lib/libboost_python3-mt.so.${LIBboost_python3-mt_VERSION} -@static-lib lib/libboost_python3.a -@lib lib/libboost_python3.so.${LIBboost_python3_VERSION} +@static-lib lib/libboost_python27-mt.a +@lib lib/libboost_python27-mt.so.${LIBboost_python27-mt_VERSION} +@static-lib lib/libboost_python27.a +@lib lib/libboost_python27.so.${LIBboost_python27_VERSION} +@static-lib lib/libboost_python38-mt.a +@lib lib/libboost_python38-mt.so.${LIBboost_python38-mt_VERSION} +@static-lib lib/libboost_python38.a +@lib lib/libboost_python38.so.${LIBboost_python38_VERSION} @static-lib lib/libboost_random-mt.a @lib lib/libboost_random-mt.so.${LIBboost_random-mt_VERSION} @static-lib lib/libboost_random.a @@ -14271,7 +14710,6 @@ share/boost-build/tools/clang.jam share/boost-build/tools/common.jam share/boost-build/tools/common.py share/boost-build/tools/common.pyc -share/boost-build/tools/common_clang_vc.jam share/boost-build/tools/como-linux.jam share/boost-build/tools/como-win.jam share/boost-build/tools/como.jam @@ -14329,6 +14767,7 @@ share/boost-build/tools/features/name-feature.jam share/boost-build/tools/features/objcflags-feature.jam share/boost-build/tools/features/optimization-feature.jam share/boost-build/tools/features/os-feature.jam +share/boost-build/tools/features/relevant-feature.jam share/boost-build/tools/features/rtti-feature.jam share/boost-build/tools/features/runtime-feature.jam share/boost-build/tools/features/search-feature.jam @@ -14343,6 +14782,7 @@ share/boost-build/tools/features/user-interface-feature.jam share/boost-build/tools/features/variant-feature.jam share/boost-build/tools/features/version-feature.jam share/boost-build/tools/features/warnings-feature.jam +share/boost-build/tools/flags.jam share/boost-build/tools/fop.jam share/boost-build/tools/fortran.jam share/boost-build/tools/gcc.jam @@ -14483,6 +14923,7 @@ share/boost-build/tools/xsltproc/included.xsl share/boost-build/tools/xsltproc/test.xml share/boost-build/tools/xsltproc/test.xsl share/boost-build/tools/zlib.jam +share/boost-build/tools/zstd.jam share/boost-build/util/ share/boost-build/util/__init__.py share/boost-build/util/__init__.pyc @@ -14504,6 +14945,7 @@ share/boost-build/util/order.pyc share/boost-build/util/os.jam share/boost-build/util/os_j.py share/boost-build/util/os_j.pyc +share/boost-build/util/param.jam share/boost-build/util/path.jam share/boost-build/util/path.py share/boost-build/util/path.pyc diff --git a/devel/yaml-cpp/Makefile b/devel/yaml-cpp/Makefile index 97d896f2db4..31f47504a9f 100644 --- a/devel/yaml-cpp/Makefile +++ b/devel/yaml-cpp/Makefile @@ -7,7 +7,7 @@ GH_ACCOUNT= jbeder GH_PROJECT= yaml-cpp GH_TAGNAME= release-$V DISTNAME = yaml-cpp-$V -REVISION = 6 +REVISION = 7 SHARED_LIBS = yaml-cpp 2.0 # 0.5 diff --git a/devel/yaml-cpp/patches/patch-include_yaml-cpp_node_detail_iterator_h b/devel/yaml-cpp/patches/patch-include_yaml-cpp_node_detail_iterator_h new file mode 100644 index 00000000000..8df667d054f --- /dev/null +++ b/devel/yaml-cpp/patches/patch-include_yaml-cpp_node_detail_iterator_h @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: include/yaml-cpp/node/detail/iterator.h +--- include/yaml-cpp/node/detail/iterator.h.orig ++++ include/yaml-cpp/node/detail/iterator.h +@@ -44,7 +44,7 @@ namespace YAML + private: + friend class boost::iterator_core_access; + +- void increment() { this->base_reference() = boost::next(this->base()); } ++ void increment() { this->base_reference() = std::next(this->base()); } + + value_type dereference() const { + const typename base_type::value_type& v = *this->base(); diff --git a/devel/yaml-cpp/patches/patch-src_node_data_cpp b/devel/yaml-cpp/patches/patch-src_node_data_cpp new file mode 100644 index 00000000000..bd3e32308b3 --- /dev/null +++ b/devel/yaml-cpp/patches/patch-src_node_data_cpp @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/node_data.cpp +--- src/node_data.cpp.orig ++++ src/node_data.cpp +@@ -97,7 +97,7 @@ namespace YAML + { + kv_pairs::iterator it = m_undefinedPairs.begin(); + while(it != m_undefinedPairs.end()) { +- kv_pairs::iterator jt = boost::next(it); ++ kv_pairs::iterator jt = std::next(it); + if(it->first->is_defined() && it->second->is_defined()) + m_undefinedPairs.erase(it); + it = jt; diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile index 310ce118edc..4fb9019cc39 100644 --- a/games/freeorion/Makefile +++ b/games/freeorion/Makefile @@ -5,6 +5,7 @@ COMMENT = turn-based space empire and galactic conquest computer game DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source PKGNAME = freeorion-${V} CATEGORIES = games +REVISION = 0 HOMEPAGE = https://www.freeorion.org/ MAINTAINER = Tom Murphy <[email protected]> @@ -16,10 +17,10 @@ PERMIT_PACKAGE = Yes WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU SDL2 boost_atomic-mt WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt -WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt -WANTLIB += boost_system-mt boost_thread-mt c -WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc -WANTLIB += vorbisfile z +WANTLIB += boost_python${MODPY_VERSION:C/\.//g}-mt boost_regex-mt boost_serialization-mt +WANTLIB += boost_system-mt boost_thread-mt c freetype m ogg openal +WANTLIB += png ${MODPY_WANTLIB} vorbis vorbisenc vorbisfile z + MASTER_SITES = https://github.com/freeorion/freeorion/releases/download/v${V}/ @@ -39,7 +40,7 @@ LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \ audio/libvorbis \ audio/openal \ devel/sdl2 \ - devel/boost \ + devel/boost>=1.67.0 \ graphics/glew \ graphics/png diff --git a/games/returntotheroots/Makefile b/games/returntotheroots/Makefile index fef3c96a09b..882aa4a09ac 100644 --- a/games/returntotheroots/Makefile +++ b/games/returntotheroots/Makefile @@ -5,7 +5,7 @@ COMMENT = open source engine remake of The Settlers 2 (s25client) DISTNAME = s25client-${V} PKGNAME = returntotheroots-${V} CATEGORIES = games x11 -REVISION = 2 +REVISION = 3 ONLY_FOR_ARCHS = i386 amd64 diff --git a/games/returntotheroots/patches/patch-libutil_src_getExecutablePath_cpp b/games/returntotheroots/patches/patch-libutil_src_getExecutablePath_cpp index 8f1346b3ea1..102741b89f1 100644 --- a/games/returntotheroots/patches/patch-libutil_src_getExecutablePath_cpp +++ b/games/returntotheroots/patches/patch-libutil_src_getExecutablePath_cpp @@ -10,7 +10,7 @@ Index: libutil/src/getExecutablePath.cpp std::string getExecutablePath() { +#ifdef __OpenBSD__ -+ return "${LOCALBASE}/bin/s25client"; ++ return "/usr/local/bin/s25client"; +#else int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1}; std::vector<char> buf(1024, 0); diff --git a/games/returntotheroots/patches/patch-libutil_src_tmpFile_cpp b/games/returntotheroots/patches/patch-libutil_src_tmpFile_cpp new file mode 100644 index 00000000000..6eb1122e32e --- /dev/null +++ b/games/returntotheroots/patches/patch-libutil_src_tmpFile_cpp @@ -0,0 +1,25 @@ +$OpenBSD$ + +Index: libutil/src/tmpFile.cpp +--- libutil/src/tmpFile.cpp.orig ++++ libutil/src/tmpFile.cpp +@@ -25,7 +25,9 @@ + #include <unistd.h> + #endif + +-/// Creates and opens a temporary binary file with the given extension ++namespace bnw = boost::nowide; ++namespace bfs = boost::filesystem; ++ + /// file must be a closed file stream and open() will be called on it + /// Returns the filename used or an empty string on error + std::string createTempFile(bnw::ofstream& file, const std::string& ext /* = ".tmp"*/) +@@ -47,7 +49,7 @@ std::string createTempFile(bnw::ofstream& file, const + if(bfs::exists(filePath)) + continue; + // Try to open and place cursor at end if it exists (shouldn't be the case but might be...) +- file.open(filePath, std::ios_base::binary | std::ios_base::ate); ++ file.open(filePath.string(), std::ios_base::binary | std::ios_base::ate); + if(!file) + continue; + if(file.tellp() > 0) diff --git a/games/returntotheroots/patches/patch-src_MusicPlayer_cpp b/games/returntotheroots/patches/patch-src_MusicPlayer_cpp new file mode 100644 index 00000000000..85192a085e1 --- /dev/null +++ b/games/returntotheroots/patches/patch-src_MusicPlayer_cpp @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/MusicPlayer.cpp +--- src/MusicPlayer.cpp.orig ++++ src/MusicPlayer.cpp +@@ -108,7 +108,7 @@ bool Playlist::Load(const std::string& filename) + bfs::path filepath(filename); + if(filepath.extension() != ".pll") + filepath.replace_extension("pll"); +- bnw::ifstream in(filepath); ++ bnw::ifstream in(filepath.string()); + + if(in.fail()) + return false; diff --git a/games/returntotheroots/patches/patch-src_test_testFileIO_cpp b/games/returntotheroots/patches/patch-src_test_testFileIO_cpp new file mode 100644 index 00000000000..5cb99f2f006 --- /dev/null +++ b/games/returntotheroots/patches/patch-src_test_testFileIO_cpp @@ -0,0 +1,27 @@ +$OpenBSD$ + +Index: src/test/testFileIO.cpp +--- src/test/testFileIO.cpp.orig ++++ src/test/testFileIO.cpp +@@ -49,9 +49,9 @@ struct FileOpenFixture + BOOST_TEST_CHECKPOINT("Creating tmp path" << tmpPath); + bfs::create_directories(tmpPath); + BOOST_TEST_CHECKPOINT("Creating files"); +- bnw::ofstream fNormal(tmpPath / fileNormal); +- bnw::ofstream fUmlaut(tmpPath / fileUmlaut); +- bnw::ofstream fSpecial(tmpPath / fileSpecial); ++ bnw::ofstream fNormal(tmpPath.string() +"/"+ fileNormal.string()); ++ bnw::ofstream fUmlaut(tmpPath.string() +"/"+ fileUmlaut.string()); ++ bnw::ofstream fSpecial(tmpPath.string()+ "/"+ fileSpecial.string()); + BOOST_TEST_CHECKPOINT("Filling files"); + fNormal << "OK"; + fUmlaut << "OK"; +@@ -80,7 +80,7 @@ BOOST_FIXTURE_TEST_CASE(TestListDir, FileOpenFixture) + // Scopes for auto-close + { + // path input +- bnw::ifstream sFile(filePath); ++ bnw::ifstream sFile(filePath.string()); + BOOST_REQUIRE(sFile); + std::string content; + BOOST_REQUIRE(sFile >> content); diff --git a/games/vegastrike/engine/Makefile b/games/vegastrike/engine/Makefile index db67bead828..f72c087e0f3 100644 --- a/games/vegastrike/engine/Makefile +++ b/games/vegastrike/engine/Makefile @@ -4,15 +4,15 @@ COMMENT = 3D space simulator DISTNAME = vegastrike-src-${V} PKGNAME = vegastrike-${V} -REVISION = 5 +REVISION = 7 WANTLIB += GL GLU OgreMain SDL X11 Xcomposite Xcursor Xdamage WANTLIB += Xext Xfixes Xi Xinerama Xmu Xrandr Xrender atk-1.0 -WANTLIB += boost_python boost_thread-mt c cairo expat fontconfig +WANTLIB += boost_python${MODPY_VERSION:C/\.//g} boost_thread-mt c cairo expat fontconfig WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += glut gobject-2.0 gtk-x11-2.0 iconv intl jpeg m ogg openal pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 png pthread ${COMPILER_LIBCXX} util -WANTLIB += vorbis vorbisfile z python2.7 +WANTLIB += vorbis vorbisfile z python2.7 harfbuzz COMPILER = base-clang ports-gcc base-gcc @@ -22,7 +22,7 @@ MODULES = lang/python RUN_DEPENDS = games/vegastrike/data>=${V} LIB_DEPENDS = x11/gtk+2 \ audio/openal \ - devel/boost \ + devel/boost>=1.67.0 \ audio/libvorbis \ x11/ogre \ graphics/freeglut \ diff --git a/games/vegastrike/engine/patches/patch-Makefile_in b/games/vegastrike/engine/patches/patch-Makefile_in index 7f2c826fb44..877e4d45543 100644 --- a/games/vegastrike/engine/patches/patch-Makefile_in +++ b/games/vegastrike/engine/patches/patch-Makefile_in @@ -13,6 +13,24 @@ Index: Makefile.in CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ +@@ -1532,7 +1532,7 @@ vegastrike_LDADD_1 = $(noinst_LIBRARIES) \ + + @BOOSTSYSTEM_FALSE@vegastrike_LDADD = $(vegastrike_LDADD_1) + @BOOSTSYSTEM_TRUE@vegastrike_LDADD = $(vegastrike_LDADD_1) \ +-@BOOSTSYSTEM_TRUE@ -lboost_python ++@BOOSTSYSTEM_TRUE@ -lboost_python27 + + vegastrike_DEPENDENCIES = $(noinst_LIBRARIES) + vegaserver_LDADD_1 = $(noinst_LIBRARIES) \ +@@ -1540,7 +1540,7 @@ vegaserver_LDADD_1 = $(noinst_LIBRARIES) \ + + @BOOSTSYSTEM_FALSE@vegaserver_LDADD = $(vegaserver_LDADD_1) + @BOOSTSYSTEM_TRUE@vegaserver_LDADD = $(vegaserver_LDADD_1) \ +-@BOOSTSYSTEM_TRUE@ -lboost_python ++@BOOSTSYSTEM_TRUE@ -lboost_python27 + + vegaserver_DEPENDENCIES = $(noinst_LIBRARIES) + librootclient = \ @@ -1894,7 +1894,7 @@ base_maker_SOURCES = \ src/xml_support.h diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile index 022a9487b41..0e4a52ffba0 100644 --- a/graphics/openexr/Makefile +++ b/graphics/openexr/Makefile @@ -9,7 +9,7 @@ GH_ACCOUNT= AcademySoftwareFoundation GH_PROJECT= openexr GH_TAGNAME= v${V} -REVISION-main= 0 +REVISION-main= 1 REVISION-tools= 0 REVISION-doc= 0 @@ -50,12 +50,12 @@ CXXFLAGS += -mxgot CONFIGURE_ARGS= -DCMAKE_EXE_LINKER_FLAGS="-L${LOCALBASE}/lib" WANTLIB-main += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} -WANTLIB-main += boost_python3-mt intl m util z +WANTLIB-main += boost_python${MODPY_VERSION:C/\.//g}-mt intl m util z BUILD_DEPENDS= math/py-numpy${MODPY_FLAVOR} LIB_DEPENDS-main += ${MODPY_LIB_DEPENDS} \ - devel/boost + devel/boost>=1.67.0 WANTLIB-tools += ${COMPILER_LIBCXX} Half-2_5 Iex-2_5 IexMath-2_5 IlmImf-2_5 WANTLIB-tools += IlmThread-2_5 Imath-2_5 c m z diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index f0eb825f89c..ed7c3cd6315 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -10,7 +10,7 @@ GH_PROJECT = oiio V = 1.8.6 GH_TAGNAME = Release-$V DISTNAME = openimageio-${V} -REVISION = 7 +REVISION = 9 SHARED_LIBS += OpenImageIO 5.0 # 1.0 SHARED_LIBS += OpenImageIO_Util 2.0 # 1.5 @@ -28,7 +28,7 @@ WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} WANTLIB += GL GLEW GLU Half-2_5 Iex-2_5 IlmImf-2_5 IlmThread-2_5 WANTLIB += Imath-2_5 OpenColorIO Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets WANTLIB += avcodec avformat avutil boost_atomic-mt boost_chrono-mt -WANTLIB += boost_date_time-mt boost_filesystem-mt boost_python-mt +WANTLIB += boost_date_time-mt boost_filesystem-mt boost_python${MODPY_VERSION:C/\.//g}-mt WANTLIB += boost_system-mt boost_thread-mt bz2 c freetype gif WANTLIB += jpeg m openjpeg png raw_r swscale tiff webp z @@ -40,7 +40,7 @@ COMPILER = base-clang ports-gcc BUILD_DEPENDS = textproc/txt2man -LIB_DEPENDS = devel/boost \ +LIB_DEPENDS = devel/boost>=1.67.0 \ graphics/openjpeg \ graphics/tiff \ graphics/libwebp \ diff --git a/graphics/openimageio/patches/patch-src_include_OpenImageIO_strutil_h b/graphics/openimageio/patches/patch-src_include_OpenImageIO_strutil_h index 5ca7020712a..6b3e7e14e2f 100644 --- a/graphics/openimageio/patches/patch-src_include_OpenImageIO_strutil_h +++ b/graphics/openimageio/patches/patch-src_include_OpenImageIO_strutil_h @@ -5,11 +5,11 @@ Add missing header for ports-gcc Index: src/include/OpenImageIO/strutil.h --- src/include/OpenImageIO/strutil.h.orig +++ src/include/OpenImageIO/strutil.h -@@ -43,6 +43,7 @@ +@@ -42,6 +42,7 @@ + #define OPENIMAGEIO_STRUTIL_H #include <string> +#include <cstdarg> #include <cstdio> #include <vector> #include <map> - diff --git a/graphics/openimageio/patches/patch-src_python_CMakeLists_txt b/graphics/openimageio/patches/patch-src_python_CMakeLists_txt new file mode 100644 index 00000000000..02c323fba95 --- /dev/null +++ b/graphics/openimageio/patches/patch-src_python_CMakeLists_txt @@ -0,0 +1,17 @@ +$OpenBSD$ + +fix cmake and boost python: +https://cmake.org/cmake/help/v3.16/module/FindBoost.html + +Index: src/python/CMakeLists.txt +--- src/python/CMakeLists.txt.orig ++++ src/python/CMakeLists.txt +@@ -18,7 +18,7 @@ if (NOT BOOST_CUSTOM) + # different names on different systems. Try the most common ones. + foreach (_py_lib python-${PYTHON_VERSION_FOUND} python + python${PYTHON_VERSION_MAJOR} +- python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) + find_package (Boost QUIET COMPONENTS ${_py_lib}) + string (TOUPPER ${_py_lib} _py_lib_name) + if (Boost_${_py_lib_name}_FOUND) diff --git a/net/libtorrent-rasterbar/Makefile b/net/libtorrent-rasterbar/Makefile index 11fc719f966..c4420c0b50d 100644 --- a/net/libtorrent-rasterbar/Makefile +++ b/net/libtorrent-rasterbar/Makefile @@ -4,7 +4,7 @@ COMMENT = C++ library implementing a BitTorrent client MODPY_EGG_VERSION = 1.2.3 DISTNAME = libtorrent-rasterbar-${MODPY_EGG_VERSION} -REVISION = 0 +REVISION = 1 SHARED_LIBS += torrent-rasterbar 2.0 # 10.0.0 @@ -15,8 +15,8 @@ HOMEPAGE = https://libtorrent.org/ # BSD3 PERMIT_PACKAGE = Yes -WANTLIB += boost_python3 boost_system-mt crypto m ssl -WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} +WANTLIB += boost_python${MODPY_VERSION:C/\.//g} boost_system-mt crypto m ssl +WANTLIB += ${COMPILER_LIBCXX} MASTER_SITES = https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MODPY_EGG_VERSION:S/./_/g}/ @@ -26,7 +26,7 @@ MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} BUILD_DEPENDS = devel/libtool LIB_DEPENDS = converters/libiconv \ - devel/boost + devel/boost>=1.67.0 # boost COMPILER = base-clang ports-gcc @@ -35,7 +35,7 @@ CONFIGURE_STYLE = gnu CONFIGURE_ARGS = --enable-python-binding \ --enable-tests \ --with-boost-system=boost_system-mt \ - --with-boost-python=boost_python3 \ + --with-boost-python=boost_python${MODPY_VERSION:C/\.//g} \ --with-libiconv CONFIGURE_ENV += CPPFLAGS="-Wno-deprecated-declarations \ -Wno-macro-redefined \ diff --git a/www/cclive/Makefile b/www/cclive/Makefile index 2161c175fdb..2c89fc23b79 100644 --- a/www/cclive/Makefile +++ b/www/cclive/Makefile @@ -7,7 +7,7 @@ COMMENT = media download tool DISTNAME = cclive-0.9.3 EXTRACT_SUFX = .tar.xz -REVISION = 6 +REVISION = 7 CATEGORIES = www diff --git a/www/cclive/patches/patch-src_cc_progressbar_h b/www/cclive/patches/patch-src_cc_progressbar_h new file mode 100644 index 00000000000..fb5377c043a --- /dev/null +++ b/www/cclive/patches/patch-src_cc_progressbar_h @@ -0,0 +1,16 @@ +$OpenBSD$ + +Unbreak with boost 1.67.0 + +Index: src/cc/progressbar.h +--- src/cc/progressbar.h.orig ++++ src/cc/progressbar.h +@@ -316,7 +316,7 @@ struct progressbar : boost::noncopyable (private) + + static inline std::string eta_from_seconds(const double s) + { +- const pt::time_duration& td = pt::seconds(s); ++ const pt::time_duration& td = pt::seconds(static_cast<long>(s)); + return pt::to_simple_string(td); + } + diff --git a/x11/kde-applications/kig/Makefile b/x11/kde-applications/kig/Makefile index 5cf17f8c2b8..000a4ddb3f7 100644 --- a/x11/kde-applications/kig/Makefile +++ b/x11/kde-applications/kig/Makefile @@ -11,11 +11,10 @@ WANTLIB += KF5CoreAddons KF5Crash KF5I18n KF5IconThemes KF5JobWidgets WANTLIB += KF5KIOCore KF5KIOWidgets KF5Parts KF5Service KF5SonnetUi WANTLIB += KF5TextEditor KF5TextWidgets KF5WidgetsAddons KF5XmlGui WANTLIB += Qt5Concurrent Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5PrintSupport -WANTLIB += Qt5Svg Qt5Widgets Qt5Xml Qt5XmlPatterns boost_python-mt -WANTLIB += c m ${MODPY_WANTLIB} +WANTLIB += Qt5Svg Qt5Widgets Qt5Xml Qt5XmlPatterns +WANTLIB += c m -MODULES += x11/kde-applications \ - lang/python +MODULES += x11/kde-applications MODKDE5_DESKTOP_FILE = yes MODKDE5_ICON_CACHE = yes @@ -24,8 +23,7 @@ MODKF5_I18N_CONFLICT = yes MODKF5_L10N_CONFLICT = yes MODKDE5_DOCS = yes -LIB_DEPENDS = devel/boost \ - devel/kf5/karchive \ +LIB_DEPENDS = devel/kf5/karchive \ devel/kf5/kauth \ devel/kf5/kcodecs \ devel/kf5/kcompletion \ @@ -47,4 +45,7 @@ LIB_DEPENDS = devel/boost \ x11/qt5/qtsvg \ x11/qt5/qtxmlpatterns +# XXX unbreak boost python support +CONFIGURE_ARGS = -DCMAKE_DISABLE_FIND_PACKAGE_BoostPython=ON + .include <bsd.port.mk> diff --git a/x11/kde-applications/kig/pkg/PLIST b/x11/kde-applications/kig/pkg/PLIST index 7202c74b868..33793c0fd97 100644 --- a/x11/kde-applications/kig/pkg/PLIST +++ b/x11/kde-applications/kig/pkg/PLIST @@ -94,8 +94,6 @@ share/icons/hicolor/64x64/apps/kig.png share/icons/hicolor/64x64/mimetypes/application-x-kig.png share/icons/hicolor/scalable/apps/kig.svgz share/icons/hicolor/scalable/mimetypes/application-x-kig.svgz -share/katepart5/syntax/ -share/katepart5/syntax/python-kig.xml share/kig/ share/kig/builtin-macros/ share/kig/builtin-macros/circle_by_center_and_line.kigt
