From aeddaf3dbd7383cb676c497418baf73c33d3435e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 28 Jun 2022 02:32:46 +0400 Subject: [PATCH] Update openal to 1.22.2 --- Telegram/build/docker/centos_env/Dockerfile | 5 ++--- Telegram/build/prepare/prepare.py | 2 +- snap/snapcraft.yaml | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index b39cd80f4..9709ab3dc 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -422,7 +422,7 @@ RUN git init ffmpeg \ && rm -rf ffmpeg FROM builder AS pipewire -RUN git clone -b 0.3.33 --depth=1 $GIT/PipeWire/pipewire.git \ +RUN git clone -b 0.3.25 --depth=1 $GIT/PipeWire/pipewire.git \ && cd pipewire \ && meson build \ --buildtype=release \ @@ -437,9 +437,8 @@ RUN git clone -b 0.3.33 --depth=1 $GIT/PipeWire/pipewire.git \ FROM builder AS openal COPY --from=pipewire ${LibrariesPath}/pipewire-cache / -RUN git clone -b 1.22.1 --depth=1 $GIT/kcat/openal-soft.git \ +RUN git clone -b 1.22.2 --depth=1 $GIT/kcat/openal-soft.git \ && cd openal-soft \ - && sed -i 's@PW_CHECK_VERSION(major, minor, revision)@!PW_CHECK_VERSION(major, minor, revision + 1)@' alc/backends/pipewire.cpp \ && CFLAGS="$HFLAGS" CXXFLAGS="$HFLAGS" cmake -GNinja -B build . \ -DCMAKE_BUILD_TYPE=Release \ -DLIBTYPE:STRING=STATIC \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 6d3bc30cd..fb4d6da98 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -976,7 +976,7 @@ release: mac: git clone https://github.com/kcat/openal-soft.git cd openal-soft - git checkout 1.22.1 + git checkout 1.22.2 CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -B build . \\ -D CMAKE_INSTALL_PREFIX:PATH=$USED_PREFIX \\ -D ALSOFT_EXAMPLES=OFF \\ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8586c7ddf..7b30eafea 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -237,7 +237,7 @@ parts: openal: source: https://github.com/kcat/openal-soft.git source-depth: 1 - source-tag: 1.22.1 + source-tag: 1.22.2 plugin: cmake build-packages: - libasound2-dev @@ -256,9 +256,6 @@ parts: - -DALSOFT_EXAMPLES=OFF - -DALSOFT_UTILS=OFF - -DALSOFT_INSTALL_CONFIG=OFF - override-pull: | - craftctl default - sed -i 's@PW_CHECK_VERSION(major, minor, revision)@!PW_CHECK_VERSION(major, minor, revision + 1)@' alc/backends/pipewire.cpp prime: - -./usr/include - -./usr/lib/$CRAFT_ARCH_TRIPLET/cmake