From e8d542bd2540dfa3d263d7715b7a8665c9170b00 Mon Sep 17 00:00:00 2001 From: "aleksandr.vodyanov" Date: Wed, 9 Oct 2024 16:21:00 +0300 Subject: [PATCH] [DO-1180]symlink libvpx (#5) Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/5 Co-authored-by: aleksandr.vodyanov Co-committed-by: aleksandr.vodyanov --- CHANGELOG.md | 8 ++++++++ Dockerfile | 2 ++ Makefile | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de3f42e..60b6b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 1.4 + +### 09.10.2024 + +ADD: + +* Костыль с симлинком библиотеки + ## 1.3 ### 07.10.2024 diff --git a/Dockerfile b/Dockerfile index 2a9d108..2646019 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,6 +64,8 @@ RUN wget ${NEXUS_URL}/repository/${NEXUS_QT_REPO}/v${VERSION}/qt-everywhere-open ./configure -release -opensource -confirm-license -nomake tests -nomake examples -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtdoc -skip qtmacextras -skip qtscript -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview -skip qtwinextras -skip qtserialbus -xkbcommon -system-harfbuzz -system-libjpeg -no-openssl && \ make -j$(nproc) && make install -j$(nproc) && cd .. && rm -rf qt-everywhere* /tmp/patches +#Ужасный костыль +RUN ln -s /usr/lib/x86_64-linux-gnu/libvpx.so.9.0.0 /usr/lib/x86_64-linux-gnu/libvpx.so.7 # Personalization #------------------------------------------------------------------------------- # diff --git a/Makefile b/Makefile index 9985e3e..04800ef 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ IMAGE_NAME = tavro-build-linux IMAGE_GROUP = tavro -IMAGE_TAG = 1.3 +IMAGE_TAG = 1.4 REVISION = DOCKER_REGISTRY = harbor.avroid.tech CI_FLAGS =