build boost build fix

src/logging.cpp

@@ -7,6 +7,14 @@
 #include <fstream>
 #include <iostream>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+  #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+  #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 // lib includes
 #include <boost/core/null_deleter.hpp>
 #include <boost/log/attributes/clock.hpp>

src/platform/common.h

@@ -4,6 +4,14 @@
  */
 #pragma once
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+  #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+  #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 #include <bitset>
 #include <filesystem>
 #include <functional>

src/platform/linux/kmsgrab.cpp

@@ -2,6 +2,14 @@
  * @file src/platform/linux/kmsgrab.cpp
  * @brief todo
  */
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+  #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+  #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 #include <drm_fourcc.h>
 #include <errno.h>
 #include <fcntl.h>

src/platform/linux/vaapi.cpp

@@ -2,6 +2,14 @@
  * @file src/platform/linux/vaapi.cpp
  * @brief todo
  */
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+  #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+  #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 #include <sstream>
 #include <string>
 

src/platform/linux/wlgrab.cpp

@@ -2,6 +2,14 @@
  * @file src/platform/linux/wlgrab.cpp
  * @brief todo
  */
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+ #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+ #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 #include <thread>
 
 #include "src/platform/common.h"

src/platform/linux/x11grab.cpp

@@ -2,6 +2,13 @@
  * @file src/platform/linux/x11grab.cpp
  * @brief todo
  */
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+  #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+  #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
 #include "src/platform/common.h"
 
 #include <fstream>
