From e4966a6245099d5b3f3a6ceda69069c1f0cb582d Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Thu, 14 Apr 2022 19:05:36 +0200
Subject: [PATCH] Remove the now obsolete with-static-boost option

---
 .github/workflows/build.yml | 6 +++---
 CHANGELOG.md                | 5 +++++
 meson.build                 | 3 +--
 meson_options.txt           | 9 ++-------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e04667e..54401b4e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
 
           # Statically link to libstdc++ on Ubuntu 18.04 as we're compiling
           # with a newer version of g++ than what's in the default repos
-          meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-static-boost=true -Dwith-bitbridge=true -Dcpp_link_args='-mwindows -static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++'
+          meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-bitbridge=true -Dcpp_link_args='-mwindows -static-libstdc++' -Dbuild.cpp_link_args='-static-libstdc++'
           ninja -C build
       - name: Strip remaining debug symbols
         run: strip build/libyabridge-{vst2,vst3}.so build/yabridge-{host,group}{,-32}.exe.so
@@ -84,7 +84,7 @@ jobs:
           # In this version we don't need to statically link libstdc++ since
           # Ubuntu 20.04 and similar distros will ship with a version that's
           # compatible with GCC 10, even if that's not the default GCC version
-          meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-static-boost=true -Dwith-bitbridge=true
+          meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-bitbridge=true
           ninja -C build
       - name: Strip remaining debug symbols
         run: strip build/libyabridge-{vst2,vst3}.so build/yabridge-{host,group}{,-32}.exe.so
@@ -124,7 +124,7 @@ jobs:
 
           # Statically link to libstdc++ on Ubuntu 18.04, and also target a
           # 32-bit OS
-          meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-static-boost=true -Dwith-bitbridge=true -Dcpp_link_args='-mwindows -static-libstdc++' -Dbuild.cpp_args='-m32' -Dbuild.cpp_link_args='-m32 -static-libstdc++'
+          meson setup build --buildtype=release --cross-file=cross-wine.conf --unity=on --unity-size=10000 -Dwith-bitbridge=true -Dcpp_link_args='-mwindows -static-libstdc++' -Dbuild.cpp_args='-m32' -Dbuild.cpp_link_args='-m32 -static-libstdc++'
           ninja -C build
       - name: Strip remaining debug symbols
         run: strip build/libyabridge-{vst2,vst3}.so build/yabridge-{host,group}{,-32}.exe.so
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4c82d71..3f200212 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 - `effProcessEvents` VST2 calls are now filtered out from the log when
   `YABRIDGE_DEBUG_LEVEL` is set to 1.
 
+### Removed
+
+- Removed the `with-static-boost` build option since there's no longer a
+  dependency on Boost.Filesystem.
+
 ### Fixed
 
 - Fixed an obscure issue with VST3 plugins crashing in **Ardour** on
diff --git a/meson.build b/meson.build
index 1a3c7e89..9e5fcb6d 100644
--- a/meson.build
+++ b/meson.build
@@ -22,7 +22,6 @@ project(
 is_64bit_system = build_machine.cpu_family() not in ['x86', 'arm']
 with_32bit_libraries = (not is_64bit_system) or get_option('build.cpp_args').contains('-m32')
 with_bitbridge = get_option('with-bitbridge')
-with_static_boost = get_option('with-static-boost')
 with_winedbg = get_option('with-winedbg')
 with_vst3 = get_option('with-vst3')
 
@@ -185,7 +184,7 @@ endif
 
 asio_dep = dependency('asio', version : '>=1.22.0')
 # TODO: Get rid of the last Boost bits and pieces
-boost_dep = dependency('boost', version : '>=1.66', static : with_static_boost)
+boost_dep = dependency('boost', version : '>=1.66')
 if meson.version().version_compare('>=0.60')
   # Bitsery's CMake build definition is capitalized for some reason
   bitsery_dep = dependency('bitsery', 'Bitsery', version : '>=5.2.0')
diff --git a/meson_options.txt b/meson_options.txt
index f56ae55a..c6b722aa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,3 +1,5 @@
+# TODO: For yabridge 4.0, remove the `with-` prefix from these options
+
 option(
   'with-bitbridge',
   type : 'boolean',
@@ -5,13 +7,6 @@ option(
   description : 'Build a 32-bit host application for hosting 32-bit plugins. See the readme for full instructions on how to use this.'
 )
 
-option(
-  'with-static-boost',
-  type : 'boolean',
-  value : false,
-  description : 'Enable static linking for Boost. Needed when distributing the binaries to other systems.'
-)
-
 option(
   'with-vst3',
   type : 'boolean',