Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): replace libboost chrono and thread with standard chrono and thread #1364

Merged
merged 5 commits into from
Jun 26, 2023
Merged

fix(deps): replace libboost chrono and thread with standard chrono and thread #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1287f53
fix(deb): Add missing libboost-chrono to debian deps
Era-Dorta Jun 11, 2023
b5c8dc9
Revert libboost-chrono install
Era-Dorta Jun 11, 2023
27ce5eb
fix(chrono): remove libboost chrono include
Era-Dorta Jun 11, 2023
51ab250
Switch to std::thread
Era-Dorta Jun 12, 2023
9da1730
build(deps): remove boost-thread
ReenigneArcher Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ jobs:
libboost-locale1.71-dev \
libboost-log1.71-dev \
libboost-regex1.71-dev \
libboost-thread1.71-dev \
libboost-program-options1.71-dev
# Install cmake
Expand All @@ -311,7 +310,6 @@ jobs:
libboost-filesystem-dev \
libboost-locale-dev \
libboost-log-dev \
libboost-thread-dev \
libboost-program-options-dev
fi
Expand Down
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,6 @@ elseif(UNIX)
libboost-locale${Boost_VERSION}, \
libboost-log${Boost_VERSION}, \
libboost-program-options${Boost_VERSION}, \
libboost-thread${Boost_VERSION}, \
libcap2, \
libcurl4, \
libdrm2, \
Expand All @@ -926,7 +925,6 @@ elseif(UNIX)
boost-locale >= ${Boost_VERSION}, \
boost-log >= ${Boost_VERSION}, \
boost-program-options >= ${Boost_VERSION}, \
boost-thread >= ${Boost_VERSION}, \
libcap >= 2.22, \
libcurl >= 7.0, \
libdrm >= 2.4.97, \
Expand Down
1 change: 0 additions & 1 deletion docker/debian-bullseye.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ apt-get install -y --no-install-recommends \
libboost-locale-dev=1.74.* \
libboost-log-dev=1.74.* \
libboost-program-options-dev=1.74.* \
libboost-thread-dev=1.74.* \
libcap-dev \
libcurl4-openssl-dev \
libdrm-dev \
Expand Down
1 change: 0 additions & 1 deletion docker/ubuntu-20.04.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ apt-get install -y --no-install-recommends \
libboost-locale-dev=1.71.* \
libboost-log-dev=1.71.* \
libboost-program-options-dev=1.71.* \
libboost-thread-dev=1.71.* \
libcap-dev \
libcurl4-openssl-dev \
libdrm-dev \
Expand Down
1 change: 0 additions & 1 deletion docker/ubuntu-22.04.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ apt-get install -y --no-install-recommends \
libboost-locale-dev=1.74.* \
libboost-log-dev=1.74.* \
libboost-program-options-dev=1.74.* \
libboost-thread-dev=1.74.* \
libcap-dev \
libcurl4-openssl-dev \
libdrm-dev \
Expand Down
3 changes: 0 additions & 3 deletions docs/source/building/linux.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Install Requirements
libboost-locale-dev \
libboost-log-dev \
libboost-program-options-dev \
libboost-thread-dev \
libcap-dev \ # KMS
libcurl4-openssl-dev \
libdrm-dev \ # KMS
Expand Down Expand Up @@ -100,7 +99,6 @@ Install Requirements
libboost-filesystem-dev \
libboost-locale-dev \
libboost-log-dev \
libboost-thread-dev \
libboost-program-options-dev \
libcap-dev \ # KMS
libdrm-dev \ # KMS
Expand Down Expand Up @@ -149,7 +147,6 @@ Install Requirements
libboost-filesystem-dev \
libboost-locale-dev \
libboost-log-dev \
libboost-thread-dev \
libboost-program-options-dev \
libcap-dev \ # KMS
libdrm-dev \ # KMS
Expand Down
7 changes: 3 additions & 4 deletions src/input.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ extern "C" {
}

#include <bitset>
#include <chrono>
#include <thread>
#include <unordered_map>

#include "config.h"
Expand All @@ -19,9 +21,6 @@ extern "C" {
#include "thread_pool.h"
#include "utility.h"

#include <boost/chrono.hpp>
#include <boost/thread/thread.hpp>

using namespace std::literals;
namespace input {

Expand Down Expand Up @@ -738,7 +737,7 @@ namespace input {
platf::gamepad(platf_input, gamepad.id, state);

// Sleep for a short time to allow the input to be detected
boost::this_thread::sleep_for(boost::chrono::milliseconds(100));
std::this_thread::sleep_for(std::chrono::milliseconds(100));

// Release Home button
state.buttonFlags &= ~platf::HOME;
Expand Down