[mixxx] Switch back to GCC 13
by Uwe Klotz
commit 4aa21c418e7bf56e56c66f85437b9925efc4b742
Author: Uwe Klotz <uwe.klotz(a)gmail.com>
Date: Sat Apr 22 15:53:39 2023 +0200
Switch back to GCC 13
aarch64_asm_operand_widths.patch | 16 +++-------------
fidlib-fno-finite-math.patch | 20 ++++++++++++++++++++
mixxx.spec | 22 ++++++++--------------
3 files changed, 31 insertions(+), 27 deletions(-)
---
diff --git a/aarch64_asm_operand_widths.patch b/aarch64_asm_operand_widths.patch
index fdd523d..bd00507 100644
--- a/aarch64_asm_operand_widths.patch
+++ b/aarch64_asm_operand_widths.patch
@@ -1,13 +1,3 @@
-From 38a145c6ba4022c70f36290c7f52d5cb91826a95 Mon Sep 17 00:00:00 2001
-From: Uwe Klotz <uwe.klotz(a)gmail.com>
-Date: Mon, 17 Apr 2023 22:41:32 +0200
-Subject: [PATCH] aarch64: Fix -Wasm-operand-widths
-
----
- src/soundio/sounddevicenetwork.cpp | 2 +-
- src/soundio/sounddeviceportaudio.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
diff --git a/src/soundio/sounddevicenetwork.cpp b/src/soundio/sounddevicenetwork.cpp
index aff65b9dc0..8da832d6a9 100644
--- a/src/soundio/sounddevicenetwork.cpp
@@ -20,7 +10,7 @@ index aff65b9dc0..8da832d6a9 100644
+ int64_t savedFPCR;
asm volatile("mrs %[savedFPCR], FPCR"
: [ savedFPCR ] "=r"(savedFPCR));
-
+
diff --git a/src/soundio/sounddeviceportaudio.cpp b/src/soundio/sounddeviceportaudio.cpp
index 681d0942cc..97a4429420 100644
--- a/src/soundio/sounddeviceportaudio.cpp
@@ -33,7 +23,7 @@ index 681d0942cc..97a4429420 100644
+ int64_t savedFPCR;
asm volatile("mrs %[savedFPCR], FPCR"
: [ savedFPCR ] "=r"(savedFPCR));
-
---
+
+--
2.40.0
diff --git a/fidlib-fno-finite-math.patch b/fidlib-fno-finite-math.patch
new file mode 100644
index 0000000..1e311ef
--- /dev/null
+++ b/fidlib-fno-finite-math.patch
@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9a3c93f044..18f30caf62 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1852,10 +1852,13 @@ add_library(fidlib STATIC EXCLUDE_FROM_ALL lib/fidlib/fidlib.c)
+ if(MSVC)
+ target_compile_definitions(fidlib PRIVATE T_MSVC)
+ target_compile_definitions(fidlib PRIVATE _USE_MATH_DEFINES)
++ target_compile_options(fidlib PRIVATE /W3)
+ elseif(MINGW)
+ target_compile_definitions(fidlib PRIVATE T_MINGW)
++ target_compile_options(fidlib PRIVATE -fno-finite-math-only)
+ else()
+ target_compile_definitions(fidlib PRIVATE T_LINUX)
++ target_compile_options(fidlib PRIVATE -fno-finite-math-only)
+ endif()
+ target_include_directories(mixxx-lib SYSTEM PUBLIC lib/fidlib)
+ target_link_libraries(mixxx-lib PRIVATE fidlib)
+--
+2.40.0
diff --git a/mixxx.spec b/mixxx.spec
index 2702f99..42982e8 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -25,7 +25,7 @@
Name: mixxx
Version: 2.3.4
-Release: 3%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 4%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
@@ -35,10 +35,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{
Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder...
Patch0: disable_werror_in_tests.patch
Patch1: aarch64_asm_operand_widths.patch
-
-# TODO: Switch back from "clang" to "gcc" after issues have been fixed?
-# See also: <https://github.com/mixxxdj/mixxx/issues/11483>
-%global toolchain clang
+Patch2: fidlib-fno-finite-math.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -46,7 +43,7 @@ BuildRequires: appstream
BuildRequires: protobuf-compiler
BuildRequires: cmake
BuildRequires: ccache
-BuildRequires: clang
+BuildRequires: gcc-c++
BuildRequires: ninja-build
# Build Requirements
@@ -125,9 +122,6 @@ cp %{SOURCE1} %{__cmake_builddir}/downloads
%cmake \
-GNinja \
- -DCMAKE_C_COMPILER=clang \
- -DCMAKE_CXX_COMPILER=clang++ \
- -DCMAKE_LINKER=clang++ \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOPTIMIZE=portable \
-DINSTALL_USER_UDEV_RULES=ON \
@@ -170,22 +164,19 @@ rm -rf \
%check
-# TODO: Re-enable Denormal test after Mixxx v2.3.5 has been released.
-# <https://github.com/mixxxdj/mixxx/issues/11484>
-
# TODO: Enable EngineBufferE2ETest after spurious failures for
# x86_64 when run on AMD EPYC have been resolved. Varying tests
# are failing sometimes.
%ifarch x86_64
%global ctest_timeout_secs 180
- %global ctest_exclude_regex EngineBufferE2ETest|Denormal
+ %global ctest_exclude_regex EngineBufferE2ETest
%endif
# TODO: Enable ControllerEngine NaN tests on ARM after the cause for
# the failing tests has been found and fixed.
%ifarch %{arm32} %{arm64}
%global ctest_timeout_secs 300
- %global ctest_exclude_regex setValue_IgnoresNaN|setParameter_NaN|Denormal
+ %global ctest_exclude_regex setValue_IgnoresNaN|setParameter_NaN
%endif
%ifarch %{power64}
@@ -222,6 +213,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Sat Apr 22 2023 Uwe Klotz <uklotz(a)gmail.com> - 2.3.4-4
+- Switch back to GCC 13
+
* Mon Apr 17 2023 Uwe Klotz <uklotz(a)gmail.com> - 2.3.4-3
- Switch from GCC 13 to Clang 16
1 year, 10 months
[libheif-freeworld] update to 1.15.2
by Dominik Mierzejewski
commit 5bc29f1ee3a8e82ad619983a15b8cf3027468c5a
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Apr 21 12:09:16 2023 +0200
update to 1.15.2
drop obsolete patch
.gitignore | 2 +-
910588338cf2a17207c09b315baddf003e86316c.patch | 22 ----------------------
libheif-freeworld.spec | 10 ++++++----
sources | 2 +-
4 files changed, 8 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4640651..ed46e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/libheif-1.15.1.tar.gz
+/libheif-*.tar.gz
diff --git a/libheif-freeworld.spec b/libheif-freeworld.spec
index d6a814a..d4b62da 100644
--- a/libheif-freeworld.spec
+++ b/libheif-freeworld.spec
@@ -1,13 +1,11 @@
Name: libheif-freeworld
-Version: 1.15.1
-Release: 5%{?dist}
+Version: 1.15.2
+Release: 1%{?dist}
Summary: HEVC support for HEIF and AVIF file format decoder and encoder
License: LGPL-3.0-or-later and MIT
URL: https://github.com/strukturag/libheif
Source0: %{url}/archive/v%{version}/libheif-%{version}.tar.gz
-# gcc-13 fix
-Patch0: %{url}/commit/910588338cf2a17207c09b315baddf003e86316c.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -61,6 +59,10 @@ popd
%{_libdir}/libheif/libheif-x265.so
%changelog
+* Fri Apr 21 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 1.15.2-1
+- update to 1.15.2
+- drop obsolete patch
+
* Sun Apr 16 2023 Sérgio Basto <sergio(a)serjux.com> - 1.15.1-5
- Obsolete libheif-hevc to prevent conflict
diff --git a/sources b/sources
index 7821299..161bf8f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libheif-1.15.1.tar.gz) = 966a95dacc12722d2dd37d449125c3df08f9e9be76ec2dc6762866bf285442c33836046df884b50cc14c799dfdcc1d5c9b16e4f9f36a2dbaf422df089756a234
+SHA512 (libheif-1.15.2.tar.gz) = 075a7aba14be6abcd8ff129ba94f6195cd5c1a4197a96f3214c323e0028f1b4810e8ea54ecb5c5711f6ebab8be92087c06ca3a1a222ebe9047fc1323ab6e56e5
1 year, 10 months
[VirtualBox] sync with virtualbox-guest-additions
by Sérgio M. Basto
commit 995936b096dcc684cf1cb4ea7cb3c236aa525a47
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Apr 20 15:56:44 2023 +0100
sync with virtualbox-guest-additions
VirtualBox.spec | 37 +++++++++++++++++++++----------------
1 file changed, 21 insertions(+), 16 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 6e083c9..f26e63a 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -46,7 +46,7 @@
Name: VirtualBox
Version: 7.0.8
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -276,11 +276,12 @@ Requires: %(xserver-sdk-abi-requires xinput)
%description guest-additions
-This subpackage is like the VirtualBox Guest Additions but just for Fedora,
-therefore it should be installed only in a Fedora guest system.
-This subpackage provides tools that use kernel modules for supporting
-integration with the Host, including file sharing, clipboard sharing,
-X.org X11 video and mouse driver, USB and webcam proxy and Seamless mode.
+This package replaces the application of Virtualbox's own methodology to
+install Guest Additions (in menu: Devices | Insert Guest Additions CD-image file).
+This subpackage provides tools that use kernel modules which support better
+integration of VirtualBox guests with the Host, including file sharing, clipboard sharing,
+video and mouse driver, USB and webcam proxy and Seamless mode.
+
%package kmodsrc
Summary: %{name} kernel module source code
@@ -407,16 +408,16 @@ kmk %{_smp_mflags} \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_USE_SYSTEM_GL_HEADERS=1 \
%{!?legacy_vboxvideo_drv: VBOX_NO_LEGACY_XORG_X11=1 } \
- SDK_VBOX_LIBPNG_INCS=/usr/include/libpng16 \
- SDK_VBOX_LIBXML2_INCS=/usr/include/libxml2 \
- SDK_VBOX_LZF_LIBS="lzf" \
- SDK_VBOX_LZF_INCS="/usr/include/liblzf" \
+ SDK_VBoxLibPng_INCS=/usr/include/libpng16 \
+ SDK_VBoxLibXml2_INCS=/usr/include/libxml2 \
+ SDK_VBoxLzf_LIBS="lzf" \
+ SDK_VBoxLzf_INCS="/usr/include/liblzf" \
SDK_VBOX_OPENSSL_INCS="" \
SDK_VBOX_OPENSSL_LIBS="ssl crypto" \
- SDK_VBOX_ZLIB_INCS="" \
+ SDK_VBoxZlib_INCS="" \
%{?with_system_libtpms: SDK_VBOX_LIBTPMS_INCS="/usr/include/libtpms"} \
- SDK_VBOX_VORBIS_INCS="/usr/include/vorbis" \
- SDK_VBOX_OGG_INCS="/usr/include/ogg" \
+ SDK_VBoxLibVorbis_INCS="/usr/include/vorbis" \
+ SDK_VBoxLibOgg_INCS="/usr/include/ogg" \
%{!?with_dxvk_native: VBOX_WITH_DXVK= } \
%{?with_docs: VBOX_WITH_DOCS=1 } \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
@@ -431,7 +432,7 @@ kmk %{_smp_mflags} \
# build fails with system dxvk_native
-#{?with_dxvk_native: SDK_VBOX_DXVK_INCS="/usr/include/dxvk-native/native/directx /usr/include/dxvk-native/native/windows"} \
+#{?with_dxvk_native: SDK_VBoxDxVk_INCS="/usr/include/dxvk-native/native/directx /usr/include/dxvk-native/native/windows"} \
#
# In file included from /usr/include/dxvk-native/native/windows/windows.h:3,
#from /usr/include/dxvk-native/native/directx/d3d11_1.h:12,
@@ -741,9 +742,9 @@ fi
# Add a group "vboxsf" for Shared Folders access
# All users which want to access the auto-mounted Shared Folders have to
# be added to this group.
-getent group vboxsf >/dev/null || groupadd -r vboxsf
+getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
getent passwd vboxadd >/dev/null || \
- useradd -r -g 1 -d /var/run/vboxadd -s /sbin/nologin vboxadd
+ useradd -r -g 1 -d /var/run/vboxadd -s /sbin/nologin vboxadd 2>&1
# Guest additions install
%post guest-additions
@@ -899,6 +900,10 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Apr 19 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-2
+- sync with virtualbox-guest-additions.spec
+- Replaces with sed -i "s/VBOX_ZLIB_STATIC/VBoxZlibStatic/; s/VBOX_ZLIB-x86/VBoxZlib-x86/; s/VBOX_ZLIB/VBoxZlib/; s/VBOX_LIBXML2/VBoxLibXml2/; s/VBOX_VPX/VBoxLibVpx/;s/VBOX_LZF/VBoxLzf/;s/VBOX_LIBPNG/VBoxLibPng/; s/VBOX_LIBCURL/VBoxLibCurl/;s/VBOX_DXVK/VBoxDxVk/;s/VBOX_OGG/VBoxLibOgg/;s/VBOX_VORBIS/VBoxLibVorbis/; s/VBOX_TPMS/VBoxLibTpms/" VirtualBox.spec
+
* Tue Apr 18 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.8-1
- Update VirtualBox to 7.0.8
1 year, 10 months
[mesa-freeworld/f37] Re-introduce Conflicts (rfbz#6612, kwizart)
by Thorsten Leemhuis
commit 5e4cdf851b243b52dfffd3b66394568c1486f4ae
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Thu Apr 20 15:40:30 2023 +0200
Re-introduce Conflicts (rfbz#6612, kwizart)
Enforces version to avoid miss-match with fedora (rfbz#6613, kwizart)
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
mesa-freeworld.spec | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 200206d..38c1ca4 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -58,7 +58,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 23.0.2
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 1%{?dist}
+Release: 1%{?dist}.1
License: MIT
URL: http://www.mesa3d.org
@@ -148,7 +148,8 @@ BuildRequires: pkgconfig(vulkan)
%if 0%{?with_va}
%package -n %{srcname}-va-drivers-freeworld
Summary: Mesa-based VA-API drivers
-Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version}
+Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}
+Conflicts: %{srcname}-va-drivers%{?_isa}
%description -n %{srcname}-va-drivers-freeworld
%{_description}
@@ -157,7 +158,8 @@ Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version}
%if 0%{?with_vdpau}
%package -n %{srcname}-vdpau-drivers-freeworld
Summary: Mesa-based VDPAU drivers
-Requires: %{srcname}-filesystem%{?_isa} >= %{?epoch:%{epoch}:}%{version}
+Requires: %{srcname}-filesystem%{?_isa} = %{?epoch:%{epoch}:}%{version}
+Conflicts: %{srcname}-vdpau-drivers%{?_isa}
%description -n %{srcname}-vdpau-drivers-freeworld
%{_description}
@@ -286,6 +288,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%license docs/license.rst
%endif
%changelog
+* Thu Apr 20 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.0.2-1.1
+- Re-introduce Conflicts (rfbz#6612, kwizart)
+- Enforces version to avoid miss-match with fedora (rfbz#6613, kwizart)
+
* Thu Apr 13 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.0.2-1
- Update to 23.0.2
1 year, 10 months
[mesa-freeworld/f38] (4 commits) ...fix typo in nickname
by Thorsten Leemhuis
Summary of changes:
c6c76ab... Enforces version to avoid miss-match with fedora (*)
fb4fb5f... Re-introduce Conflicts - rfbz#6612 (*)
474cfea... Re-introduce Conflicts (rfbz#6612, kwizard) (*)
9878150... fix typo in nickname (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 10 months
[mesa-freeworld] fix typo in nickname
by Thorsten Leemhuis
commit 9878150fe47c1e0d05784740040440cd4c41cb94
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Thu Apr 20 15:37:52 2023 +0200
fix typo in nickname
mesa-freeworld.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index e7af844..3eed02a 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -289,8 +289,8 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
* Thu Apr 20 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.0.2-1.1
-- Re-introduce Conflicts (rfbz#6612, kwizard)
-- Enforces version to avoid miss-match with fedora (rfbz#6613, kwizard)
+- Re-introduce Conflicts (rfbz#6612, kwizart)
+- Enforces version to avoid miss-match with fedora (rfbz#6613, kwizart)
* Thu Apr 13 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.0.2-1
- Update to 23.0.2
1 year, 10 months
[mesa-freeworld] Re-introduce Conflicts (rfbz#6612, kwizard)
by Thorsten Leemhuis
commit 474cfeaf64ac5d89ea754574d509f3d99abf92b5
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Thu Apr 20 15:14:22 2023 +0200
Re-introduce Conflicts (rfbz#6612, kwizard)
Enforces version to avoid miss-match with fedora (rfbz#6613, kwizard)
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
mesa-freeworld.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 963760e..e7af844 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -58,7 +58,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 23.0.2
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 1%{?dist}
+Release: 1%{?dist}.1
License: MIT
URL: http://www.mesa3d.org
@@ -288,6 +288,10 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%license docs/license.rst
%endif
%changelog
+* Thu Apr 20 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.0.2-1.1
+- Re-introduce Conflicts (rfbz#6612, kwizard)
+- Enforces version to avoid miss-match with fedora (rfbz#6613, kwizard)
+
* Thu Apr 13 2023 Thorsten Leemhuis <fedora(a)leemhuis.info> - 23.0.2-1
- Update to 23.0.2
1 year, 10 months
[telegram-desktop] Removed legacy use flags.
by Vitaly Zaitsev
commit 2130021214ae5ce919e61f15a1c6d58e916d98f8
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Apr 19 18:21:41 2023 +0200
Removed legacy use flags.
telegram-desktop.spec | 99 ++++++++++++---------------------------------------
1 file changed, 22 insertions(+), 77 deletions(-)
---
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index b35c5d1..ec28ce0 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,10 +1,3 @@
-# Build conditionals...
-%global bundled_fonts 1
-%global enable_wayland 1
-%global enable_x11 1
-%global legacy_ffmpeg 0
-%global legacy_openssl 0
-
# Telegram Desktop's constants...
%global appname tdesktop
@@ -41,6 +34,7 @@ ExclusiveArch: x86_64 aarch64
BuildRequires: cmake(Microsoft.GSL)
BuildRequires: cmake(OpenAL)
+BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6Core5Compat)
BuildRequires: cmake(Qt6DBus)
@@ -49,6 +43,7 @@ BuildRequires: cmake(Qt6Network)
BuildRequires: cmake(Qt6OpenGL)
BuildRequires: cmake(Qt6OpenGLWidgets)
BuildRequires: cmake(Qt6Svg)
+BuildRequires: cmake(Qt6WaylandClient)
BuildRequires: cmake(Qt6Widgets)
BuildRequires: cmake(range-v3)
BuildRequires: cmake(tg_owt)
@@ -61,18 +56,33 @@ BuildRequires: pkgconfig(glibmm-2.68) >= 2.76.0
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(hunspell)
BuildRequires: pkgconfig(jemalloc)
+BuildRequires: pkgconfig(libavcodec)
+BuildRequires: pkgconfig(libavfilter)
+BuildRequires: pkgconfig(libavformat)
+BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libcrypto)
BuildRequires: pkgconfig(liblz4)
BuildRequires: pkgconfig(liblzma)
BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(libswresample)
+BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(libxxhash)
+BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(protobuf-lite)
BuildRequires: pkgconfig(rnnoise)
BuildRequires: pkgconfig(vpx)
+BuildRequires: pkgconfig(wayland-client)
+BuildRequires: pkgconfig(webkitgtk-6.0)
+BuildRequires: pkgconfig(xcb)
+BuildRequires: pkgconfig(xcb-keysyms)
+BuildRequires: pkgconfig(xcb-record)
+BuildRequires: pkgconfig(xcb-screensaver)
BuildRequires: cmake
BuildRequires: desktop-file-utils
+BuildRequires: ffmpeg-devel
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libappstream-glib
@@ -84,69 +94,12 @@ BuildRequires: minizip-compat-devel
BuildRequires: ninja-build
BuildRequires: python3
BuildRequires: qt6-qtbase-private-devel
-
-%if %{bundled_fonts}
-Provides: bundled(open-sans-fonts) = 1.10
-Provides: bundled(vazirmatn-fonts) = 27.2.2
-%else
-Requires: open-sans-fonts
-Requires: vazirmatn-fonts
-%endif
-
-%if %{enable_wayland}
-BuildRequires: cmake(Qt6Concurrent)
-BuildRequires: cmake(Qt6WaylandClient)
-BuildRequires: pkgconfig(wayland-client)
BuildRequires: qt6-qtbase-static
-Provides: bundled(kf5-kcoreaddons) = 5.101.0
-Provides: bundled(plasma-wayland-protocols) = 1.6.0
-%endif
-
-%if %{enable_x11}
-BuildRequires: pkgconfig(xcb)
-BuildRequires: pkgconfig(xcb-keysyms)
-BuildRequires: pkgconfig(xcb-record)
-BuildRequires: pkgconfig(xcb-screensaver)
-%endif
-
-%if 0%{?fedora} && 0%{?fedora} >= 37
-BuildRequires: pkgconfig(webkit2gtk-4.1)
-Requires: webkit2gtk4.1%{?_isa}
-%else
-BuildRequires: pkgconfig(webkit2gtk-4.0)
-Requires: webkit2gtk3%{?_isa}
-%endif
-
-# Telegram Desktop has major issues when built against ffmpeg 5.x:
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6273
-# Upstream refuses to fix this issue:
-# https://github.com/telegramdesktop/tdesktop/issues/24855
-# https://github.com/telegramdesktop/tdesktop/issues/23899
-%if %{legacy_ffmpeg}
-BuildRequires: compat-ffmpeg4-devel
-%else
-BuildRequires: pkgconfig(libavcodec)
-BuildRequires: pkgconfig(libavfilter)
-BuildRequires: pkgconfig(libavformat)
-BuildRequires: pkgconfig(libavutil)
-BuildRequires: pkgconfig(libswresample)
-BuildRequires: pkgconfig(libswscale)
-BuildRequires: ffmpeg-devel
-%endif
-
-# Video calls doesn't work when built against openssl 3.0:
-# https://github.com/telegramdesktop/tdesktop/issues/24698
-%if %{legacy_openssl}
-BuildRequires: openssl1.1-devel
-Requires: openssl1.1%{?_isa}
-%else
-BuildRequires: pkgconfig(libcrypto)
-BuildRequires: pkgconfig(openssl)
-%endif
%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
Requires: hicolor-icon-theme
Requires: qt6-qtimageformats%{?_isa}
+Requires: webkitgtk6.0%{?_isa}
# Telegram Desktop can use native open/save dialogs with XDG portals.
Recommends: xdg-desktop-portal%{?_isa}
@@ -160,8 +113,12 @@ Provides: telegram%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
# Virtual provides for bundled libraries...
Provides: bundled(cld3) = 3.0.13~gitb48dc46
+Provides: bundled(kf5-kcoreaddons) = 5.106.0
Provides: bundled(libtgvoip) = 2.4.4~git7c46f4c
+Provides: bundled(open-sans-fonts) = 1.10
+Provides: bundled(plasma-wayland-protocols) = 1.6.0
Provides: bundled(rlottie) = 0~git8c69fc2
+Provides: bundled(vazirmatn-fonts) = 27.2.2
%description
Telegram is a messaging app with a focus on speed and security, it’s super
@@ -193,21 +150,9 @@ rm -rf Telegram/ThirdParty/{GSL,QR,dispatch,expected,fcitx-qt5,fcitx5-qt,hime,hu
-DTDESKTOP_API_ID=611335 \
-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
-DDESKTOP_APP_USE_PACKAGED:BOOL=ON \
-%if %{bundled_fonts}
-DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=OFF \
-%else
- -DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \
-%endif
-%if %{enable_wayland}
-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=OFF \
-%else
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=ON \
-%endif
-%if %{enable_x11}
-DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=OFF \
-%else
- -DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=ON \
-%endif
-DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON
%cmake_build
1 year, 10 months
