diff --git a/.gitignore b/.gitignore index 88ac4e2..bd85b6a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /nheko-0.8.0.tar.gz /nheko-0.8.1.tar.gz /nheko-0.8.2.tar.gz +/nheko-0.9.0.tar.gz diff --git a/nheko-webrtc-fixes.patch b/nheko-webrtc-fixes.patch new file mode 100644 index 0000000..e55e2f8 --- /dev/null +++ b/nheko-webrtc-fixes.patch @@ -0,0 +1,28 @@ +From b439e1fa41b26db5f1d0d16bd1da664338b435e7 Mon Sep 17 00:00:00 2001 +From: Nicolas Werner +Date: Fri, 19 Nov 2021 18:19:16 +0100 +Subject: [PATCH] Preliminary gstreamer 1.20 compatibility + +The transceiver was made private in +https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2241 + +The direction property was added here: +https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/28b0be4036ac59d6e6068586ab7bc55e8ac51166 +--- + src/voip/WebRTCSession.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/voip/WebRTCSession.cpp b/src/voip/WebRTCSession.cpp +index 801a365cb..a01b3a39e 100644 +--- a/src/voip/WebRTCSession.cpp ++++ b/src/voip/WebRTCSession.cpp +@@ -996,7 +996,8 @@ WebRTCSession::addVideoPipeline(int vp8PayloadType) + g_signal_emit_by_name(webrtcbin, "get-transceivers", &transceivers); + GstWebRTCRTPTransceiver *transceiver = + g_array_index(transceivers, GstWebRTCRTPTransceiver *, 1); +- transceiver->direction = GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDONLY; ++ g_object_set( ++ transceiver, "direction", GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_SENDONLY, nullptr); + g_array_unref(transceivers); + } + diff --git a/nheko.spec b/nheko.spec index 6578dd5..6000a2b 100644 --- a/nheko.spec +++ b/nheko.spec @@ -3,15 +3,11 @@ %if %{with clang} %global toolchain clang -# https://bugzilla.redhat.com/show_bug.cgi?id=1918924 -%ifarch %{arm} -%global _lto_cflags %{nil} -%endif %endif Name: nheko -Version: 0.8.2 -Release: 3%{?dist} +Version: 0.9.0 +Release: 1%{?dist} # Main source - GPLv3+ # cpp-httplib - bundled - MIT @@ -22,8 +18,11 @@ Summary: Desktop client for the Matrix protocol URL: https://github.com/Nheko-Reborn/%{name} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: cmake(MatrixClient) >= 0.5.1 -BuildRequires: cmake(Olm) >= 3.1.0 +# https://github.com/Nheko-Reborn/nheko/issues/819 +Patch100: %{name}-webrtc-fixes.patch + +BuildRequires: cmake(MatrixClient) >= 0.6.0 +BuildRequires: cmake(Olm) >= 3.2.6 BuildRequires: cmake(Qt5Concurrent) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) @@ -41,6 +40,7 @@ BuildRequires: cmake(mpark_variant) BuildRequires: cmake(nlohmann_json) >= 3.2.0 BuildRequires: cmake(spdlog) >= 1.0.0 +BuildRequires: pkgconfig(coeurl) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(gstreamer-audio-1.0) @@ -50,13 +50,13 @@ BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gstreamer-webrtc-1.0) BuildRequires: pkgconfig(libcmark) >= 0.29.0 BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(libevent) BuildRequires: pkgconfig(lmdb) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-ewmh) BuildRequires: pkgconfig(zlib) -BuildRequires: boost-devel >= 1.70 BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: gcc @@ -92,23 +92,26 @@ for Matrix that feels more like a mainstream chat app. %build %cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ -DCOMPILE_QML:BOOL=OFF \ -DHUNTER_ENABLED:BOOL=OFF \ -DCI_BUILD:BOOL=OFF \ -DASAN:BOOL=OFF \ -DQML_DEBUGGING:BOOL=OFF \ -DBUILD_DOCS:BOOL=OFF \ - -DUSE_BUNDLED_BOOST:BOOL=OFF \ - -DUSE_BUNDLED_SPDLOG:BOOL=OFF \ - -DUSE_BUNDLED_OLM:BOOL=OFF \ - -DUSE_BUNDLED_GTEST:BOOL=OFF \ + -DVOIP:BOOL=ON \ -DUSE_BUNDLED_CMARK:BOOL=OFF \ - -DUSE_BUNDLED_MTXCLIENT:BOOL=OFF \ + -DUSE_BUNDLED_COEURL:BOOL=OFF \ + -DUSE_BUNDLED_GTEST:BOOL=OFF \ + -DUSE_BUNDLED_JSON:BOOL=OFF \ + -DUSE_BUNDLED_LIBEVENT:BOOL=OFF \ -DUSE_BUNDLED_LMDB:BOOL=OFF \ -DUSE_BUNDLED_LMDBXX:BOOL=OFF \ - -DUSE_BUNDLED_JSON:BOOL=OFF \ + -DUSE_BUNDLED_MTXCLIENT:BOOL=OFF \ + -DUSE_BUNDLED_OLM:BOOL=OFF \ -DUSE_BUNDLED_OPENSSL:BOOL=OFF \ - -DUSE_BUNDLED_QTKEYCHAIN:BOOL=OFF + -DUSE_BUNDLED_QTKEYCHAIN:BOOL=OFF \ + -DUSE_BUNDLED_SPDLOG:BOOL=OFF %cmake_build %install @@ -127,6 +130,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %changelog +* Fri Nov 19 2021 Vitaly Zaitsev - 0.9.0-1 +- Updated to version 0.9.0. + * Thu Jul 22 2021 Fedora Release Engineering - 0.8.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index b7588dd..2c926bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nheko-0.8.2.tar.gz) = 907b5fd770c2e451ee4d5a4483810cf87529f643d584784b2f3c471b54229243842313206bbd38c8b6ca9a91bf505b683d6741bdce8ea24407ae4178da579465 +SHA512 (nheko-0.9.0.tar.gz) = 277d322a2c5cf4631814bb57bf49e26bafdc0a048c17b821b02bbec19e9d12bff91697d307f5ebc2192e1fe0ebc394ba3342d4c3f0d4ad890d0aa9dc59c344a8