diff --git a/CMakeLists.txt b/CMakeLists.txt index 8bbe1a2d4..9a11c15aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -77,6 +77,9 @@ find_package(spdlog) find_package(Etherlab) find_package(Lua) +# For compat between libfmt 8 and 9 +add_compile_definitions(FMT_DEPRECATED_OSTREAM) + # Check for tools find_program(PASTE NAMES paste) if(NOT PASTE) diff --git a/packaging/deps.sh b/packaging/deps.sh index 3b1d28b22..e4dfbecdf 100644 --- a/packaging/deps.sh +++ b/packaging/deps.sh @@ -303,15 +303,14 @@ if ! pkg-config "spdlog >= 1.8.2" && \ fi # Build & Install libwebsockets -if ! pkg-config "libwebsockets >= 3.1.0" && \ +if ! pkg-config "libwebsockets >= 4.3.0" && \ [ -z "${SKIP_WEBSOCKETS}" ]; then - git clone ${GIT_OPTS} --branch v4.0-stable https://libwebsockets.org/repo/libwebsockets + git clone ${GIT_OPTS} --branch v4.3-stable https://github.com/warmcat/libwebsockets mkdir -p libwebsockets/build pushd libwebsockets/build cmake -DLWS_WITH_IPV6=ON \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_WITHOUT_EXTENSIONS=OFF \ - -DLWS_WITH_SERVER_STATUS=ON \ ${CMAKE_OPTS} .. make ${MAKE_OPTS} install popd diff --git a/packaging/docker/Dockerfile.debian b/packaging/docker/Dockerfile.debian index 12a5b2c05..f2aa59c7f 100644 --- a/packaging/docker/Dockerfile.debian +++ b/packaging/docker/Dockerfile.debian @@ -7,7 +7,7 @@ # You can choose between Debian and Ubuntu here ARG DISTRO=debian -ARG DEBIAN_VERSION=bullseye +ARG DEBIAN_VERSION=bookworm FROM ${DISTRO}:${DEBIAN_VERSION} AS dev diff --git a/packaging/docker/Dockerfile.fedora-minimal b/packaging/docker/Dockerfile.fedora-minimal index f095a5603..5124baca2 100644 --- a/packaging/docker/Dockerfile.fedora-minimal +++ b/packaging/docker/Dockerfile.fedora-minimal @@ -6,7 +6,7 @@ ################################################################################### ARG DISTRO=fedora -ARG FEDORA_VERSION=34 +ARG FEDORA_VERSION=36 FROM ${DISTRO}:${FEDORA_VERSION} AS dev diff --git a/packaging/docker/Dockerfile.rocky b/packaging/docker/Dockerfile.rocky index c9aac273c..30bea298e 100644 --- a/packaging/docker/Dockerfile.rocky +++ b/packaging/docker/Dockerfile.rocky @@ -6,7 +6,7 @@ ################################################################################### ARG DISTRO=rockylinux -ARG ROCKY_VERSION=8 +ARG ROCKY_VERSION=9 FROM ${DISTRO}:${ROCKY_VERSION} AS dev @@ -16,13 +16,13 @@ USER root # Enable Extra Packages for Enterprise Linux (EPEL) repo and PowerTools RUN dnf -y install epel-release dnf-plugins-core -RUN dnf config-manager --set-enabled powertools +RUN dnf config-manager --set-enabled crb # Toolchain -RUN dnf -y install \ +RUN dnf --allowerasing -y install \ gcc gcc-c++ \ pkgconfig cmake make \ - autoconf automake autogen libtool \ + autoconf automake libtool \ flex bison \ texinfo git curl tar \ protobuf-compiler protobuf-c-compiler diff --git a/packaging/docker/Dockerfile.ubuntu b/packaging/docker/Dockerfile.ubuntu index 7fe4c9a48..50136383a 100644 --- a/packaging/docker/Dockerfile.ubuntu +++ b/packaging/docker/Dockerfile.ubuntu @@ -7,7 +7,7 @@ # You can choose between Debian and Ubuntu here ARG DISTRO=ubuntu -ARG UBUNTU_VERSION=20.04 +ARG UBUNTU_VERSION=22.04 ARG DISTRO=${DISTRO} FROM ${DISTRO}:${UBUNTU_VERSION} AS dev