[arch-commits] Commit in telegram-desktop/trunk (4 files)

[Jiachen Yang]

    Date: Monday, July 8, 2019 @ 14:08:48
  Author: farseerfc
Revision: 487707

upgpkg: telegram-desktop 1.7.14-1

telegram-desktop 1.7.14-1 patching ffmpeg_utility and rlottie to build

Added:
  telegram-desktop/trunk/tdesktop-ffmpeg-fix-convertFromARGB32PM.patch
  telegram-desktop/trunk/tdesktop-rlottie-static-qt.patch
Modified:
  telegram-desktop/trunk/PKGBUILD
  telegram-desktop/trunk/tdesktop_lottie_animation_qtdebug.patch

-----------------------------------------------+
 PKGBUILD                                      |   22 ++++++------
 tdesktop-ffmpeg-fix-convertFromARGB32PM.patch |   42 ++++++++++++++++++++++++
 tdesktop-rlottie-static-qt.patch              |   13 +++++++
 tdesktop_lottie_animation_qtdebug.patch       |    1 
 4 files changed, 67 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-08 13:30:18 UTC (rev 487706)
+++ PKGBUILD	2019-07-08 14:08:48 UTC (rev 487707)
@@ -5,8 +5,8 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop
-pkgver=1.7.10
-pkgrel=6
+pkgver=1.7.14
+pkgrel=1
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -23,7 +23,7 @@
     "GSL::git+https://github.com/Microsoft/GSL.git"
     "crl::git+https://github.com/telegramdesktop/crl.git"
     "xxHash::git+https://github.com/Cyan4973/xxHash.git"
-    "qtlottie::git+https://github.com/telegramdesktop/qtlottie.git"
+    "rlottie::git+https://github.com/john-preston/rlottie.git"
     "tg.protocol"
     "CMakeLists.inj"
     "tdesktop.patch"
@@ -32,7 +32,8 @@
     "demibold.patch"
     "Use-system-wide-font.patch"
     "tdesktop_lottie_animation_qtdebug.patch"
-    "tdesktop_qtlottie_qtdebug.patch"
+    "tdesktop-ffmpeg-fix-convertFromARGB32PM.patch"
+    "tdesktop-rlottie-static-qt.patch"
 )
 sha512sums=('SKIP'
             'SKIP'
@@ -49,8 +50,9 @@
             'd60694dc701aa985b0e82a12c9732b945082470441c687b33167a94f94efcf253baf43bb7280ec160ba338485ee5c62de138e4804cae05f27cc5cf4298166d39'
             '6d0bac5aa4c4992b5400a9a9318f7a4e92d5eab961917cf0b05cdd251ab66a77c52ec8fbef246e8019606a7624d7b5420b87f8153e071e9724c7d2f5c94e47c0'
             'ce6be003220267bac5483caf8302b492e1581892bc36d35a61236ebf9f9d766b8bd2159557a1c36256aa85f461797a38bfaae57b12da7a72101b21c0b17ed653'
-            '5703b8228ab26f736928b56b90947602e78774648ff354ae10a53ad4535289ac12c8b7a049cabaed7591909246987be403dc470d48dd72a9ec1ce776a2977a66'
-            'c101761ff0aa6d4be38d0159bee31d02f66cfda84dbfb614e35e8d1c8f73bd78346636764a823bf1ce33b5364e99ea71330de60e37190f78d55f25a183f0d0cc')
+            'a83b80668b2dc2cc77c857069fdb45b487793fda01ad8a63bab66c6a1c71e5d032050e4ec7efb5b4c3216badc5377c856ef1f4a59c2e02b24ee53b1d83124bf3'
+            'f0912f2adc6181d3050d8e688c81da5333eeba3166354a72cd4b6abb492c2e6093ca76d577bb4d5ea78706aaa367d952f173d4fd083a1c088172cc5227df61b0'
+            '1f7cecfc8698ff9e0abce87226e993e73fdf35111d037c2847f7a1f30e65483ab332e45a1bdb86f6ac4c420c1c1429ac20454655d0e982477e37b7c48f0b1599')
 
 prepare() {
     cd "$srcdir/tdesktop"
@@ -61,7 +63,7 @@
     git config submodule.Telegram/ThirdParty/Catch.url "$srcdir/Catch2"
     git config submodule.Telegram/ThirdParty/crl.url "$srcdir/crl"
     git config submodule.Telegram/ThirdParty/xxHash.url "$srcdir/xxHash"
-    git config submodule.Telegram/ThirdParty/qtlottie.url "$srcdir/qtlottie"
+    git config submodule.Telegram/ThirdParty/rlottie.url "$srcdir/rlottie"
     git submodule update
 
     patch -Np1 -i "$srcdir/tdesktop.patch"
@@ -69,12 +71,10 @@
     patch -R -Np1 -i "$srcdir/demibold.patch"
     patch -Np1 -i "$srcdir/Use-system-wide-font.patch"
     patch -Np1 -i "$srcdir/tdesktop_lottie_animation_qtdebug.patch"
+    patch -Np1 -i "$srcdir/tdesktop-ffmpeg-fix-convertFromARGB32PM.patch"
+    patch -Np1 -i "$srcdir/tdesktop-rlottie-static-qt.patch"
 
     cd "$srcdir/tdesktop"
-    cd "Telegram/ThirdParty/qtlottie"
-    patch -Np1 -i "$srcdir/tdesktop_qtlottie_qtdebug.patch"
-
-    cd "$srcdir/tdesktop"
     cd "Telegram/ThirdParty/libtgvoip"
     patch -Np1 -i "$srcdir/libtgvoip.patch"
 }

