diff --git a/qTox-1.17.6-ffmpeg7.patch b/qTox-1.17.6-ffmpeg7.patch deleted file mode 100644 index 4a93ddf..0000000 --- a/qTox-1.17.6-ffmpeg7.patch +++ /dev/null @@ -1,55 +0,0 @@ -Port to use ffmpeg 7 - -Use avdevice_list_input_sources(), similar with -https://github.com/gpac/gpac/pull/2994/ - -diff -urp '--exclude=*~' '--exclude=redhat-linux-build' qTox-1.17.6.orig/src/video/cameradevice.cpp qTox-1.17.6/src/video/cameradevice.cpp ---- qTox-1.17.6.orig/src/video/cameradevice.cpp 2022-03-06 23:31:31.000000000 +0900 -+++ qTox-1.17.6/src/video/cameradevice.cpp 2024-11-04 22:27:14.943823061 +0900 -@@ -279,44 +279,14 @@ QVector> CameraD - if (!getDefaultInputFormat()) - return devices; - -- // Alloc an input device context -- AVFormatContext* s; -- if (!(s = avformat_alloc_context())) -- return devices; -- - if (!iformat->priv_class || !AV_IS_INPUT_DEVICE(iformat->priv_class->category)) { -- avformat_free_context(s); - return devices; - } - -- s->iformat = iformat; -- if (s->iformat->priv_data_size > 0) { -- s->priv_data = av_mallocz(s->iformat->priv_data_size); -- if (!s->priv_data) { -- avformat_free_context(s); -- return devices; -- } -- if (s->iformat->priv_class) { -- *(const AVClass**)s->priv_data = s->iformat->priv_class; -- av_opt_set_defaults(s->priv_data); -- } -- } else { -- s->priv_data = nullptr; -- } -- - // List the devices for this context - AVDeviceInfoList* devlist = nullptr; -- AVDictionary* tmp = nullptr; -- av_dict_copy(&tmp, nullptr, 0); -- if (av_opt_set_dict2(s, &tmp, AV_OPT_SEARCH_CHILDREN) < 0) { -- av_dict_free(&tmp); -- avformat_free_context(s); -- return devices; -- } -- avdevice_list_devices(s, &devlist); -- av_dict_free(&tmp); -- avformat_free_context(s); -- if (!devlist) { -+ int ret = avdevice_list_input_sources(iformat, nullptr, nullptr, &devlist); -+ if (ret < 0) { - qWarning() << "avdevice_list_devices failed"; - return devices; - } diff --git a/qtox.spec b/qtox.spec index a859a57..3a2dee7 100644 --- a/qtox.spec +++ b/qtox.spec @@ -1,5 +1,5 @@ Name: qtox -Version: 1.17.6 +Version: 1.17.8 Release: 9%{?dist} Summary: Feature-rich Tox client @@ -8,12 +8,11 @@ Summary: Feature-rich Tox client # Smileys/Universe Smileys/emojione: CC-BY # Smileys/Classic: CC-BY-SA License: GPLv3+ and BSD and CC-BY and CC-BY-SA -URL: https://github.com/qTox/qTox/ -Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +URL: https://github.com/qTox/qTox/OA +Source0: %{url}/archive/refs/tags/v%{version}.tar.gz # Remove project_group tag from appdata.xml Patch0: qTox-c0e9a3b-remove_project_group.patch -Patch1: qTox-1.17.6-ffmpeg7.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -74,6 +73,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/io.github %{_datadir}/icons/hicolor/*/apps/qtox.* %changelog +* Thu Nov 28 2024 Nikolay 168 - 1.17.8-1 +- Rebuild for new version +- Stability fixes + * Wed Nov 06 2024 Sérgio Basto - 1.17.6-9 - Rebuild for ffmpeg-7 - Add qTox-1.17.6-ffmpeg7.patch (Mamoru TASAKA) from rfbz #7096 diff --git a/sources b/sources index e0981ae..d75d520 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtox-1.17.6.tar.gz) = 92047769fa7c1b1be23a236072e6a8727fc956a8959c7a1f36a616d2217f558bd435cf28acdb73dc83e52cf46772c7aa4068c589bc095d327efac5495c4b3e39 +SHA512 (qtox-1.17.8.tar.gz) = b7218d7a0eaa8b770961b7c3b329323bb80a308edab0006178bce17cb2962dbdcb33231e3d3481d56e6ca3525911fe24074c363ea552ed38e764fbe3eb308ff7