mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 23:55:12 +00:00
Code Issues Releases Wiki Activity

Updated FFmpeg version in GitHub Actions workflows

Browse Source
This commit is contained in:
zurg3
2020-11-09 22:44:11 +03:00
committed by John Preston
parent a68d9b4522
commit a768b65295
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/linux.yml vendored
View File

@@ -229,7 +229,7 @@ jobs:
run: | run: |
cd $LibrariesPath cd $LibrariesPath
git clone --branch release/3.4 $GIT/FFmpeg/FFmpeg ffmpeg git clone --branch release/4.2 $GIT/FFmpeg/FFmpeg ffmpeg
cd ffmpeg cd ffmpeg
./configure \ ./configure \
--disable-debug \ --disable-debug \

10
.github/workflows/mac.yml vendored
View File

@@ -235,7 +235,7 @@ jobs:
git clone $GIT/FFmpeg/FFmpeg.git ffmpeg git clone $GIT/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
@@ -244,7 +244,9 @@ jobs:
--extra-cflags="$MIN_MAC $UNGUARDED" \ --extra-cflags="$MIN_MAC $UNGUARDED" \
--extra-cxxflags="$MIN_MAC $UNGUARDED" \ --extra-cxxflags="$MIN_MAC $UNGUARDED" \
--extra-ldflags="$MIN_MAC" \ --extra-ldflags="$MIN_MAC" \
--enable-protocol=file --enable-libopus \ --x86asmexe=`pwd`/macos_yasm_wrap.sh \
--enable-protocol=file \
--enable-libopus \
--disable-programs \ --disable-programs \
--disable-doc \ --disable-doc \
--disable-network \ --disable-network \
@@ -364,9 +366,9 @@ jobs:
run: | run: |
cd $LibrariesPath cd $LibrariesPath
git clone $GIT/kcat/openal-soft.git git clone https://github.com/telegramdesktop/openal-soft.git
cd openal-soft cd openal-soft
git checkout openal-soft-1.19.1 git checkout fix_mono
cd build cd build
CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake \ CFLAGS="$UNGUARDED" CPPFLAGS="$UNGUARDED" cmake \

4
.github/workflows/win.yml vendored
View File

@@ -294,10 +294,10 @@ jobs:
git clone %GIT%/FFmpeg/FFmpeg.git ffmpeg git clone %GIT%/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
call c:\tools\msys64\usr\bin\bash --login ../../%REPO_NAME%/Telegram/Patches/build_ffmpeg_win.sh call c:\tools\msys64\usr\bin\bash --login ../patches/build_ffmpeg_win.sh
rmdir /S /Q .git rmdir /S /Q .git