Page MenuHomeSolus

D10207.id.diff
No OneTemporary

D10207.id.diff

diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -33,6 +33,9 @@
libstdc++.so.6
libswresample.so.3
libswscale.so.5
+libvpx.so.6
+libxcb-keysyms.so.1
+libxcb-record.so.0
libxcb-screensaver.so.0
libxcb.so.1
libxxhash.so.0
diff --git a/files/tg_owt-Link-against-shared-libvpx.patch b/files/tg_owt-Link-against-shared-libvpx.patch
new file mode 100644
--- /dev/null
+++ b/files/tg_owt-Link-against-shared-libvpx.patch
@@ -0,0 +1,100 @@
+From bce87f403147cb1efae8bb917557efb090a15742 Mon Sep 17 00:00:00 2001
+From: Fabio Forni <livingsilver94.solus@redaril.me>
+Date: Thu, 24 Dec 2020 21:28:34 +0100
+Subject: [PATCH] Link against shared libvpx
+
+---
+ CMakeLists.txt | 24 +-----------------------
+ cmake/external.cmake | 9 +++++++++
+ 2 files changed, 10 insertions(+), 23 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d970719..e4e5b4f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,7 +45,6 @@ include(cmake/libpffft.cmake)
+ include(cmake/librnnoise.cmake)
+ include(cmake/libsrtp.cmake)
+ include(cmake/libusrsctp.cmake)
+-include(cmake/libvpx.cmake)
+ include(cmake/libwebrtcbuild.cmake)
+ include(cmake/libyuv.cmake)
+ if (NOT WIN32 AND NOT APPLE)
+@@ -77,13 +76,6 @@ if (is_x86 OR is_x64)
+ tg_owt::librnnoise
+ tg_owt::libsrtp
+ tg_owt::libusrsctp
+- tg_owt::libvpx
+- tg_owt::libvpx_mmx
+- tg_owt::libvpx_sse2
+- tg_owt::libvpx_ssse3
+- tg_owt::libvpx_sse4
+- tg_owt::libvpx_avx
+- tg_owt::libvpx_avx2
+ tg_owt::libyuv
+ )
+ else()
+@@ -97,7 +89,6 @@ else()
+ tg_owt::librnnoise
+ tg_owt::libsrtp
+ tg_owt::libusrsctp
+- tg_owt::libvpx
+ tg_owt::libyuv
+ )
+ endif()
+@@ -125,6 +116,7 @@ endif()
+ link_openssl(tg_owt)
+ link_ffmpeg(tg_owt)
+ link_opus(tg_owt)
++link_libvpx(tg_owt)
+
+ if (UNIX AND NOT APPLE)
+ link_libalsa(tg_owt)
+@@ -1867,18 +1859,6 @@ elseif (APPLE)
+ )
+ endif()
+
+-set(vpx_export)
+-if (is_x86 OR is_x64)
+- set(vpx_export
+- libvpx_mmx
+- libvpx_sse2
+- libvpx_ssse3
+- libvpx_sse4
+- libvpx_avx
+- libvpx_avx2
+- )
+-endif()
+-
+ set(export_targets
+ tg_owt
+ libabsl
+@@ -1887,8 +1867,6 @@ set(export_targets
+ librnnoise
+ libsrtp
+ libusrsctp
+- libvpx
+- ${vpx_export}
+ libwebrtcbuild
+ libyuv
+ ${platform_export}
+diff --git a/cmake/external.cmake b/cmake/external.cmake
+index 964e260..ab7d46d 100644
+--- a/cmake/external.cmake
++++ b/cmake/external.cmake
+@@ -129,3 +129,12 @@ function(link_dl target_name)
+ target_link_libraries(${target_name} PRIVATE ${CMAKE_DL_LIBS})
+ endif()
+ endfunction()
++
++# libvpx
++function(link_libvpx target_name)
++ if (TG_OWT_PACKAGED_BUILD)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(VPX REQUIRED vpx)
++ target_include_directories(${target_name} PRIVATE ${VPX_INCLUDE_DIRS})
++ endif()
++endfunction()
+--
+2.29.2
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,9 +1,10 @@
name : telegram
-version : 2.4.2
-release : 140
+version : 2.5.1
+release : 141
source :
- - https://github.com/telegramdesktop/tdesktop/releases/download/v2.4.2/tdesktop-2.4.2-full.tar.gz : 10c4d422d5d0fdac5dc0301c8a2acc828435cbf217b4574cf8d37e4323b68e59
- - https://github.com/desktop-app/tg_owt/archive/7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/owt-7a9d4bd.tar.gz : 0c3d2476b218333ea5051b4a5364545a4a27a1d04001b1ce4843e038fba45130
+ - https://github.com/telegramdesktop/tdesktop/releases/download/v2.5.1/tdesktop-2.5.1-full.tar.gz : f1cc5e876deaa4fa4eaafbba95f127d5a3114c166802902b8584099852b9eae2
+ - https://github.com/desktop-app/tg_owt/archive/75ac66937341d8a9207375aaee79b4bdc500146c/tg_owt.tar.gz : 6e27cf6d8997630d04c45e15b654a91d3703a6726d5e09399c4795c8c330fe55
+ - git|https://chromium.googlesource.com/libyuv/libyuv.git : 058746415698c6e101442c2b3e95f50832281671
license : GPL-3.0-or-later
component : network.im
summary : Telegram is a messaging app with a focus on speed and security, it’s super fast, simple and free.
@@ -25,6 +26,9 @@
- pkgconfig(minizip)
- pkgconfig(openal)
- pkgconfig(opus)
+ - pkgconfig(protobuf)
+ - pkgconfig(vpx)
+ - pkgconfig(xcb-keysyms)
- range-v3
- xxhash-devel
- yasm
@@ -34,8 +38,12 @@
mkdir tg_owt
pushd tg_owt
- tar xf $sources/owt-* --strip-components=1
- %cmake_ninja
+ tar xf $sources/tg_owt.tar.gz --strip-components=1
+ %patch -p1 < $pkgfiles/tg_owt-Link-against-shared-libvpx.patch
+ rmdir src/third_party/libyuv
+ ln -s $sources/libyuv.git src/third_party/libyuv
+
+ %cmake_ninja -DBUILD_SHARED_LIBS=NO # We want Telegram to statically link to tg_owt.
%ninja_build
popd
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>telegram</Name>
<Packager>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>network.im</PartOf>
@@ -32,12 +32,12 @@
</Files>
</Package>
<History>
- <Update release="140">
- <Date>2020-11-21</Date>
- <Version>2.4.2</Version>
+ <Update release="141">
+ <Date>2020-12-24</Date>
+ <Version>2.5.1</Version>
<Comment>Packaging update</Comment>
- <Name>F. von Gellhorn</Name>
- <Email>flinux@vongellhorn.ch</Email>
+ <Name>Fabio Forni</Name>
+ <Email>livingsilver94.solus@redaril.me</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
Apr 26 2023, 4:31 PM (15 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5795980
Default Alt Text
D10207.id.diff (5 KB)

Event Timeline