1 |
commit: 7d6638241729057c5f0739fe4fc13539d93736eb |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 07:31:38 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 07:56:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d663824 |
7 |
|
8 |
net-im/telegram-desktop: remove alsa,webrtc flags |
9 |
|
10 |
alsa is now required unconditionally due to webrtc |
11 |
pulse now should work with apulse[sdk] or pulsaudio |
12 |
webrtc is impossible to disable, remove the flag. |
13 |
|
14 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
15 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
16 |
|
17 |
net-im/telegram-desktop/metadata.xml | 1 - |
18 |
.../telegram-desktop/telegram-desktop-2.4.4.ebuild | 29 ++++++++++------------ |
19 |
2 files changed, 13 insertions(+), 17 deletions(-) |
20 |
|
21 |
diff --git a/net-im/telegram-desktop/metadata.xml b/net-im/telegram-desktop/metadata.xml |
22 |
index 4e1022a426d..f7ab5b26ef9 100644 |
23 |
--- a/net-im/telegram-desktop/metadata.xml |
24 |
+++ b/net-im/telegram-desktop/metadata.xml |
25 |
@@ -9,6 +9,5 @@ |
26 |
<flag name="enchant">Enable the app-text/aspell spell-checking backend</flag> |
27 |
<flag name="hunspell">Enable the app-text/hunspell spell-checking backend</flag> |
28 |
<flag name="lto">Enable Link Time Optimization (LTO / IPO)</flag> |
29 |
- <flag name="webrtc">WebRTC based video call support</flag> |
30 |
</use> |
31 |
</pkgmetadata> |
32 |
|
33 |
diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild |
34 |
index d5937adb078..c95a2185c2e 100644 |
35 |
--- a/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild |
36 |
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.4.ebuild |
37 |
@@ -14,15 +14,13 @@ TG_OWT_COMMIT="c73a4718cbff7048373a63db32068482e5fd11ef" |
38 |
DESCRIPTION="Official desktop client for Telegram" |
39 |
HOMEPAGE="https://desktop.telegram.org" |
40 |
SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz |
41 |
- webrtc? ( |
42 |
- https://github.com/desktop-app/tg_owt/archive/c73a4718cbff7048373a63db32068482e5fd11ef.tar.gz -> tg_owt-${TG_OWT_COMMIT}.tar.gz |
43 |
- ) |
44 |
+ https://github.com/desktop-app/tg_owt/archive/c73a4718cbff7048373a63db32068482e5fd11ef.tar.gz -> tg_owt-${TG_OWT_COMMIT}.tar.gz |
45 |
" |
46 |
|
47 |
-LICENSE="GPL-3-with-openssl-exception LGPL-2+ webrtc? ( BSD )" |
48 |
+LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" |
49 |
SLOT="0" |
50 |
KEYWORDS="~amd64 ~ppc64" |
51 |
-IUSE="+alsa +dbus enchant +gtk +hunspell libressl lto +pulseaudio +spell +webrtc +X" |
52 |
+IUSE="+dbus enchant +gtk +hunspell libressl lto pulseaudio +spell +X" |
53 |
|
54 |
RDEPEND=" |
55 |
!net-im/telegram-desktop-bin |
56 |
@@ -38,11 +36,13 @@ RDEPEND=" |
57 |
dev-qt/qtsvg:5 |
58 |
dev-qt/qtwidgets:5[png,X(-)?] |
59 |
media-fonts/open-sans |
60 |
+ media-libs/alsa-lib |
61 |
media-libs/fontconfig:= |
62 |
- ~media-libs/libtgvoip-2.4.4_p20200818[alsa?,pulseaudio?] |
63 |
- media-libs/openal[alsa?,pulseaudio?] |
64 |
+ media-libs/libjpeg-turbo:= |
65 |
+ ~media-libs/libtgvoip-2.4.4_p20200818 |
66 |
+ media-libs/openal[alsa] |
67 |
media-libs/opus:= |
68 |
- media-video/ffmpeg:=[alsa?,opus,pulseaudio?] |
69 |
+ media-video/ffmpeg:=[alsa,opus] |
70 |
sys-libs/zlib[minizip] |
71 |
virtual/libiconv |
72 |
x11-libs/libxcb:= |
73 |
@@ -58,8 +58,8 @@ RDEPEND=" |
74 |
x11-libs/libX11 |
75 |
) |
76 |
hunspell? ( >=app-text/hunspell-1.7:= ) |
77 |
+ !pulseaudio? ( media-sound/apulse[sdk] ) |
78 |
pulseaudio? ( media-sound/pulseaudio ) |
79 |
- webrtc? ( media-libs/libjpeg-turbo:= ) |
80 |
" |
81 |
|
82 |
DEPEND=" |
83 |
@@ -72,15 +72,13 @@ DEPEND=" |
84 |
BDEPEND=" |
85 |
>=dev-util/cmake-3.16 |
86 |
virtual/pkgconfig |
87 |
- webrtc? ( amd64? ( dev-lang/yasm ) ) |
88 |
+ amd64? ( dev-lang/yasm ) |
89 |
" |
90 |
|
91 |
REQUIRED_USE=" |
92 |
- || ( alsa pulseaudio ) |
93 |
spell? ( |
94 |
^^ ( enchant hunspell ) |
95 |
) |
96 |
- webrtc? ( alsa pulseaudio ) |
97 |
" |
98 |
|
99 |
S="${WORKDIR}/${MY_P}" |
100 |
@@ -97,7 +95,7 @@ pkg_pretend() { |
101 |
|
102 |
src_unpack() { |
103 |
default |
104 |
- use webrtc && mv -v "${WORKDIR}/tg_owt-${TG_OWT_COMMIT}" "${WORKDIR}/tg_owt" |
105 |
+ mv -v "${WORKDIR}/tg_owt-${TG_OWT_COMMIT}" "${WORKDIR}/tg_owt" || die |
106 |
} |
107 |
|
108 |
build_tg_owt() { |
109 |
@@ -124,7 +122,7 @@ src_configure() { |
110 |
append-cxxflags "${mycxxflags[@]}" |
111 |
|
112 |
# we have to build tg_owt now before running telegram's cmake |
113 |
- use webrtc && build_tg_owt |
114 |
+ build_tg_owt |
115 |
|
116 |
# TODO: unbundle header-only libs, ofc telegram uses git versions... |
117 |
# it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots |
118 |
@@ -141,10 +139,9 @@ src_configure() { |
119 |
-DTDESKTOP_LAUNCHER_BASENAME="${PN}" |
120 |
-DDESKTOP_APP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" |
121 |
-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" # enables hunspell (recommended) |
122 |
- -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION="$(usex webrtc OFF ON)" # requires pulse AND alsa |
123 |
-DDESKTOP_APP_USE_ENCHANT="$(usex enchant ON OFF)" # enables enchant and disables hunspell |
124 |
$(usex lto "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON" '') |
125 |
- $(usex webrtc "-Dtg_owt_DIR=${WORKDIR}/tg_owt_build" '') |
126 |
+ -Dtg_owt_DIR="${WORKDIR}/tg_owt_build" |
127 |
) |
128 |
|
129 |
if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then |