diff --git a/.travis/build.sh b/.travis/build.sh index 506f8d4bbc..21e4a4f637 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -319,6 +319,8 @@ buildFFmpeg() { git clone https://git.ffmpeg.org/ffmpeg.git cd "$EXTERNAL/ffmpeg" + git checkout release/3.4 + ./configure \ --prefix=$FFMPEG_PATH \ --disable-debug \ diff --git a/Telegram/ThirdParty/libtgvoip b/Telegram/ThirdParty/libtgvoip index 651594b3ce..5519789e1a 160000 --- a/Telegram/ThirdParty/libtgvoip +++ b/Telegram/ThirdParty/libtgvoip @@ -1 +1 @@ -Subproject commit 651594b3cef23051ca7370ddd14d7c23377d6341 +Subproject commit 5519789e1aea1ea118e0be42dcdc142a63344cd8 diff --git a/docs/building-cmake.md b/docs/building-cmake.md index ed3dacdf61..d4c4b869cb 100644 --- a/docs/building-cmake.md +++ b/docs/building-cmake.md @@ -44,7 +44,7 @@ Go to ***BuildPath*** and run git clone https://github.com/xiph/opus cd opus - git checkout v1.2-alpha2 + git checkout v1.2.1 ./autogen.sh ./configure make $MAKE_THREADS_CNT @@ -67,7 +67,7 @@ Go to ***BuildPath*** and run git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/3.2 + git checkout release/3.4 ./configure --prefix=/usr/local --disable-programs --disable-doc --disable-everything --enable-protocol=file --enable-libopus --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=aasc --enable-decoder=flac --enable-decoder=gif --enable-decoder=h264 --enable-decoder=h264_vdpau --enable-decoder=mp1 --enable-decoder=mp1float --enable-decoder=mp2 --enable-decoder=mp2float --enable-decoder=mp3 --enable-decoder=mp3adu --enable-decoder=mp3adufloat --enable-decoder=mp3float --enable-decoder=mp3on4 --enable-decoder=mp3on4float --enable-decoder=mpeg4 --enable-decoder=mpeg4_vdpau --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=opus --enable-decoder=pcm_alaw --enable-decoder=pcm_alaw_at --enable-decoder=pcm_f32be --enable-decoder=pcm_f32le --enable-decoder=pcm_f64be --enable-decoder=pcm_f64le --enable-decoder=pcm_lxf --enable-decoder=pcm_mulaw --enable-decoder=pcm_mulaw_at --enable-decoder=pcm_s16be --enable-decoder=pcm_s16be_planar --enable-decoder=pcm_s16le --enable-decoder=pcm_s16le_planar --enable-decoder=pcm_s24be --enable-decoder=pcm_s24daud --enable-decoder=pcm_s24le --enable-decoder=pcm_s24le_planar --enable-decoder=pcm_s32be --enable-decoder=pcm_s32le --enable-decoder=pcm_s32le_planar --enable-decoder=pcm_s64be --enable-decoder=pcm_s64le --enable-decoder=pcm_s8 --enable-decoder=pcm_s8_planar --enable-decoder=pcm_u16be --enable-decoder=pcm_u16le --enable-decoder=pcm_u24be --enable-decoder=pcm_u24le --enable-decoder=pcm_u32be --enable-decoder=pcm_u32le --enable-decoder=pcm_u8 --enable-decoder=pcm_zork --enable-decoder=vorbis --enable-decoder=wavpack --enable-decoder=wmalossless --enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmavoice --enable-encoder=libopus --enable-hwaccel=h264_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=mpeg4_vaapi --enable-hwaccel=mpeg4_vdpau --enable-parser=aac --enable-parser=aac_latm --enable-parser=flac --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=opus --enable-parser=vorbis --enable-demuxer=aac --enable-demuxer=flac --enable-demuxer=gif --enable-demuxer=h264 --enable-demuxer=mov --enable-demuxer=mp3 --enable-demuxer=ogg --enable-demuxer=wav --enable-muxer=ogg --enable-muxer=opus diff --git a/docs/building-msvc.md b/docs/building-msvc.md index 9a8b632e85..12b2a9b23b 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -120,7 +120,7 @@ Open **x86 Native Tools Command Prompt for VS 2017.bat**, go to ***BuildPath*** git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/3.2 + git checkout release/3.4 set CHERE_INVOKING=enabled_from_arguments set MSYS2_PATH_TYPE=inherit diff --git a/docs/building-xcode-old.md b/docs/building-xcode-old.md index 24b713870b..f1fad75e0a 100644 --- a/docs/building-xcode-old.md +++ b/docs/building-xcode-old.md @@ -72,6 +72,15 @@ Go to ***BuildPath*** and run make build_libs -j4 cd .. + git clone https://github.com/xiph/opus + cd opus + git checkout v1.2.1 + ./autogen.sh + CFLAGS="-mmacosx-version-min=10.6" CPPFLAGS="-mmacosx-version-min=10.6" LDFLAGS="-mmacosx-version-min=10.6" ./configure --prefix=/usr/local/macold + make -j4 + sudo make install + cd .. + cd libiconv-1.15 CFLAGS="-mmacosx-version-min=10.6" CPPFLAGS="-mmacosx-version-min=10.6 -nostdinc++" LDFLAGS="-mmacosx-version-min=10.6" ./configure --enable-static --prefix=/usr/local/macold make -j4 @@ -80,7 +89,7 @@ Go to ***BuildPath*** and run git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/3.2 + git checkout release/3.4 CFLAGS=`freetype-config --cflags` LDFLAGS=`freetype-config --libs` PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 92dc588fb4..fefab48e5c 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -49,6 +49,15 @@ Go to ***BuildPath*** and run make build_libs -j4 cd .. + git clone https://github.com/xiph/opus + cd opus + git checkout v1.2.1 + ./autogen.sh + CFLAGS="-mmacosx-version-min=10.8" CPPFLAGS="-mmacosx-version-min=10.8" LDFLAGS="-mmacosx-version-min=10.8" ./configure + make -j4 + sudo make install + cd .. + cd libiconv-1.15 CFLAGS="-mmacosx-version-min=10.8" CPPFLAGS="-mmacosx-version-min=10.8" LDFLAGS="-mmacosx-version-min=10.8" ./configure --enable-static make -j4 @@ -60,7 +69,7 @@ Go to ***BuildPath*** and run git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg - git checkout release/3.2 + git checkout release/3.4 CFLAGS=`freetype-config --cflags` LDFLAGS=`freetype-config --libs` PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig