void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update docs/docker to use FFmpeg 4.2 / OpenAL 1.20.1.

Browse source
This commit is contained in:
John Preston 2020-11-05 20:18:11 +03:00
parent d9df82642d
commit 951bb22c38
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View file

@ -250,7 +250,7 @@ COPY --from=opus ${LibrariesPath}/opus-cache /
COPY --from=libva ${LibrariesPath}/libva-cache / COPY --from=libva ${LibrariesPath}/libva-cache /
COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache / COPY --from=libvdpau ${LibrariesPath}/libvdpau-cache /
RUN git clone -b release/3.4 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg RUN git clone -b release/4.2 --depth=1 $GIT/FFmpeg/FFmpeg.git ffmpeg
WORKDIR ffmpeg WORKDIR ffmpeg
RUN ./configure \ RUN ./configure \
@ -359,7 +359,7 @@ RUN make -j$(nproc)
RUN make DESTDIR="$LibrariesPath/ffmpeg-cache" install RUN make DESTDIR="$LibrariesPath/ffmpeg-cache" install
FROM builder AS openal FROM builder AS openal
RUN git clone -b openal-soft-1.20.1 --depth=1 $GIT/kcat/openal-soft.git RUN git clone -b fix_mono --depth=1 $GIT/telegramdesktop/openal-soft.git
WORKDIR openal-soft WORKDIR openal-soft
RUN cmake3 -B build . \ RUN cmake3 -B build . \

2
docs/building-cmake.md
View file

@ -1,5 +1,7 @@
## Build instructions for CMake under Ubuntu 14.04 ## Build instructions for CMake under Ubuntu 14.04
**NB** These are outdated.
### Prepare folder ### Prepare folder
Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document. Choose an empty folder for the future build, for example **/home/user/TBuild**. It will be named ***BuildPath*** in the rest of this document.

4
docs/building-msvc.md
View file

@ -152,7 +152,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
cd ffmpeg cd ffmpeg
git checkout release/3.4 git checkout release/4.2
set CHERE_INVOKING=enabled_from_arguments set CHERE_INVOKING=enabled_from_arguments
set MSYS2_PATH_TYPE=inherit set MSYS2_PATH_TYPE=inherit
@ -172,7 +172,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
cd .. cd ..
configure ^ configure ^
-prefix "%LibrariesPath%\Qt-Qt-5.15.1" ^ -prefix "%LibrariesPath%\Qt-5.15.1" ^
-debug-and-release ^ -debug-and-release ^
-force-debug-info ^ -force-debug-info ^
-opensource ^ -opensource ^

6
docs/building-xcode.md
View file

@ -127,7 +127,7 @@ Go to ***BuildPath*** and run
git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg
cd ffmpeg cd ffmpeg
git checkout release/3.4 git checkout release/4.2
CFLAGS=`freetype-config --cflags` CFLAGS=`freetype-config --cflags`
LDFLAGS=`freetype-config --libs` LDFLAGS=`freetype-config --libs`
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig
@ -240,9 +240,9 @@ Go to ***BuildPath*** and run
sudo make install sudo make install
cd .. cd ..
git clone git://repo.or.cz/openal-soft.git git clone https://github.com/telegramdesktop/openal-soft.git
cd openal-soft cd openal-soft
git checkout v1.19 git checkout fix_mono
cd build cd build
CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 .. CFLAGS=$UNGUARDED CPPFLAGS=$UNGUARDED cmake -D CMAKE_INSTALL_PREFIX:PATH=/usr/local/macos -D ALSOFT_EXAMPLES=OFF -D LIBTYPE:STRING=STATIC -D CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.12 ..
make $MAKE_THREADS_CNT make $MAKE_THREADS_CNT