diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index f186b3378..c7bf5b4e6 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -422,15 +422,13 @@ RUN git init ffmpeg \ && rm -rf ffmpeg FROM builder AS pipewire -RUN git clone -b 0.3.42 --depth=1 $GIT/PipeWire/pipewire.git \ +RUN git clone -b 0.3.33 --depth=1 $GIT/PipeWire/pipewire.git \ && cd pipewire \ && meson build \ --buildtype=release \ -Dtests=disabled \ -Dexamples=disabled \ - -Dpipewire-v4l2=disabled \ -Dspa-plugins=disabled \ - -Dsession-managers=[] \ && meson compile -C build \ && DESTDIR="$LibrariesPath/pipewire-cache" meson install -C build \ && cd .. \ @@ -439,15 +437,12 @@ RUN git clone -b 0.3.42 --depth=1 $GIT/PipeWire/pipewire.git \ FROM builder AS openal COPY --from=pipewire ${LibrariesPath}/pipewire-cache / -RUN git clone -b 1.22.0 --depth=1 $GIT/kcat/openal-soft.git \ +RUN git clone -b 1.22.1 --depth=1 $GIT/kcat/openal-soft.git \ && cd openal-soft \ - && curl -sSL https://github.com/kcat/openal-soft/commit/2ea5bb91686ee1a7350672bf15b7b63649dbf111.patch \ - | git apply \ && CFLAGS="$HFLAGS" CXXFLAGS="$HFLAGS" cmake -GNinja -B build . \ -DCMAKE_BUILD_TYPE=Release \ -DLIBTYPE:STRING=STATIC \ -DALSOFT_EXAMPLES=OFF \ - -DALSOFT_TESTS=OFF \ -DALSOFT_UTILS=OFF \ -DALSOFT_INSTALL_CONFIG=OFF \ && cmake --build build --parallel \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index d44e125f3..908ee884a 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 af8e756d + git checkout 1.22.1 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 77d0a1c56..6289c03bb 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.0 + source-tag: 1.22.1 plugin: cmake build-packages: - libasound2-dev @@ -254,7 +254,6 @@ parts: - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=/usr - -DALSOFT_EXAMPLES=OFF - - -DALSOFT_TESTS=OFF - -DALSOFT_UTILS=OFF - -DALSOFT_INSTALL_CONFIG=OFF prime: