[qtox] Add qTox-1.17.6-ffmpeg7.patch (Mamoru TASAKA) from rfbz #7096
by Sérgio M. Basto
commit 5ac3a4712c7f2f4a8a87d7b56404077e8945823f
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Nov 7 23:57:11 2024 +0000
Add qTox-1.17.6-ffmpeg7.patch (Mamoru TASAKA) from rfbz #7096
qTox-1.17.6-ffmpeg7.patch | 55 +++++++++++++++++++++++++++++++++++++++++++++++
qtox.spec | 2 ++
2 files changed, 57 insertions(+)
---
diff --git a/qTox-1.17.6-ffmpeg7.patch b/qTox-1.17.6-ffmpeg7.patch
new file mode 100644
index 0000000..4a93ddf
--- /dev/null
+++ b/qTox-1.17.6-ffmpeg7.patch
@@ -0,0 +1,55 @@
+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<QPair<QString, QString>> 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 2174d10..a859a57 100644
--- a/qtox.spec
+++ b/qtox.spec
@@ -13,6 +13,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{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
@@ -75,6 +76,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/io.github
%changelog
* Wed Nov 06 2024 Sérgio Basto <sergio(a)serjux.com> - 1.17.6-9
- Rebuild for ffmpeg-7
+- Add qTox-1.17.6-ffmpeg7.patch (Mamoru TASAKA) from rfbz #7096
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.17.6-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
1 week, 6 days
[mixxx/f41] Fix sources
by Sérgio M. Basto
Summary of changes:
9ddbed9... Fix sources (*)
(*) This commit already existed in another branch; no separate mail sent
2 weeks
[vdr-markad/f40: 2/2] Merge branch 'master' into f40
by Martin Gansser
commit 760f549adfa3db730b5d2cde35e83609a8779889
Merge: d343185 009e547
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Thu Nov 7 16:06:52 2024 +0100
Merge branch 'master' into f40
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
2 weeks
[vdr-markad/f41: 2/2] Merge branch 'master' into f41
by Martin Gansser
commit 880ee5de942afd8ac1b0641ed2df2b18b2915cea
Merge: 7057265 009e547
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Thu Nov 7 16:06:33 2024 +0100
Merge branch 'master' into f41
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
2 weeks
[vdr-markad] Update to 4.2.6
by Martin Gansser
commit 009e547ca90a57ee2ca5b0bc416d7b2da6389a9e
Author: Martin Gansser <mgansser(a)netcom-mail.de>
Date: Thu Nov 7 16:06:10 2024 +0100
Update to 4.2.6
Update to 4.2.6
.gitignore | 1 +
sources | 2 +-
vdr-markad.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a50e119..f6534fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,4 @@ vdr-plugin-markad-74e2a8c5382fa8bfacd12274899112724a1e0d51.tar.bz2
/vdr-markad-4.2.3.tar.gz
/vdr-markad-4.2.4.tar.gz
/vdr-markad-4.2.5.tar.gz
+/vdr-markad-4.2.6.tar.gz
diff --git a/sources b/sources
index 9f5ea5f..6b4bd29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-markad-4.2.5.tar.gz) = b5723f0c8c84b1e3d80a3b74d297dbb49ff7b9993230acc5743cdb900434abd583b0cf688f469bb13e814e4188c3610b23d479054d80141467ef35625c000bee
+SHA512 (vdr-markad-4.2.6.tar.gz) = cccda3b2c37d292487fcc7aa37711088668f8d4ed63bc8f87cc2b5403e89b41cc22f14439a13d0bda752c0dd42d768a5d71e349dbeafbc1712f160f2f1b78af6
diff --git a/vdr-markad.spec b/vdr-markad.spec
index 0ca2289..6096aa5 100644
--- a/vdr-markad.spec
+++ b/vdr-markad.spec
@@ -8,7 +8,7 @@
%endif
Name: vdr-markad
-Version: 4.2.5
+Version: 4.2.6
Release: 1%{?dist}
Summary: Advanced commercial detection for VDR
License: GPL-2.0-or-later
@@ -75,6 +75,9 @@ fi
%doc html
%changelog
+* Wed Nov 06 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.2.6-1
+- Update to 4.2.6
+
* Thu Oct 31 2024 Martin Gansser <martinkg(a)fedoraproject.org> - 4.2.5-1
- Update to 4.2.5
2 weeks
[mixxx] Fix sources
by Sérgio M. Basto
commit 9ddbed99e15c83c2467d0551ace3287020a19081
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Nov 7 13:35:39 2024 +0000
Fix sources
mixxx.spec | 2 +-
sources | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 200e25a..1dc382e 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -15,7 +15,7 @@
%global libkeyfinder_version 2.2.8
# Additional sources
-%global libdjinterop_version 0.22.1
+%global libdjinterop_version 0.20.2
%if "%{?gitcommit}" == ""
# (Pre-)Releases
diff --git a/sources b/sources
index 72dc893..21217f2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (mixxx-2.4.1.tar.gz) = f62e0ce3bd016d411eda544a621e33b791517931c268391089cfe3101cd1e123eeb0b80bc8c138e7c67bb41cf378c6973f5c9284d5c720c693fd632f62372569
SHA512 (libkeyfinder-2.2.8.zip) = 0fd5c566430f5ffeca4e8a01e925c384ee8206d12b90eeb21c479baf822e741f2d1ac583a0355c380817994232deca314a40c0f65acb3cea84b173627948f3e3
-SHA512 (libdjinterop-0.22.1.tar.gz) = 1c35d8609342f133cf002d1908d5746c411a9d5e74b42a7ec045545f07a3f4b8a89ce9a95d2fc17edd8970facafbee1b6d8a9283fcd8c74c9cb96ff61f15d47d
+SHA512 (libdjinterop-0.20.2.tar.gz) = 591cbf8102e16b11337ec25ad90ef035bf65dbbd18591802d959044874f36bb61bce3d5db974b00ecee14b45c7ea2488542b226d823d9087c92a0b452d804ff3
2 weeks
[vcmi/f41] (3 commits) ...Merge branch 'f41'
by Sérgio M. Basto
Summary of changes:
f537ae4... Bump to 1.5.7 (*)
153fb44... Rebuild for ffmpeg-7 (*)
71d291a... Merge branch 'f41' (*)
(*) This commit already existed in another branch; no separate mail sent
2 weeks, 1 day
[vcmi: 2/2] Merge branch 'f41'
by Sérgio M. Basto
commit 71d291ac6d4b3655e5b30f1b5405cfe6ebbb7b49
Merge: 153fb44 e5e1bfd
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Nov 6 22:58:37 2024 +0000
Merge branch 'f41'
---
2 weeks, 1 day