From c338521843de87fabc2709110e3102ad0526999f Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 1 Feb 2026 20:53:30 +0100 Subject: [PATCH] Updated doc and docker builds --- Dockerfile-build-alpine | 8 +-- Dockerfile-build-arch | 3 +- Dockerfile-release | 77 +++++++++++++++-------------- src/libs/audio/impl/AudioOutput.cpp | 2 +- src/tools/audioplay/CMakeLists.txt | 2 + 5 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Dockerfile-build-alpine b/Dockerfile-build-alpine index 200b6d7d..c8737514 100644 --- a/Dockerfile-build-alpine +++ b/Dockerfile-build-alpine @@ -14,17 +14,19 @@ RUN apk add --no-cache ${BUILD_PACKAGES} ARG LMS_BUILD_PACKAGES=" \ gcc \ g++ \ - musl-dev \ + alsa-lib-dev \ benchmark-dev \ boost-dev \ ffmpeg-dev \ + gtest-dev \ libarchive-dev \ libconfig-dev \ + musl-dev \ pugixml-dev \ - taglib-dev \ + pulseaudio-dev \ stb \ + taglib-dev \ wt-dev \ - gtest-dev \ xxhash-dev" COPY --from=xx / / diff --git a/Dockerfile-build-arch b/Dockerfile-build-arch index b49c9477..c73eac24 100644 --- a/Dockerfile-build-arch +++ b/Dockerfile-build-arch @@ -2,14 +2,15 @@ FROM archlinux:latest ARG BUILD_PACKAGES="\ benchmark \ + boost \ clang \ cmake \ - boost \ ffmpeg \ gtest \ graphicsmagick \ libarchive \ libconfig \ + libpulse \ make \ pkgconfig \ pugixml \ diff --git a/Dockerfile-release b/Dockerfile-release index 585c76db..c8e6a4cc 100644 --- a/Dockerfile-release +++ b/Dockerfile-release @@ -5,40 +5,40 @@ WORKDIR /tmp/workdir ENV PREFIX="/tmp/install" ARG BUILD_PACKAGES=" \ - ca-certificates \ - curl \ - bzip2 \ - pkgconfig \ - coreutils \ autoconf \ automake \ - libtool \ - g++ \ - make \ - openjpeg-dev \ - libpng-dev \ - nasm \ - yasm \ - curl \ - libogg-dev \ - opus-dev \ - pugixml-dev \ - libvorbis-dev \ - lame-dev \ - cmake \ - zlib-dev \ - openssl-dev \ boost-dev \ + bzip2 \ + ca-certificates \ + cmake \ + coreutils \ + curl \ + g++ \ + gtest-dev \ + lame-dev \ libarchive-dev \ libconfig-dev \ - utfcpp \ + libogg-dev \ + libpng-dev \ + libtool \ + libvorbis-dev \ + make \ + openjpeg-dev \ + openssl-dev \ + opus-dev \ + pkgconfig \ + pugixml-dev \ + pulseaudio-dev \ + nasm \ sqlite-dev \ - gtest-dev \ - xxhash-dev" + utfcpp \ + xxhash-dev \ + yasm \ + zlib-dev" RUN apk add --no-cache --update ${BUILD_PACKAGES} -# ffmpeg +# FFmpeg ARG FFMPEG_VERSION=6.1.3 RUN \ DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ @@ -128,12 +128,12 @@ RUN \ mkdir -p /tmp/fakeroot/bin && \ for bin in ${PREFIX}/bin/ffmpeg ${PREFIX}/bin/lms*; \ do \ - strip --strip-all $bin && \ - cp $bin /tmp/fakeroot/bin/; \ + strip --strip-all $bin && \ + cp $bin /tmp/fakeroot/bin/; \ done && \ for lib in ${PREFIX}/lib/*.so; \ do \ - strip --strip-all $lib; \ + strip --strip-all $lib; \ done && \ cp -r ${PREFIX}/lib /tmp/fakeroot/lib && \ cp -r ${PREFIX}/share /tmp/fakeroot/share && \ @@ -150,23 +150,24 @@ FROM alpine:3.22 AS release LABEL maintainer="Emeric Poupon " ARG RUNTIME_PACKAGES=" \ - libssl3 \ - libcrypto3 \ - openjpeg \ - libpng \ - libogg \ - opus \ - libvorbis \ - lame-libs \ - zlib \ boost-filesystem \ boost-iostreams \ boost-program_options \ boost-thread \ + lame-libs \ libarchive \ libconfig++ \ + libcrypto3 \ + libogg \ + libpng \ + libpulse \ + libvorbis \ + libssl3 \ + openjpeg \ + opus \ pugixml \ - sqlite-libs" + sqlite-libs \ + zlib" ARG LMS_USER=lms ARG LMS_GROUP=lms diff --git a/src/libs/audio/impl/AudioOutput.cpp b/src/libs/audio/impl/AudioOutput.cpp index 0a18ccfa..946892de 100644 --- a/src/libs/audio/impl/AudioOutput.cpp +++ b/src/libs/audio/impl/AudioOutput.cpp @@ -45,7 +45,7 @@ namespace lms::audio return buildAudioOutputBackends(); } - std::unique_ptr createAudioOutputContext(boost::asio::io_context& ioContext, std::string_view name, AudioOutputBackend backend) + std::unique_ptr createAudioOutputContext([[maybe_unused]] boost::asio::io_context& ioContext, [[maybe_unused]] std::string_view name, AudioOutputBackend backend) { std::unique_ptr context; diff --git a/src/tools/audioplay/CMakeLists.txt b/src/tools/audioplay/CMakeLists.txt index 701be783..ce71a3c8 100644 --- a/src/tools/audioplay/CMakeLists.txt +++ b/src/tools/audioplay/CMakeLists.txt @@ -8,3 +8,5 @@ target_link_libraries(lms-audioplay PRIVATE lmscore Boost::program_options ) + +install(TARGETS lms-audioplay DESTINATION bin) \ No newline at end of file