Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package telegram-desktop for
openSUSE:Factory checked in at 2024-08-23 22:26:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/telegram-desktop (Old)
and /work/SRC/openSUSE:Factory/.telegram-desktop.new.2698 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telegram-desktop"
Fri Aug 23 22:26:40 2024 rev:123 rq:1195585 version:5.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/telegram-desktop/telegram-desktop.changes
2024-07-11 20:34:33.739878542 +0200
+++
/work/SRC/openSUSE:Factory/.telegram-desktop.new.2698/telegram-desktop.changes
2024-08-23 22:27:48.739755583 +0200
@@ -1,0 +2,19 @@
+Thu Aug 22 05:30:55 UTC 2024 - Xu Zhao <i...@xuzhao.net>
+
+- Remove 0007-tg-owt-disable-h264.patch
+- Add tg_owt-dlopen-headers.tar.gz
+- Update tg_owt-packager.sh to use the forked version with dlopen.
+
+-------------------------------------------------------------------
+Wed Aug 21 22:49:40 UTC 2024 - Xu Zhao <i...@xuzhao.net>
+
+- Update to version 5.4.1
+ * Fix crash when sending Star Reaction in comments.
+ * Fix loading "Send As" channels in a channel.
+ * Place Star Reaction always first in list.
+ * Removed paid Invite Links in groups.
+- Add 0005-use-bundled-ada.patch
+- Add 0006-tdesktop-disable-h264.patch
+- Add 0007-tg-owt-disable-h264.patch
+
+-------------------------------------------------------------------
Old:
----
tdesktop-5.2.3-full.tar.gz
tg_owt-packager.py
New:
----
0005-use-bundled-ada.patch
0006-tdesktop-disable-h264.patch
ada-packager.sh
ada-v2.9.0.zip
tdesktop-5.4.1-full.tar.gz
tg_owt-dlopen-headers.tar.gz
BETA DEBUG BEGIN:
New: * Removed paid Invite Links in groups.
- Add 0005-use-bundled-ada.patch
- Add 0006-tdesktop-disable-h264.patch
New:- Add 0005-use-bundled-ada.patch
- Add 0006-tdesktop-disable-h264.patch
- Add 0007-tg-owt-disable-h264.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telegram-desktop.spec ++++++
--- /var/tmp/diff_new_pack.EMR3OI/_old 2024-08-23 22:27:50.035809487 +0200
+++ /var/tmp/diff_new_pack.EMR3OI/_new 2024-08-23 22:27:50.039809653 +0200
@@ -38,25 +38,26 @@
%define qt_major_version 6
Name: telegram-desktop
-Version: 5.2.3
+Version: 5.4.1
Release: 0
Summary: Messaging application with a focus on speed and security
License: GPL-3.0-only
Group: Productivity/Networking/Instant Messenger
URL: https://github.com/telegramdesktop/tdesktop
Source0:
https://github.com/telegramdesktop/tdesktop/releases/download/v%{version}/tdesktop-%{version}-full.tar.gz
-# Use tg_owt-packager.py to prepare tg_owt-master.zip
-# Usage: python tg_owt-packager.py --repo-dir $PWD/tg_owt-master
-# Or use tg_owt-packager.sh to prepare tg_owt-master.zip
+# Use tg_owt-packager.sh to prepare tg_owt-master.zip
# Usage: bash tg_owt-packager.sh
-Source1: tg_owt-packager.py
-Source2: tg_owt-packager.sh
-Source3: tg_owt-master.zip
+Source1: tg_owt-packager.sh
+Source2: tg_owt-master.zip
+Source3: ada-v2.9.0.zip
+# Usage: bash ads-packager.sh
+Source4: ada-packager.sh
+Source5: tg_owt-dlopen-headers.tar.gz
%if %{with use_system_rnnoise}
# PATCH-FIX-OPENSUSE
Patch1: 0001-use-bundled-webrtc.patch
%else
-Source4: rnnoise-git20210122.tar.gz
+Source6: rnnoise-git20210122.tar.gz
# PATCH-FIX-OPENSUSE
Patch1: 0002-use-bundled-rnnoise-expected-gsl-ranges-webrtc.patch
%endif
@@ -64,6 +65,10 @@
Patch3: 0003-revert-webrtc-cmake-target-file.patch
# PATCH-FIX-OPENSUSE
Patch4: 0004-use-dynamic-x-libraries.patch
+# PATCH-FIX-OPENSUSE
+Patch5: 0005-use-bundled-ada.patch
+# PATCH-FIX-OPENSUSE
+Patch6: 0006-tdesktop-disable-h264.patch
# There is an (incomplete) patch available for part of the source:
# https://github.com/desktop-app/lib_base.git
3582bca53a1e195a31760978dc41f67ce44fc7e4
# but tdesktop itself still falls short, and it looks to be something
@@ -75,6 +80,11 @@
BuildRequires: cmake >= 3.16
BuildRequires: desktop-file-utils
BuildRequires: enchant-devel
+BuildRequires: ffmpeg-6-libavcodec-devel
+BuildRequires: ffmpeg-6-libavdevice-devel
+BuildRequires: ffmpeg-6-libavfilter-devel
+BuildRequires: ffmpeg-6-libavformat-devel
+BuildRequires: ffmpeg-6-libavutil-devel
%if %{with compiler_upgrade} || %{with compiler_downgrade}
BuildRequires: gcc12
BuildRequires: gcc12-c++
@@ -88,6 +98,7 @@
BuildRequires: liblz4-devel
BuildRequires: ninja
BuildRequires: pkgconfig
+BuildRequires: python3 >= 3.7
BuildRequires: unzip
BuildRequires: wayland-devel
BuildRequires: webkit2gtk3-devel
@@ -137,11 +148,6 @@
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(jemalloc)
-BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavdevice)
-BuildRequires: pkgconfig(libavfilter)
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libmng)
@@ -219,17 +225,24 @@
%prep
%setup -q -n tdesktop-%{version}-full
-%autopatch -p1
-mkdir ../Libraries
+%autopatch -p1 -M 6
+
+cd %{_builddir}
+mkdir -p %{_builddir}/Libraries
+unzip -q %{S:3}
+mv ada-v2.9.0 %{_builddir}/Libraries/ada
+
+mkdir -p %{_builddir}/Libraries/openh264/include
+tar xzf %{S:5}
+mv wels %{_builddir}/Libraries/openh264/include/
# If not TW, unpack rnnoise source
%if %{without use_system_rnnoise}
-%setup -q -T -D -b 4 -n tdesktop-%{version}-full
+%setup -q -T -D -b 6 -n tdesktop-%{version}-full
mv ../rnnoise-git20210122 ../Libraries/rnnoise
%endif
-cd ../
-unzip -q %{SOURCE3}
+unzip -q %{SOURCE2}
mv tg_owt-master Libraries/tg_owt
%build
@@ -253,6 +266,14 @@
popd
%endif
+# Build Ada
+pushd %{_builddir}/Libraries/ada
+cmake -GNinja -B build . \
+ -D CMAKE_BUILD_TYPE=None \
+ -D ADA_TESTING=OFF \
+ -D ADA_TOOLS=OFF
+cmake --build build --parallel
+
cd %{_builddir}/Libraries/tg_owt
mkdir -p out/Release
cd out/Release
@@ -261,8 +282,10 @@
%ifarch armv7l armv7hl
-DTG_OWT_ARCH_ARMV7_USE_NEON=OFF \
%endif
+ -DTG_OWT_DLOPEN_H264=ON \
-DTG_OWT_SPECIAL_TARGET=linux \
-DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/include \
+ -DTG_OWT_OPENH264_INCLUDE_PATH=%{_builddir}/Libraries/openh264/include \
-DTG_OWT_OPENSSL_INCLUDE_PATH=/usr/include/openssl \
-DTG_OWT_OPUS_INCLUDE_PATH=/usr/include/opus \
-DTG_OWT_FFMPEG_INCLUDE_PATH=/usr/include/ffmpeg \
++++++ 0005-use-bundled-ada.patch ++++++
diff --git a/cmake/external/ada/CMakeLists.txt
b/cmake/external/ada/CMakeLists.txt
index 4b8063b..fbddaac 100644
--- a/cmake/external/ada/CMakeLists.txt
+++ b/cmake/external/ada/CMakeLists.txt
@@ -4,7 +4,7 @@
# For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL
-if (DESKTOP_APP_USE_PACKAGED)
+if (NOT DESKTOP_APP_USE_PACKAGED)
add_library(external_ada INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_ada ALIAS external_ada)
@@ -37,10 +37,9 @@ elseif (APPLE)
else()
target_include_directories(external_ada SYSTEM
INTERFACE
- /usr/local/include
+ ${libs_loc}/ada/include
)
- find_library(DESKTOP_APP_ADA_LIBRARIES libada.a REQUIRED)
set_target_properties(external_ada PROPERTIES
- IMPORTED_LOCATION "${DESKTOP_APP_ADA_LIBRARIES}"
+ IMPORTED_LOCATION ${libs_loc}/ada/build/src/libada.a
)
endif()
++++++ 0006-tdesktop-disable-h264.patch ++++++
diff --git a/cmake/external/webrtc/CMakeLists.txt
b/cmake/external/webrtc/CMakeLists.txt
index 67159d6..0caf765 100644
--- a/cmake/external/webrtc/CMakeLists.txt
+++ b/cmake/external/webrtc/CMakeLists.txt
@@ -134,7 +134,7 @@ else()
Xrandr
Xrender
Xtst
- openh264
+ # openh264
)
target_link_libraries(external_webrtc
INTERFACE
++++++ ada-packager.sh ++++++
#! /bin/bash
rm -rf ada \
&& git clone -b v2.9.0 --depth=1 https://github.com/ada-url/ada.git \
&& cd ada \
&& rm -rf .git \
&& cd .. \
&& mv ada ada-v2.9.0 \
&& zip ada-v2.9.0.zip -r ada-v2.9.0 -x '*.git*' \
rm -rf ada-v2.9.0
++++++ tdesktop-5.2.3-full.tar.gz -> tdesktop-5.4.1-full.tar.gz ++++++
/work/SRC/openSUSE:Factory/telegram-desktop/tdesktop-5.2.3-full.tar.gz
/work/SRC/openSUSE:Factory/.telegram-desktop.new.2698/tdesktop-5.4.1-full.tar.gz
differ: char 5, line 1
++++++ tg_owt-master.zip ++++++
/work/SRC/openSUSE:Factory/telegram-desktop/tg_owt-master.zip
/work/SRC/openSUSE:Factory/.telegram-desktop.new.2698/tg_owt-master.zip differ:
char 11, line 2
++++++ tg_owt-packager.sh ++++++
--- /var/tmp/diff_new_pack.EMR3OI/_old 2024-08-23 22:27:50.191815975 +0200
+++ /var/tmp/diff_new_pack.EMR3OI/_new 2024-08-23 22:27:50.195816142 +0200
@@ -2,14 +2,16 @@
# tg_owt origin
# get it from
https://github.com/telegramdesktop/tdesktop/blob/dev/Telegram/build/docker/centos_env/Dockerfile
around line 761
-tg_owt_origin="c9cc4390ab951f2cbc103ff783a11f398b27660b"
+# tg_owt_origin="4a60ce1ab9fdb962004c6a959f682ace3db50cbd"
+# use xuzhao9's fork to workaround the h264 dlopen issue
+tg_owt_origin="0342ae21ee2cc6c6052798bc8fa6b737d9a66418"
rm -rf tg_owt \
&& mkdir tg_owt \
&& cd tg_owt \
&& git init tg_owt \
&& cd tg_owt \
- && git remote add origin https://github.com/desktop-app/tg_owt.git \
+ && git remote add origin https://github.com/xuzhao9/tg_owt.git \
&& git fetch --depth=1 origin "$tg_owt_origin" \
&& git reset --hard FETCH_HEAD \
&& git submodule update --init --recursive --depth=1 \
