From 1b1f9c5855fb7ccf09d4f380697f928944fb90ed Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 Dec 2015 00:32:46 +0300 Subject: [PATCH 1/5] fixed build on linux for 9015001 --- Telegram/SourceFiles/pspecific_linux.cpp | 2 +- Telegram/Telegram.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/pspecific_linux.cpp b/Telegram/SourceFiles/pspecific_linux.cpp index 67137e977..362ad796a 100644 --- a/Telegram/SourceFiles/pspecific_linux.cpp +++ b/Telegram/SourceFiles/pspecific_linux.cpp @@ -1142,7 +1142,7 @@ void psOpenFile(const QString &name, bool openWith) { } void psShowInFolder(const QString &name) { - App::wnd()->hideLayer(true); + Ui::hideLayer(true); system((qsl("xdg-open ") + escapeShell(QFileInfo(name).absoluteDir().absolutePath())).toUtf8().constData()); } diff --git a/Telegram/Telegram.pro b/Telegram/Telegram.pro index 057af1c44..6712fba13 100644 --- a/Telegram/Telegram.pro +++ b/Telegram/Telegram.pro @@ -308,7 +308,7 @@ INCLUDEPATH += "/usr/include/atk-1.0" INCLUDEPATH += "/usr/include/dee-1.0" INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4" -LIBS += -lcrypto -lssl -lz -ldl -llzma -lexif -lopenal -lavformat -lavcodec -lswresample -lswscale -lavutil -lopus +LIBS += -lcrypto -lssl -lz -ldl -llzma -lexif -lopenal -lavformat -lavcodec -lswresample -lswscale -lavutil -lopus -lva LIBS += ./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.a \ ./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libibusplatforminputcontextplugin.a \ ./../../../Libraries/QtStatic/qtbase/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.a From e42eeb26fb8fddc80f354fa99535b0423237dc39 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 Dec 2015 00:43:55 +0300 Subject: [PATCH 2/5] improved build instructions for old OS X versions --- XCODEold.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XCODEold.md b/XCODEold.md index c4a7ec1ed..9cf2b8568 100644 --- a/XCODEold.md +++ b/XCODEold.md @@ -137,7 +137,7 @@ Then in Terminal go to **/Users/user/TBuild/Libraries/ffmpeg** and run LDFLAGS=`freetype-config --libs` PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:/usr/X11/lib/pkgconfig - ./configure --prefix=/usr/local/ffmpeg_old --disable-programs --disable-everything --enable-libopus --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=aasc --enable-decoder=gif --enable-decoder=h264 --enable-decoder=h264_crystalhd --enable-decoder=h264_qsv --enable-decoder=h264_vda --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_crystalhd --enable-decoder=mpeg4_vdpau --enable-decoder=msmpeg4_crystalhd --enable-decoder=msmpeg4_crystalhd --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wavpack --enable-decoder=opus --enable-decoder=vorbis --enable-decoder=wmalossless --enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmavoice --enable-decoder=flac --enable-encoder=libopus --enable-demuxer=aac --enable-demuxer=gif --enable-demuxer=h264 --enable-demuxer=wav --enable-demuxer=mp3 --enable-demuxer=ogg --enable-demuxer=mov --enable-demuxer=flac --enable-parser=aac --enable-parser=aac_latm --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=opus --enable-parser=vorbis --enable-parser=flac --enable-muxer=ogg --enable-muxer=opus --enable-hwaccel=mpeg4_vaapi --enable-hwaccel=mpeg4_vdpau --enable-hwaccel=mpeg4_videotoolbox --enable-hwaccel=h264_d3d11va --enable-hwaccel=h264_dxva2 --enable-hwaccel=h264_mmal --enable-hwaccel=h264_qsv --enable-hwaccel=h264_vaapi --enable-hwaccel=h264_vdpau --extra-cflags="-mmacosx-version-min=10.6" --extra-cxxflags="-mmacosx-version-min=10.6" --extra-ldflags="-mmacosx-version-min=10.6" + ./configure --prefix=/usr/local/ffmpeg_old --disable-programs --disable-everything --enable-libopus --enable-decoder=aac --enable-decoder=aac_latm --enable-decoder=aasc --enable-decoder=gif --enable-decoder=h264 --enable-decoder=h264_crystalhd --enable-decoder=h264_qsv --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_crystalhd --enable-decoder=mpeg4_vdpau --enable-decoder=msmpeg4_crystalhd --enable-decoder=msmpeg4_crystalhd --enable-decoder=msmpeg4v2 --enable-decoder=msmpeg4v3 --enable-decoder=wavpack --enable-decoder=opus --enable-decoder=vorbis --enable-decoder=wmalossless --enable-decoder=wmapro --enable-decoder=wmav1 --enable-decoder=wmav2 --enable-decoder=wmavoice --enable-decoder=flac --enable-encoder=libopus --enable-demuxer=aac --enable-demuxer=gif --enable-demuxer=h264 --enable-demuxer=wav --enable-demuxer=mp3 --enable-demuxer=ogg --enable-demuxer=mov --enable-demuxer=flac --enable-parser=aac --enable-parser=aac_latm --enable-parser=h264 --enable-parser=mpeg4video --enable-parser=mpegaudio --enable-parser=opus --enable-parser=vorbis --enable-parser=flac --enable-muxer=ogg --enable-muxer=opus --enable-hwaccel=mpeg4_vaapi --enable-hwaccel=mpeg4_vdpau --enable-hwaccel=h264_d3d11va --enable-hwaccel=h264_dxva2 --enable-hwaccel=h264_mmal --enable-hwaccel=h264_qsv --enable-hwaccel=h264_vaapi --enable-hwaccel=h264_vdpau --extra-cflags="-mmacosx-version-min=10.6" --extra-cxxflags="-mmacosx-version-min=10.6" --extra-ldflags="-mmacosx-version-min=10.6" make sudo make install From f0a08a871335906659164ceae4da90053d38d5b5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 Dec 2015 01:28:58 +0300 Subject: [PATCH 3/5] 9015002 version fixes retina issues in overview photos and videos --- Telegram/SourceFiles/config.h | 2 +- Telegram/SourceFiles/layout.cpp | 16 ++++++++-------- Telegram/Version | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h index dd65f2514..cdfc578e9 100644 --- a/Telegram/SourceFiles/config.h +++ b/Telegram/SourceFiles/config.h @@ -23,7 +23,7 @@ Copyright (c) 2014-2015 John Preston, https://desktop.telegram.org static const int32 AppVersion = 9015; static const wchar_t *AppVersionStr = L"0.9.15"; static const bool DevVersion = false; -#define BETA_VERSION (9015001ULL) // just comment this line to build public version +#define BETA_VERSION (9015002ULL) // just comment this line to build public version static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)"; static const wchar_t *AppName = L"Telegram Desktop"; diff --git a/Telegram/SourceFiles/layout.cpp b/Telegram/SourceFiles/layout.cpp index e38b4f5ef..933ac06ec 100644 --- a/Telegram/SourceFiles/layout.cpp +++ b/Telegram/SourceFiles/layout.cpp @@ -335,13 +335,13 @@ void LayoutOverviewPhoto::paint(Painter &p, const QRect &clip, uint32 selection, img = imageBlur(img); } if (img.width() == img.height()) { - if (img.width() != _width) { - img = img.scaled(_width, _width, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + if (img.width() != size) { + img = img.scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); } } else if (img.width() > img.height()) { - img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(_width, _width, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); } else { - img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(_width, _width, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); } img.setDevicePixelRatio(cRetinaFactor()); _data->forget(); @@ -412,13 +412,13 @@ void LayoutOverviewVideo::paint(Painter &p, const QRect &clip, uint32 selection, QImage img = _data->thumb->pix().toImage(); img = imageBlur(img); if (img.width() == img.height()) { - if (img.width() != _width) { - img = img.scaled(_width, _width, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + if (img.width() != size) { + img = img.scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); } } else if (img.width() > img.height()) { - img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(_width, _width, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + img = img.copy((img.width() - img.height()) / 2, 0, img.height(), img.height()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); } else { - img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(_width, _width, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); + img = img.copy(0, (img.height() - img.width()) / 2, img.width(), img.width()).scaled(size, size, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation); } img.setDevicePixelRatio(cRetinaFactor()); _data->forget(); diff --git a/Telegram/Version b/Telegram/Version index 5850195c2..b6b77419f 100644 --- a/Telegram/Version +++ b/Telegram/Version @@ -3,4 +3,4 @@ AppVersionStrMajor 0.9 AppVersionStrSmall 0.9.15 AppVersionStr 0.9.15 DevChannel 0 -BetaVersion 9015001 +BetaVersion 9015002 From 9bf34731f42c1638c4809ba1b44773273204508c Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 Dec 2015 01:49:07 +0300 Subject: [PATCH 4/5] fixmake improved for 9015001 linux build --- Telegram/FixMake.sh | 1 + Telegram/FixMake32.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/Telegram/FixMake.sh b/Telegram/FixMake.sh index eef0eb343..21abada2b 100755 --- a/Telegram/FixMake.sh +++ b/Telegram/FixMake.sh @@ -29,3 +29,4 @@ Replace '\-lavcodec' '\/usr\/local\/lib\/libavcodec\.a' Replace '\-lswresample' '\/usr\/local\/lib\/libswresample\.a' Replace '\-lswscale' '\/usr\/local\/lib\/libswscale\.a' Replace '\-lavutil' '\/usr\/local\/lib\/libavutil\.a' +Replace '\-lva' '\/usr\/local\/lib\/libva\.a' diff --git a/Telegram/FixMake32.sh b/Telegram/FixMake32.sh index 747c60b36..833bca6c6 100755 --- a/Telegram/FixMake32.sh +++ b/Telegram/FixMake32.sh @@ -29,3 +29,4 @@ Replace '\-lavcodec' '\/usr\/local\/lib\/libavcodec\.a' Replace '\-lswresample' '\/usr\/local\/lib\/libswresample\.a' Replace '\-lswscale' '\/usr\/local\/lib\/libswscale\.a' Replace '\-lavutil' '\/usr\/local\/lib\/libavutil\.a' +Replace '\-lva' '\/usr\/local\/lib\/libva\.a' From afed48dd4a89ad83d138da21e9e9b6ec081a63e3 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 Dec 2015 01:55:00 +0300 Subject: [PATCH 5/5] added libva build to linux instructions --- QTCREATOR.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/QTCREATOR.md b/QTCREATOR.md index c7bfa5de6..4a66c2cee 100644 --- a/QTCREATOR.md +++ b/QTCREATOR.md @@ -46,6 +46,13 @@ Download [opus-1.1 sources](http://downloads.xiph.org/releases/opus/opus-1.1.tar In Terminal go to **/home/user/TBuild/Libraries** and run + git clone git://anongit.freedesktop.org/git/libva + cd libva + ./autogen.sh --enable-static + make + sudo make install + cd .. + git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg cd ffmpeg git checkout release/2.8