Added: tdesktop-ffmpeg-fix-convertFromARGB32PM.patch
===================================================================
--- tdesktop-ffmpeg-fix-convertFromARGB32PM.patch	                        (rev 0)
+++ tdesktop-ffmpeg-fix-convertFromARGB32PM.patch	2019-07-08 14:08:48 UTC (rev 487707)
@@ -0,0 +1,42 @@
+diff --git a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+index 5d0e50926..7d89692f8 100644
+--- a/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
++++ b/Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
+@@ -355,6 +355,12 @@ QImage CreateFrameStorage(QSize size) {
+ }
+ 
+ void UnPremultiply(QImage &to, const QImage &from) {
++	to = from.convertToFormat(QImage::Format_ARGB32);
++        return;
++        //// below is original tdesktop code, we shortcut them by using Qt public API
++        //// see https://github.com/telegramdesktop/tdesktop/issues/6219
++        /*
++
+ 	// This creates QImage::Format_ARGB32_Premultiplied, but we use it
+ 	// as an image in QImage::Format_ARGB32 format.
+ 	if (!GoodStorageForFrame(to, from.size())) {
+@@ -387,9 +393,16 @@ void UnPremultiply(QImage &to, const QImage &from) {
+ 			layout,
+ 			nullptr);
+ 	}
++	*/
+ }
+ 
+ void PremultiplyInplace(QImage &image) {
++	image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied);
++	return;
++        //// below is original tdesktop code, we shortcut them by using Qt public API
++        //// see https://github.com/telegramdesktop/tdesktop/issues/6219
++        /*
++
+ 	const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
+ 	const auto convert = layout->convertToARGB32PM;
+ 	const auto perLine = image.bytesPerLine();
+@@ -413,6 +426,7 @@ void PremultiplyInplace(QImage &image) {
+ 			layout,
+ 			nullptr);
+ 	}
++	*/
+ }
+ 
+ } // namespace FFmpeg

Added: tdesktop-rlottie-static-qt.patch
===================================================================
--- tdesktop-rlottie-static-qt.patch	                        (rev 0)
+++ tdesktop-rlottie-static-qt.patch	2019-07-08 14:08:48 UTC (rev 487707)
@@ -0,0 +1,13 @@
+diff --git a/Telegram/gyp/lib_rlottie.gyp b/Telegram/gyp/lib_rlottie.gyp
+index efc208500..8f2a66f5a 100644
+--- a/Telegram/gyp/lib_rlottie.gyp
++++ b/Telegram/gyp/lib_rlottie.gyp
+@@ -113,7 +113,7 @@
+     ],
+     'conditions': [[ 'not build_win', {
+       'defines': [
+-        'RLOTTIE_WITH_STATIC_QT',
++#        'RLOTTIE_WITH_STATIC_QT',
+       ]
+     }], [ 'build_macold', {
+       'xcode_settings': {

Modified: tdesktop_lottie_animation_qtdebug.patch
===================================================================
--- tdesktop_lottie_animation_qtdebug.patch	2019-07-08 13:30:18 UTC (rev 487706)
+++ tdesktop_lottie_animation_qtdebug.patch	2019-07-08 14:08:48 UTC (rev 487707)
@@ -7,6 +7,7 @@
  
  #include <QFile>
 +#include <QtDebug>
+ #include <rlottie.h>
  #include <crl/crl_async.h>
  #include <crl/crl_on_main.h>