@@ -405,7 +412,6 @@ namespace platf {
     int
     init(const std::string &display_name, const ::video::config_t &config) {
       if (!xdisplay) {
-        BOOST_LOG(error) << "Could not open X11 display"sv;
         return -1;
       }
 
@@ -421,7 +427,6 @@ namespace platf {
       }
 
       if (streamedMonitor != -1) {
-        BOOST_LOG(info) << "Configuring selected display ("sv << streamedMonitor << ") to stream"sv;
         screen_res_t screenr { x11::rr::GetScreenResources(xdisplay.get(), xwindow) };
         int output = screenr->noutput;
 
@@ -438,22 +443,18 @@ namespace platf {
         }
 
         if (!result) {
-          BOOST_LOG(error) << "Could not stream display number ["sv << streamedMonitor << "], there are only ["sv << monitor << "] displays."sv;
           return -1;
         }
 
         if (result->crtc) {
           crtc_info_t crt_info { x11::rr::GetCrtcInfo(xdisplay.get(), screenr.get(), result->crtc) };
-          BOOST_LOG(info)
-            << "Streaming display: "sv << result->name << " with res "sv << crt_info->width << 'x' << crt_info->height << " offset by "sv << crt_info->x << 'x' << crt_info->y;
 
           width = crt_info->width;
           height = crt_info->height;
           offset_x = crt_info->x;
           offset_y = crt_info->y;
         }
         else {
-          BOOST_LOG(warning) << "Couldn't get requested display info, defaulting to recording entire virtual desktop"sv;
           width = xattr.width;
           height = xattr.height;
         }
@@ -516,7 +517,6 @@ namespace platf {
             }
             break;
           default:
-            BOOST_LOG(error) << "Unrecognized capture status ["sv << (int) status << ']';
             return status;
         }
       }
@@ -530,7 +530,6 @@ namespace platf {
 
       // The whole X server changed, so we must reinit everything
       if (xattr.width != env_width || xattr.height != env_height) {
-        BOOST_LOG(warning) << "X dimensions changed in non-SHM mode, request reinit"sv;
         return capture_e::reinit;
       }
 

src/platform/windows/display_vram.cpp

@@ -12,6 +12,14 @@ extern "C" {
 #include <libavutil/hwcontext_d3d11va.h>
 }
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+#define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 #include "display.h"
 #include "misc.h"
 #include "src/config.h"
@@ -1009,7 +1017,6 @@ namespace platf::dxgi {
       // Get the texture object from this frame
       status = res->QueryInterface(IID_ID3D11Texture2D, (void **) &src);
       if (FAILED(status)) {
-        BOOST_LOG(error) << "Couldn't query interface [0x"sv << util::hex(status).to_string_view() << ']';
         return capture_e::error;
       }
 
@@ -1019,20 +1026,17 @@ namespace platf::dxgi {
       // It's possible for our display enumeration to race with mode changes and result in
       // mismatched image pool and desktop texture sizes. If this happens, just reinit again.
       if (desc.Width != width_before_rotation || desc.Height != height_before_rotation) {
-        BOOST_LOG(info) << "Capture size changed ["sv << width << 'x' << height << " -> "sv << desc.Width << 'x' << desc.Height << ']';
         return capture_e::reinit;
       }
 
       // If we don't know the capture format yet, grab it from this texture
       if (capture_format == DXGI_FORMAT_UNKNOWN) {
         capture_format = desc.Format;
-        BOOST_LOG(info) << "Capture format ["sv << dxgi_format_to_string(capture_format) << ']';
       }
 
       // It's also possible for the capture format to change on the fly. If that happens,
       // reinitialize capture to try format detection again and create new images.
       if (capture_format != desc.Format) {
-        BOOST_LOG(info) << "Capture format changed ["sv << dxgi_format_to_string(capture_format) << " -> "sv << dxgi_format_to_string(desc.Format) << ']';
         return capture_e::reinit;
       }
     }
@@ -1129,7 +1133,6 @@ namespace platf::dxgi {
       t.BindFlags = 0;
       status = device->CreateTexture2D(&t, nullptr, &surface);
       if (FAILED(status)) {
-        BOOST_LOG(error) << "Failed to create frame copy texture [0x"sv << util::hex(status).to_string_view() << ']';
         return false;
       }
 
@@ -1147,7 +1150,6 @@ namespace platf::dxgi {
       // we must acquire lock before doing anything to it.
       texture_lock_helper lock_helper(d3d_img->capture_mutex.get());
       if (!lock_helper.lock()) {
-        BOOST_LOG(error) << "Failed to lock capture texture";
         return { nullptr, nullptr };
       }
 
@@ -1165,7 +1167,6 @@ namespace platf::dxgi {
       case lfa::replace_surface_with_img: {
         auto p_surface = std::get_if<texture2d_t>(&last_frame_variant);
         if (!p_surface) {
-          BOOST_LOG(error) << "Logical error at " << __FILE__ << ":" << __LINE__;
           return capture_e::error;
         }
 
@@ -1188,7 +1189,6 @@ namespace platf::dxgi {
       case lfa::replace_img_with_surface: {
         auto p_img = std::get_if<std::shared_ptr<platf::img_t>>(&last_frame_variant);
         if (!p_img) {
-          BOOST_LOG(error) << "Logical error at " << __FILE__ << ":" << __LINE__;
           return capture_e::error;
         }
         auto [d3d_img, lock] = get_locked_d3d_img(*p_img);

src/platform/windows/misc.cpp

@@ -8,6 +8,14 @@
 #include <set>
 #include <sstream>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+  #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+  #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 #include <boost/algorithm/string.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <boost/process.hpp>

src/platform/windows/publish.cpp

@@ -9,6 +9,13 @@
 #include <windns.h>
 #include <winerror.h>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+  #define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+  #define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
 #include <boost/asio/ip/host_name.hpp>
 
 #include "misc.h"

src/rtsp.cpp

@@ -13,6 +13,14 @@ extern "C" {
 #include <cctype>
 #include <utility>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION / 100 >= 1073 && BOOST_VERSION / 100 <= 1076)  // Boost 1.73 - 1.76
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
+#endif
+#if (BOOST_VERSION / 100 == 1074)  // Boost 1.74
+#define BOOST_ALLOW_DEPRECATED_HEADERS
+#endif
+
 #include <boost/asio.hpp>
 #include <boost/bind.hpp>