rpmfusion-commits
November 2022
rpmfusion-commits@lists.rpmfusion.org
- 13 participants
- 424 discussions
[zerotier-one] fix
by Leigh Scott
commit 5bc56ef3890575ca619e073945636fb9b77f1e43
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 2 20:20:55 2022 +0000
fix
zerotier-one.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 66e4993..0a2e9e2 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,4 +1,8 @@
%global toolchain clang
+# /usr/bin/debugedit: Cannot handle 8-byte build ID
+%ifarch %{arm}
+%global debug_package %{nil}
+%endif
Name: zerotier-one
Version: 1.10.2
1 year, 5 months
- 1
- 0
[zerotier-one/f36] (2 commits) ...chore(update): 1.10.2
by Leigh Scott
Summary of changes:
1b69813... - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass (*)
0663696... chore(update): 1.10.2 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 5 months
- 1
- 0
[zerotier-one/f37] chore(update): 1.10.2
by Leigh Scott
Summary of changes:
0663696... chore(update): 1.10.2 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year, 5 months
- 1
- 0
[zerotier-one] chore(update): 1.10.2
by Leigh Scott
commit 066369612f07f5d4911d17e40dd577ba946eea7f
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Nov 2 14:05:53 2022 +0000
chore(update): 1.10.2
sources | 4 ++--
zerotier-one.spec | 28 ++++++++++++++--------------
zerotier-use-vendor-archive.patch | 20 ++++++++++----------
3 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/sources b/sources
index ebc4663..28554eb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (vendor-1.8.9.tar.xz) = b324376bc1cb340e38840725398f11b0b7c2b3efe4620c31340e64ecc25fae713f2638826ef1563830a053bbd12a7a11186599250a190d9ba05ce664753ac7ff
-SHA512 (zerotier-one-1.8.9.tar.gz) = 6afc415dff28fbab72acd47fdf65246fe063b0ac5a3d8f67b818e3eda33196dfac24a40cb971c61b36a84c24e704584040b2b6cafc47b5200152e646015fb75f
+SHA512 (vendor-1.10.2.tar.xz) = a1ea726a3526d6c077902f819054ed12b89a90d6e6c6d5723c3ce3242cf672049059693331a18d27570d5a1ce587c780683b0aac52dac18698c739d1ab0cce9e
+SHA512 (zerotier-one-1.10.2.tar.gz) = 4876285c323b9c0a44230dfec99798a338d5ec110815f88cbde27ccc53b3f0b1a53a00e3a935fcb336f6de0f8c3a7f49ceed7e7299a2b64e47ad42c5494c7238
diff --git a/zerotier-one.spec b/zerotier-one.spec
index caedc01..66e4993 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,6 +1,8 @@
+%global toolchain clang
+
Name: zerotier-one
-Version: 1.8.9
-Release: 3%{?dist}
+Version: 1.10.2
+Release: 1%{?dist}
Summary: Smart Ethernet Switch for Earth
# Boost: README.md
@@ -42,18 +44,10 @@ Source1: vendor-%{version}.tar.xz
Patch0: zerotier-use-vendor-archive.patch
BuildRequires: cargo
-BuildRequires: gcc-c++
-BuildRequires: go-md2man
-BuildRequires: http-parser-devel
-BuildRequires: json-devel
-BuildRequires: libnatpmp-devel
-BuildRequires: openssl1.1-devel
+BuildRequires: clang
+BuildRequires: openssl1.1-devel openssl1.1
BuildRequires: systemd-rpm-macros
-BuildRequires: pkgconfig(liblz4)
-BuildRequires: pkgconfig(miniupnpc)
-BuildRequires: pkgconfig(sqlite3)
-
Provides: bundled(http-parser)
Provides: bundled(json) = 3.10.2
Provides: bundled(salsa2012)
@@ -92,9 +86,10 @@ tar -xf %{SOURCE1}
popd
%build
-%set_build_flags
%make_build \
- STRIP=%{_bindir}/true
+ ZT_USE_MINIUPNPC=1 \
+ STRIP=%{_bindir}/true \
+ one
%install
@@ -122,6 +117,11 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
%changelog
+* Wed Nov 02 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.10.2-1
+- chore(update): 1.10.2
+- Switch to clang to match upstream spec file.
+- Bundle everything to match upstream spec file.
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1.8.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch
index 98acbbd..a7e918d 100644
--- a/zerotier-use-vendor-archive.patch
+++ b/zerotier-use-vendor-archive.patch
@@ -1,13 +1,13 @@
-diff -ruN a/zeroidc/.cargo/config.toml b/zeroidc/.cargo/config.toml
---- a/zeroidc/.cargo/config.toml 2022-05-11 02:45:12.000000000 +0900
-+++ b/zeroidc/.cargo/config.toml 2022-05-16 08:28:37.836443191 +0900
-@@ -9,3 +9,9 @@
+--- a/zeroidc/.cargo/config.toml
++++ b/zeroidc/.cargo/config.toml
+@@ -1,6 +1,10 @@
+ [source.crates-io]
+ replace-with = "vendored-sources"
- [target.i686-pc-windows-msvc]
- rustflags = ["-C", "target-feature=+crt-static"]
-+
-+[source.crates-io]
++[source."https://github.com/glimberg/rust-jwt"]
++git = "https://github.com/glimberg/rust-jwt"
+replace-with = "vendored-sources"
+
-+[source.vendored-sources]
-+directory = "vendor"
+ [source.vendored-sources]
+ directory = "vendor"
+
1 year, 5 months
- 1
- 0
[VirtualBox-kmod] Update to 7.0.2
by Sérgio M. Basto
commit 3fc1c84441e508b465f47fc763c857d498d41d74
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Nov 1 22:58:31 2022 +0000
Update to 7.0.2
VirtualBox-kmod.spec | 5 ++++-
update_vbox.sh | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 38a1a09..f73fdee 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -35,7 +35,7 @@
%global vboxreltag %{?vboxrel:-%{vboxrel}}
Name: VirtualBox-kmod
-Version: 6.1.40
+Version: 7.0.2
Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
@@ -133,6 +133,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Tue Nov 01 2022 Sérgio Basto <sergio(a)serjux.com> - 7.0.2-1
+- Update to 7.0.2
+
* Thu Oct 13 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.40-1
- Update to 6.1.40
diff --git a/update_vbox.sh b/update_vbox.sh
index 2a8eb5e..7c91318 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.1.40
+VERSION=7.0.2
REL=1
RAWHIDE=38
REPOS="f37 f36 f35 el9 el8 el7"
@@ -17,7 +17,10 @@ if test $stage -le 0
then
echo STAGE 0
rpmdev-bumpspec -n $VERSION -c "Update to $VERSION" VirtualBox-kmod.spec
+echo Press enter to build on copr or n to skip; read dummy;
+if [[ "$dummy" != "n" ]]; then
rfpkg copr-build sergiomb/vboxfor23
+fi
#rfpkg srpm && mock -r fedora-27-x86_64-rpmfusion_free --no-clean --rebuild smplayer-17.5.0-1.fc27.src.rpm
#cp VirtualBox-kmod.spec VirtualBox-kmod.spec.new
#git reset HEAD~1
1 year, 5 months
- 1
- 0
[VirtualBox] Update to 7.0.2
by Sérgio M. Basto
commit 546c905035d91c32e65c421351819fb16c1b19bb
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Tue Nov 1 22:26:25 2022 +0000
Update to 7.0.2
- Drop python2 support
- Based on Mageia and after on Debian packages
- Drop VirtualBox-6.0.10-convert-map-python3.patch and vb-6.1.16-modal-dialog-parent.patch
- Refresh default-to-Fedora, noupdate.patch, xclient.patch, build-xpcom18a4-with-c++17.patch and python3.11.patch
- Replace fixes_for_Qt5.11to15.patch with remove-duplicated-define.patch, update-Mageia-support.patch and fix-missing-includes-with-qt-5.15.patch
- Add ExtPacks-VBoxDTrace-no-publisher-in-version.patch from Mageia
- Add partial system-libs.patch and fix-build.patch from Debian (libvorbis and libogg system support)
- Add build conditionals for system_libtpms and dxvk-native
- Add VirtualBox-5.1.0-lib64-VBox.sh.patch and finally drop /etc/vbox as upstream did in 5.1.0
- Add BR: nasm (to fix nasm: not found message)
VirtualBox-5.1.0-lib64-VBox.sh.patch | 14 ++
VirtualBox-5.1.0-revert-VBox.sh.patch | 55 -----
VirtualBox-6.0.0-default-to-Fedora.patch | 37 ----
VirtualBox-6.0.0-noupdate.patch | 11 -
VirtualBox-6.0.10-convert-map-python3.patch | 9 -
VirtualBox-6.0.10-remove-duplicated-define.patch | 29 +++
...-6.1.14-fix-missing-includes-with-qt-5.15.patch | 22 ++
VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch | 9 +-
VirtualBox-6.1.36-add-Mageia-support.patch | 238 ---------------------
VirtualBox-6.1.4-gcc10.patch | 27 +--
...tPacks-VBoxDTrace-no-publisher-in-version.patch | 42 ++++
VirtualBox-7.0.2-default-to-Fedora.patch | 47 ++++
VirtualBox-7.0.2-noupdate.patch | 9 +
VirtualBox-7.0.2-update-Mageia-support.patch | 187 ++++++++++++++++
...atch => VirtualBox-7.0.2-xclient-cleanups.patch | 18 +-
VirtualBox-python3.11.patch | 58 ++---
VirtualBox.spec | 204 ++++++++++--------
fix-build.patch | 21 ++
fixes_for_Qt5.11to15.patch | 65 ------
sources | 4 +-
system-libs_cutted.patch | 121 +++++++++++
update_vbox.sh | 6 +-
vb-6.1.16-modal-dialog-parent.patch | 145 -------------
23 files changed, 641 insertions(+), 737 deletions(-)
---
diff --git a/VirtualBox-5.1.0-lib64-VBox.sh.patch b/VirtualBox-5.1.0-lib64-VBox.sh.patch
new file mode 100644
index 0000000..bd609a9
--- /dev/null
+++ b/VirtualBox-5.1.0-lib64-VBox.sh.patch
@@ -0,0 +1,14 @@
+--- VirtualBox-7.0.2/src/VBox/Installer/linux/VBox.sh.revert-VBox.sh 2022-10-31 22:37:48.783785457 +0000
++++ VirtualBox-7.0.2/src/VBox/Installer/linux/VBox.sh 2022-11-01 14:24:29.579809075 +0000
+@@ -51,7 +51,10 @@ MY_DIR="${TARGET%/[!/]*}"
+ # done
+ # )
+
+-if test -f /usr/lib/virtualbox/VirtualBox &&
++if test -f /usr/lib64/virtualbox/VirtualBox &&
++ test -x /usr/lib64/virtualbox/VirtualBox; then
++ INSTALL_DIR=/usr/lib64/virtualbox
++elif test -f /usr/lib/virtualbox/VirtualBox &&
+ test -x /usr/lib/virtualbox/VirtualBox; then
+ INSTALL_DIR=/usr/lib/virtualbox
+ elif test -f "${MY_DIR}/VirtualBox" && test -x "${MY_DIR}/VirtualBox"; then
diff --git a/VirtualBox-6.0.10-remove-duplicated-define.patch b/VirtualBox-6.0.10-remove-duplicated-define.patch
new file mode 100644
index 0000000..6e2f0ba
--- /dev/null
+++ b/VirtualBox-6.0.10-remove-duplicated-define.patch
@@ -0,0 +1,29 @@
+
+Already defined in Mga8+:
+
+/home/iurt/rpmbuild/BUILD/VirtualBox-6.0.10/include/VBox/VBoxGL2D.h:116:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr'
+ typedef ptrdiff_t GLsizeiptr;
+ ^~~~~~~~~~
+In file included from /usr/lib/qt5/include/QtGui/qopengl.h:146,
+ from /usr/lib/qt5/include/QtOpenGL/qgl.h:45,
+ from /usr/lib/qt5/include/QtOpenGL/QGLWidget:1,
+ from /home/iurt/rpmbuild/BUILD/VirtualBox-6.0.10/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp:22:
+/usr/lib/qt5/include/QtGui/qopenglext.h:475:30: note: previous declaration as 'typedef long int GLsizeiptr'
+ typedef signed long int GLsizeiptr;
+
+diff -Nurp VirtualBox-6.0.10.orig/include/VBox/VBoxGL2D.h VirtualBox-6.0.10/include/VBox/VBoxGL2D.h
+--- VirtualBox-6.0.10.orig/include/VBox/VBoxGL2D.h 2019-07-12 11:28:22.000000000 +0300
++++ VirtualBox-6.0.10/include/VBox/VBoxGL2D.h 2019-07-20 21:13:31.481755822 +0300
+@@ -110,12 +110,6 @@ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UN
+ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM3I)(GLint location, GLint v0, GLint v1, GLint v2);
+ typedef GLvoid (APIENTRY *PFNVBOXVHWA_UNIFORM4I)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3);
+
+-/* GL_ARB_pixel_buffer_object*/
+-#ifndef Q_WS_MAC
+-/* apears to be defined on mac */
+-typedef ptrdiff_t GLsizeiptr;
+-#endif
+-
+ #ifndef GL_READ_ONLY
+ # define GL_READ_ONLY 0x88B8
+ #endif
diff --git a/VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch b/VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch
new file mode 100644
index 0000000..f1dc737
--- /dev/null
+++ b/VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch
@@ -0,0 +1,22 @@
+diff -up VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp.qt515 VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
+--- VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp.qt515 2020-09-04 09:38:30.000000000 +0200
++++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp 2020-09-05 19:41:54.423116616 +0200
+@@ -18,6 +18,7 @@
+ /* Qt includes: */
+ #include <QApplication>
+ #include <QLabel>
++#include <QPainterPath>
+ #include <QPaintEvent>
+ #include <QStyle>
+ #include <QVBoxLayout>
+diff -up VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.qt515 VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h
+--- VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h.qt515 2020-09-04 09:38:30.000000000 +0200
++++ VirtualBox-6.1.14/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.h 2020-09-05 19:41:54.423116616 +0200
+@@ -37,7 +37,6 @@ class QIcon;
+ class QLabel;
+ class QMouseEvent;
+ class QObject;
+-class QPainterPath;
+ class QPaintEvent;
+ class QResizeEvent;
+ class QString;
diff --git a/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch b/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch
index 6889b22..6534e14 100644
--- a/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch
+++ b/VirtualBox-6.1.34-build-xpcom18a4-with-c++17.patch
@@ -1,7 +1,6 @@
-diff -up VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk.orig VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk
---- VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk.orig 2022-03-23 00:47:29.000000000 +0100
-+++ VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk 2022-06-26 14:06:50.563730173 +0200
-@@ -37,7 +37,7 @@ TEMPLATE_XPCOM_ASFLAGS = $(N
+--- ./src/libs/xpcom18a4/Config.kmk.orig 2022-10-19 19:34:20.000000000 +0100
++++ ./src/libs/xpcom18a4/Config.kmk 2022-10-30 04:30:34.318046234 +0000
+@@ -47,7 +47,7 @@ TEMPLATE_XPCOM_ASFLAGS = $(N
TEMPLATE_XPCOM_ASFLAGS.x86 = -m32
TEMPLATE_XPCOM_ASFLAGS.amd64 = -m64
TEMPLATE_XPCOM_ASDEFS = $(NO_SUCH_VARIABLE)
@@ -9,4 +8,4 @@ diff -up VirtualBox-6.1.34/src/libs/xpcom18a4/Config.kmk.orig VirtualBox-6.1.34/
+TEMPLATE_XPCOM_CXXFLAGS = -g -pipe -ansi -Wall -Wno-unused -Wno-non-virtual-dtor -std=gnu++17 \
$(VBOX_GCC_Wno-invalid-offsetof) -Wno-sign-compare -Wno-unused -Wno-ctor-dtor-privacy \
$(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
- $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor)
+ $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_Wno-delete-non-virtual-dtor) \
diff --git a/VirtualBox-6.1.4-gcc10.patch b/VirtualBox-6.1.4-gcc10.patch
index 65d03da..a5812b2 100644
--- a/VirtualBox-6.1.4-gcc10.patch
+++ b/VirtualBox-6.1.4-gcc10.patch
@@ -1,4 +1,3 @@
-Patch 1: Fix Detection of GCC10 (is >= 4.4 )
Patch 2: Fix
/builddir/build/BUILD/VirtualBox-6.1.4/src/VBox/Debugger/DBGCDumpImage.cpp: In function 'const char* dbgcMachoCpuType(uint32_t, uint32_t)':
@@ -9,32 +8,14 @@ Patch 2: Fix
471 | case CPU_TYPE_ANY: return "CPU_TYPE_ANY";
| ^~~~~~~~~~~~
---- ./Makefile.kmk.orig 2020-02-20 03:40:14.049126175 +0000
-+++ ./Makefile.kmk 2020-02-20 03:40:41.843981024 +0000
-@@ -188,15 +188,6 @@ ifeq ($(KBUILD_TARGET),darwin)
- "$(if $(VBOX_WITH_HARDENING),/Applications/VirtualBox.app/Contents/Frameworks,(a)rpath)/$(qtmod).framework/Versions/5/$(qtmod)" ) ) \
- "$(2)",) # HACK ALERT! Using $(source_type_prefix) to detect EXEC_SOURCES.
- else # win x11
-- if1of ($(KBUILD_TARGET), linux solaris)
-- ifndef VBOX_ONLY_BUILD
-- ifneq ($(VBOX_GCC_VERSION_CXX),)
-- ifeq ($(int-ge $(VBOX_GCC_VERSION_CXX),40400),)
-- $(error gcc >= 4.4 required when compiling against Qt5!)
-- endif
-- endif
-- endif
-- endif
- if defined(VBOX_WITH_ORACLE_QT) || defined(VBOX_WITH_QT_PAYLOAD)
- include $(KBUILD_PATH)/units/qt5.kmk
- ifeq ($(KBUILD_TARGET),win)
---- VirtualBox-6.1.10.orig/src/VBox/Debugger/DBGCDumpImage.cpp
-+++ VirtualBox-6.1.10/src/VBox/Debugger/DBGCDumpImage.cpp
-@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(int3
+--- VirtualBox-6.1.6/src/VBox/Debugger/DBGCDumpImage.cpp.orig 2020-04-09 20:37:26.000000000 +0300
++++ VirtualBox-6.1.6/src/VBox/Debugger/DBGCDumpImage.cpp 2020-05-08 01:32:01.400447560 +0300
+@@ -468,7 +468,7 @@ static const char *dbgcMachoCpuType(uint
{
switch (iType)
{
- case CPU_TYPE_ANY: return "CPU_TYPE_ANY";
-+ default: return "CPU_TYPE_ANY";
++ default: return "CPU_TYPE_ANY";
case CPU_TYPE_VAX: return "VAX";
case CPU_TYPE_MC680x0: return "MC680x0";
case CPU_TYPE_X86: return "X86";
diff --git a/VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch b/VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch
new file mode 100644
index 0000000..c77c558
--- /dev/null
+++ b/VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch
@@ -0,0 +1,42 @@
+
+As reported in:
+https://bugs.mageia.org/show_bug.cgi?id=27936
+
+adding Mageia version branding, breaks loading the VBoxDtrace extension with the error:
+
+Failed to load
+'/usr/lib64/virtualbox/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack.xml':
+Invalid version string: 6.1.16_Mageia
+
+Fix it up by using the _NO_PUB variant when generating the xml.
+
+Signed-off-by: Thomas Backlund <tmb(a)mageia.org>
+
+---
+ Config.kmk | 1 +
+ src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff -Nurp VirtualBox-7.0.2.orig/Config.kmk VirtualBox-7.0.2/Config.kmk
+--- VirtualBox-7.0.2.orig/Config.kmk 2022-10-19 21:17:13.000000000 +0300
++++ VirtualBox-7.0.2/Config.kmk 2022-10-22 15:12:37.178853337 +0300
+@@ -3798,6 +3798,7 @@ VBOX_EDIT_VERSION_CMD_FN = $(SED) \
+ -e 's+@VBOX_VERSION_MINOR@+$(VBOX_VERSION_MINOR)+g' \
+ -e 's+@VBOX_VERSION_BUILD@+$(VBOX_VERSION_BUILD)+g' \
+ -e 's+@VBOX_VERSION_STRING@+$(VBOX_VERSION_STRING)+g' \
++ -e 's/@VBOX_VERSION_STRING_NO_PUB@/$(VBOX_VERSION_STRING_NO_PUB)/g' \
+ -e 's+@VBOX_SVN_REV@+$(VBOX_SVN_REV)+g' \
+ -e 's+@VBOX_VENDOR@+$(VBOX_VENDOR)+g' \
+ -e 's+@VBOX_VENDOR_SHORT@+$(VBOX_VENDOR_SHORT)+g' \
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml
+--- VirtualBox-7.0.2.orig/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml 2022-10-19 21:27:27.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/ExtPacks/VBoxDTrace/ExtPack.xml 2022-10-22 15:10:10.042857721 +0300
+@@ -2,7 +2,7 @@
+ <VirtualBoxExtensionPack xmlns="http://www.virtualbox.org/VirtualBoxExtensionPack" version="1.0">
+ <Name>Oracle VBoxDTrace Extension Pack</Name>
+ <Description>Experimental and unsupported extension pack providing DTrace features to VirtualBox.</Description>
+- <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING@</Version>
++ <Version revision="@VBOX_SVN_REV@">@VBOX_VERSION_STRING_NO_PUB@</Version>
+ <MainModule>VBoxDTraceMain</MainModule>
+ </VirtualBoxExtensionPack>
+
diff --git a/VirtualBox-7.0.2-default-to-Fedora.patch b/VirtualBox-7.0.2-default-to-Fedora.patch
new file mode 100644
index 0000000..8159e4d
--- /dev/null
+++ b/VirtualBox-7.0.2-default-to-Fedora.patch
@@ -0,0 +1,47 @@
+Default to Linux and Fedora.
+
+Signed-off-by: Thomas Backlund <tmb(a)Fedora.org>
+
+---
+ src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp 2022-10-19 21:28:39.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/settings/editors/UINameAndSystemEditor.cpp 2022-10-22 13:32:01.577033153 +0300
+@@ -397,15 +397,15 @@ void UINameAndSystemEditor::sltFamilyCha
+ if (iIndexWin10 != -1)
+ m_pComboType->setCurrentIndex(iIndexWin10);
+ }
+- /* Or select Oracle Linux item for Linux family as default: */
++ /* Or select Fedora Linux item for Linux family as default: */
+ else if (m_strFamilyId == "Linux")
+ {
+- QString strDefaultID = "Oracle";
++ QString strDefaultID = "Fedora";
+ if (ARCH_BITS == 64)
+ strDefaultID += "_64";
+- const int iIndexUbuntu = m_pComboType->findData(strDefaultID, TypeID);
+- if (iIndexUbuntu != -1)
+- m_pComboType->setCurrentIndex(iIndexUbuntu);
++ const int iIndexFedora = m_pComboType->findData(strDefaultID, TypeID);
++ if (iIndexFedora != -1)
++ m_pComboType->setCurrentIndex(iIndexFedora);
+ }
+ /* Else simply select the first one present: */
+ else
+@@ -665,6 +665,10 @@ void UINameAndSystemEditor::prepareFamil
+
+ /* Choose the 1st item to be the current: */
+ m_pComboFamily->setCurrentIndex(0);
++ /* Default to Linux */
++ const int liIndex = m_pComboFamily->findData("Linux", TypeID);
++ if (liIndex != -1)
++ m_pComboFamily->setCurrentIndex(liIndex);
+ /* And update the linked widgets accordingly: */
+ sltFamilyChanged(m_pComboFamily->currentIndex());
+ }
+
+Default to Linux and Fedora.
+
+
diff --git a/VirtualBox-7.0.2-noupdate.patch b/VirtualBox-7.0.2-noupdate.patch
new file mode 100644
index 0000000..d0505ef
--- /dev/null
+++ b/VirtualBox-7.0.2-noupdate.patch
@@ -0,0 +1,9 @@
+--- VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.cpp.noupdates 2022-10-19 19:28:35.000000000 +0100
++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/networking/UIUpdateDefs.cpp 2022-11-01 19:26:21.790765337 +0000
+@@ -400,5 +400,5 @@ UpdatePeriodType VBoxUpdateData::gatherS
+ enmType = (UpdatePeriodType)(enmType + 1);
+ }
+
+- return UpdatePeriodType_1Month;
++ return UpdatePeriodType_Never;
+ }
diff --git a/VirtualBox-7.0.2-update-Mageia-support.patch b/VirtualBox-7.0.2-update-Mageia-support.patch
new file mode 100644
index 0000000..ab37994
--- /dev/null
+++ b/VirtualBox-7.0.2-update-Mageia-support.patch
@@ -0,0 +1,187 @@
+
+Mageia support is partly added upstream beginning with 7.0 branch.
+
+This patch adds the missing bits to extend / improve the integration.
+
+Signed-off-by: Thomas Backlund <tmb(a)mageia.org>
+
+---
+ src/VBox/Additions/linux/installer/vboxadd-x11.sh | 6 ++++++
+ src/VBox/Frontends/VirtualBox/VirtualBox2.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc | 2 ++
+ src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp | 4 ++--
+ src/VBox/Installer/linux/VBoxSysInfo.sh | 5 +++++
+ src/VBox/Installer/linux/distributions_rpm | 15 +++++++++++++++
+ src/VBox/Main/src-server/ApplianceImpl.cpp | 2 ++
+ src/VBox/Main/src-server/UnattendedImpl.cpp | 6 ++++++
+ src/VBox/Main/xml/Settings.cpp | 1 +
+ 11 files changed, 45 insertions(+), 2 deletions(-)
+
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-7.0.2/src/VBox/Additions/linux/installer/vboxadd-x11.sh
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2022-10-19 21:20:43.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2022-10-22 12:34:07.913136643 +0300
+@@ -104,8 +104,14 @@ install_x11_startup_app() {
+ x11_autostart="/etc/xdg/autostart"
+ kde_autostart="/usr/share/autostart"
+ redhat_dir=/etc/X11/Xsession.d
++ mageia_dir=/etc/X11/xinit.d
+ mandriva_dir=/etc/X11/xinit.d
+ debian_dir=/etc/X11/xinit/xinitrc.d
++ if [ -d "$mageia_dir" -a -w "$mageia_dir" -a -x "$mageia_dir" ]
++ then
++ install -m 0644 $app_src "$mageia_dir/$app_dest"
++ found=1
++ fi
+ if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ]
+ then
+ install -m 0644 $app_src "$mandriva_dir/$app_dest"
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2022-10-19 21:28:31.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2022-10-22 12:44:34.937117962 +0300
+@@ -416,8 +416,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
+ m_guestOSTypeIconNames.insert("OpenMandriva_Lx_64", ":/os_mandriva_64.png");
+ m_guestOSTypeIconNames.insert("PCLinuxOS", ":/os_mandriva.png");
+ m_guestOSTypeIconNames.insert("PCLinuxOS_64", ":/os_mandriva_64.png");
+- m_guestOSTypeIconNames.insert("Mageia", ":/os_mandriva.png");
+- m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mandriva_64.png");
++ m_guestOSTypeIconNames.insert("Mageia", ":/os_mageia.png");
++ m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mageia_64.png");
+ m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png");
+ m_guestOSTypeIconNames.insert("RedHat_64", ":/os_redhat_64.png");
+ m_guestOSTypeIconNames.insert("RedHat3", ":/os_redhat.png");
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2022-10-19 21:28:04.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2022-10-22 12:39:06.604127744 +0300
+@@ -92,6 +92,8 @@
+ <file alias="os_linux.png">images/os_linux.png</file>
+ <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
+ <file alias="os_macosx.png">images/os_macosx.png</file>
++ <file alias="os_mageia_64.png">images/os_mageia_64.png</file>
++ <file alias="os_mageia.png">images/os_mageia.png</file>
+ <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
+ <file alias="os_mandriva.png">images/os_mandriva.png</file>
+ <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2022-10-19 21:28:04.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x2.qrc 2022-10-22 12:37:55.554129861 +0300
+@@ -103,6 +103,8 @@
+ <file alias="os_linux_x2.png">images/x2/os_linux_x2.png</file>
+ <file alias="os_macosx_64_x2.png">images/x2/os_macosx_64_x2.png</file>
+ <file alias="os_macosx_x2.png">images/x2/os_macosx_x2.png</file>
++ <file alias="os_mageia_64_x2.png">images/x2/os_mageia_64_x2.png</file>
++ <file alias="os_mageia_x2.png">images/x2/os_mageia_x2.png</file>
+ <file alias="os_mandriva_64_x2.png">images/x2/os_mandriva_64_x2.png</file>
+ <file alias="os_mandriva_x2.png">images/x2/os_mandriva_x2.png</file>
+ <file alias="os_netbsd_64_x2.png">images/x2/os_netbsd_64_x2.png</file>
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2022-10-19 21:28:04.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x3.qrc 2022-10-22 12:38:02.478129654 +0300
+@@ -103,6 +103,8 @@
+ <file alias="os_linux_x3.png">images/x3/os_linux_x3.png</file>
+ <file alias="os_macosx_64_x3.png">images/x3/os_macosx_64_x3.png</file>
+ <file alias="os_macosx_x3.png">images/x3/os_macosx_x3.png</file>
++ <file alias="os_mageia_64_x3.png">images/x3/os_mageia_64_x3.png</file>
++ <file alias="os_mageia_x3.png">images/x3/os_mageia_x3.png</file>
+ <file alias="os_mandriva_64_x3.png">images/x3/os_mandriva_64_x3.png</file>
+ <file alias="os_mandriva_x3.png">images/x3/os_mandriva_x3.png</file>
+ <file alias="os_netbsd_64_x3.png">images/x3/os_netbsd_64_x3.png</file>
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc
+--- VirtualBox-7.0.2.orig/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2022-10-19 21:28:04.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Frontends/VirtualBox/VirtualBox2_x4.qrc 2022-10-22 12:38:08.986129460 +0300
+@@ -103,6 +103,8 @@
+ <file alias="os_linux_x4.png">images/x4/os_linux_x4.png</file>
+ <file alias="os_macosx_64_x4.png">images/x4/os_macosx_64_x4.png</file>
+ <file alias="os_macosx_x4.png">images/x4/os_macosx_x4.png</file>
++ <file alias="os_mageia_64_x4.png">images/x4/os_mageia_64_x4.png</file>
++ <file alias="os_mageia_x4.png">images/x4/os_mageia_x4.png</file>
+ <file alias="os_mandriva_64_x4.png">images/x4/os_mandriva_64_x4.png</file>
+ <file alias="os_mandriva_x4.png">images/x4/os_mandriva_x4.png</file>
+ <file alias="os_netbsd_64_x4.png">images/x4/os_netbsd_64_x4.png</file>
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Installer/linux/distributions_rpm VirtualBox-7.0.2/src/VBox/Installer/linux/distributions_rpm
+--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/distributions_rpm 2022-10-19 21:28:54.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Installer/linux/distributions_rpm 2022-10-22 12:48:25.951111079 +0300
+@@ -8,6 +8,21 @@ openSUSE114 = OPENSUSE_11_4
+ openSUSE113 = OPENSUSE_11_3
+ sles11.0 = SLES_11_0
+ sles10.1 = SLES_10_1
++mga15 = MAGEIA_15
++mga14 = MAGEIA_14
++mga13 = MAGEIA_13
++mga12 = MAGEIA_12
++mga11 = MAGEIA_11
++mga10 = MAGEIA_10
++mga9 = MAGEIA_9
++mga8 = MAGEIA_8
++mga7 = MAGEIA_7
++mga6 = MAGEIA_6
++mga5 = MAGEIA_5
++mga4 = MAGEIA_4
++mga3 = MAGEIA_3
++mga2 = MAGEIA_2
++mga1 = MAGEIA_1
+ mdv2011.0 = MANDRIVA_2011_0
+ fedora36 = FEDORA_36
+ fedora35 = FEDORA_35
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-7.0.2/src/VBox/Installer/linux/VBoxSysInfo.sh
+--- VirtualBox-7.0.2.orig/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-10-19 21:28:54.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Installer/linux/VBoxSysInfo.sh 2022-10-22 12:48:15.439111393 +0300
+@@ -54,6 +54,11 @@ get_linux_info () {
+ # Debian-based system
+ release=`cat /etc/debian_version`
+ print_linux_info "Debian" $release
++ elif [ -r /etc/mageia-release ]
++ then
++ # Mageia-based system
++ release=`cat /etc/mageia-release | sed -e 's/[A-Za-z ]* release //'`
++ print_linux_info "Mageia" $release
+ elif [ -r /etc/mandriva-release ]
+ then
+ # Mandriva-based system
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-7.0.2/src/VBox/Main/src-server/ApplianceImpl.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2022-10-19 21:29:03.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Main/src-server/ApplianceImpl.cpp 2022-10-22 12:57:29.027094900 +0300
+@@ -316,6 +316,7 @@ static const osTypePattern g_aOsTypesPat
+ {"SUSE", VBOXOSTYPE_OpenSUSE},
+ {"Novell", VBOXOSTYPE_OpenSUSE},
+ {"Red Hat", VBOXOSTYPE_RedHat},
++ {"Mageia", VBOXOSTYPE_Mageia},
+ {"Mandriva", VBOXOSTYPE_Mandriva},
+ {"Ubuntu", VBOXOSTYPE_Ubuntu},
+ {"Debian", VBOXOSTYPE_Debian},
+@@ -352,6 +353,7 @@ static const osTypePattern g_aOsTypesPat
+ {"SUSE", VBOXOSTYPE_OpenSUSE_x64},
+ {"Novell", VBOXOSTYPE_OpenSUSE_x64},
+ {"Red Hat", VBOXOSTYPE_RedHat_x64},
++ {"Mageia", VBOXOSTYPE_Mageia_x64},
+ {"Mandriva", VBOXOSTYPE_Mandriva_x64},
+ {"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
+ {"Debian", VBOXOSTYPE_Debian_x64},
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Main/src-server/UnattendedImpl.cpp VirtualBox-7.0.2/src/VBox/Main/src-server/UnattendedImpl.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Main/src-server/UnattendedImpl.cpp 2022-10-19 21:29:04.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Main/src-server/UnattendedImpl.cpp 2022-10-22 13:03:28.835084180 +0300
+@@ -1394,6 +1394,12 @@ static bool detectLinuxDistroName(const
+ *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_ArchitectureMask) | VBOXOSTYPE_Oracle);
+ pszOsAndVersion = RTStrStripL(pszOsAndVersion + 6);
+ }
++ else if ( RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("Mageia")) == 0
++ && !RT_C_IS_ALNUM(pszOsAndVersion[6]))
++ {
++ *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_ArchitectureMask) | VBOXOSTYPE_Mageia);
++ pszOsAndVersion = RTStrStripL(pszOsAndVersion + 6);
++ }
+ else if ( RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("CentOS")) == 0
+ && !RT_C_IS_ALNUM(pszOsAndVersion[6]))
+ {
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Main/xml/Settings.cpp VirtualBox-7.0.2/src/VBox/Main/xml/Settings.cpp
+--- VirtualBox-7.0.2.orig/src/VBox/Main/xml/Settings.cpp 2022-10-19 21:29:07.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Main/xml/Settings.cpp 2022-10-22 13:04:47.873081825 +0300
+@@ -6579,6 +6579,7 @@ const struct {
+ { "opensuse", "OpenSUSE" },
+ { "fedoracore", "Fedora" },
+ { "gentoo", "Gentoo" },
++ { "mageia", "Mageia" },
+ { "mandriva", "Mandriva" },
+ { "redhat", "RedHat" },
+ { "ubuntu", "Ubuntu" },
diff --git a/VirtualBox-5.2.10-xclient.patch b/VirtualBox-7.0.2-xclient-cleanups.patch
similarity index 53%
rename from VirtualBox-5.2.10-xclient.patch
rename to VirtualBox-7.0.2-xclient-cleanups.patch
index 308a8ee..84635ef 100644
--- a/VirtualBox-5.2.10-xclient.patch
+++ b/VirtualBox-7.0.2-xclient-cleanups.patch
@@ -1,6 +1,15 @@
---- ./src/VBox/Additions/x11/Installer/98vboxadd-xclient.orig 2020-06-06 06:20:12.079227656 +0100
-+++ ./src/VBox/Additions/x11/Installer/98vboxadd-xclient 2020-06-06 06:26:55.886940895 +0100
-@@ -21,18 +21,11 @@ for i in $HOME/.vboxclient-*.pid; do
+# Do not show an error dialog when not running under vbox
+# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as
+# a systemd service, this works with both Wayland and Xorg based sessions
+
+---
+ src/VBox/Additions/x11/Installer/98vboxadd-xclient | 13 +++----------
+ 1 file changed, 3 insertions(+), 10 deletions(-)
+
+diff -Nurp VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient
+--- VirtualBox-7.0.2.orig/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2022-10-19 21:20:45.000000000 +0300
++++ VirtualBox-7.0.2/src/VBox/Additions/x11/Installer/98vboxadd-xclient 2022-10-22 12:05:28.770187860 +0300
+@@ -31,18 +31,11 @@ for i in $HOME/.vboxclient-*.pid; do
test -w $i || rm -f $i
done
@@ -20,5 +29,6 @@
/usr/bin/VBoxClient --checkhostversion
/usr/bin/VBoxClient --seamless
/usr/bin/VBoxClient --draganddrop
-- /usr/bin/VBoxClient --vmsvga # In case VMSVGA emulation is enabled
+- /usr/bin/VBoxClient --vmsvga-session # In case VMSVGA emulation is enabled
fi
+
diff --git a/VirtualBox-python3.11.patch b/VirtualBox-python3.11.patch
index e732999..ac0077f 100644
--- a/VirtualBox-python3.11.patch
+++ b/VirtualBox-python3.11.patch
@@ -9,18 +9,6 @@
for p in $PYTHONDIR; do
for d in $SUPPYTHONLIBS; do
for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do
-diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/gen_python_deps.py VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py
---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/gen_python_deps.py 2022-07-19 22:01:39.000000000 +0100
-+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/gen_python_deps.py 2022-07-25 14:00:04.027778063 +0100
-@@ -16,7 +16,7 @@ from __future__ import print_function
- import os,sys
- from distutils.version import StrictVersion
-
--versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m" ]
-+versions = ["2.6", "2.7", "3.1", "3.2", "3.2m", "3.3", "3.3m", "3.4", "3.4m", "3.5", "3.5m", "3.6", "3.6m", "3.7", "3.7m", "3.8", "3.8m", "3.9", "3.9m", "3.10", "3.10m", "3.11", "3.11m"]
- prefixes = ["/usr", "/usr/local", "/opt", "/opt/local"]
- known = {}
-
diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk
--- VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-19 22:01:39.000000000 +0100
+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/Makefile.kmk 2022-07-25 14:00:03.971778289 +0100
@@ -86,13 +74,21 @@ diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/Makefile.kmk VirtualBox-6.
ifdef VBOX_PYTHONDEF_INC
#
-diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/module/_xpcom.cpp
---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-07-19 22:01:40.000000000 +0100
-+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-07-25 14:00:04.134777632 +0100
+@@ -744,7 +790,7 @@ endif
+ # TODO: ASSUMING that we don't need a different headers for pymalloc
+ # ('m' builds < 3.8) and CRT malloc.
+ #
+-VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 34 33 \
++VBOX_PYTHON_LIMITED_API_VER := $(firstword $(foreach ver, 35 36 38 39 310 311 34 33 \
+ ,$(if-expr defined(VBOX_PYTHON$(ver)_INC),$(ver),)$(if-expr defined(VBOX_PYTHON$(ver)M_INC),$(ver)M,)))
+ ifneq ($(VBOX_PYTHON_LIMITED_API_VER),)
+ DLLS += VBoxPython3
+--- ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp.orig 2022-10-30 04:19:33.834495672 +0000
++++ ./src/libs/xpcom18a4/python/src/module/_xpcom.cpp 2022-10-30 04:24:11.895463023 +0000
@@ -84,7 +84,11 @@ extern PYXPCOM_EXPORT void PyXPCOM_Inter
# define MANGLE_MODULE_INIT(a_Name) RT_CONCAT(a_Name, MODULE_NAME_SUFFIX)
# endif
- # ifdef VBOX_PYXPCOM_VERSIONED
+ # if defined(VBOX_PYXPCOM_VERSIONED) && !defined(VBOX_PYXPCOM_MAJOR_VERSIONED)
-# if PY_VERSION_HEX >= 0x030a0000 && PY_VERSION_HEX < 0x030b0000
+# if PY_VERSION_HEX >= 0x030b0000 && PY_VERSION_HEX < 0x030c0000
+# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_11")
@@ -102,33 +98,3 @@ diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/module/_xpcom.cpp Virt
# define MODULE_NAME MANGLE_MODULE_NAME("VBoxPython3_10")
# define initVBoxPython MANGLE_MODULE_INIT(PyInit_VBoxPython3_10)
-diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h
---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/PyXPCOM.h 2022-07-19 22:01:40.000000000 +0100
-+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/PyXPCOM.h 2022-07-25 14:00:23.316663783 +0100
-@@ -137,14 +137,6 @@ inline PyObject *PyBool_FromLong(long ok
- # define PyInt_Check(o) PyLong_Check(o)
- # define PyInt_AsLong(o) PyLong_AsLong(o)
- # define PyNumber_Int(o) PyNumber_Long(o)
--# if PY_VERSION_HEX <= 0x03030000 /* 3.3 added PyUnicode_AsUTF8AndSize */
--# ifndef PyUnicode_AsUTF8
--# define PyUnicode_AsUTF8(o) _PyUnicode_AsString(o)
--# endif
--# ifndef PyUnicode_AsUTF8AndSize
--# define PyUnicode_AsUTF8AndSize(o,s) _PyUnicode_AsStringAndSize(o,s)
--# endif
--# endif
- typedef struct PyMethodChain
- {
- PyMethodDef *methods;
-diff -rup VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/VariantUtils.cpp VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp
---- VirtualBox-6.1.36/src/libs/xpcom18a4/python/src/VariantUtils.cpp 2022-07-19 22:01:40.000000000 +0100
-+++ VirtualBox-6.1.34.orig/src/libs/xpcom18a4/python/src/VariantUtils.cpp 2022-03-22 23:47:49.000000000 +0000
-@@ -628,7 +628,7 @@ static PyObject *UnpackSingleArray(Py_ns
- #if PY_MAJOR_VERSION <= 2
- return PyString_FromStringAndSize( (char *)array_ptr, sequence_size );
- #else
-- return PyBytes_FromStringAndSize( (char *)array_ptr, sequence_size );
-+ return PyUnicode_FromStringAndSize( (char *)array_ptr, sequence_size );
- #endif
-
- PRUint32 array_element_size = GetArrayElementSize(array_type);
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 0ff93fd..d5f962e 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -1,5 +1,3 @@
-%global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
-
# Standard compiler flags, without:
# -Wall -- VirtualBox takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
@@ -32,13 +30,22 @@
%bcond_without guest_additions
%endif
-# Since version 6.1.28, VBox should not have the python2 dependency
-%bcond_with python2
+%if 0%{?fedora}
+ %bcond_without system_libtpms
+%else
+ %bcond_with system_libtpms
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} > 8
+ %bcond_without dxvk_native
+%else
+ %bcond_with dxvk_native
+%endif
%bcond_without python3
Name: VirtualBox
-Version: 6.1.40
+Version: 7.0.2
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -69,28 +76,28 @@ Source25: os_mageia_64_x3.png
Source26: os_mageia_x4.png
Source27: os_mageia_64_x4.png
-Patch1: VirtualBox-6.0.0-noupdate.patch
+Patch1: VirtualBox-7.0.2-noupdate.patch
Patch2: VirtualBox-6.1.0-strings.patch
-Patch3: VirtualBox-6.0.0-default-to-Fedora.patch
+Patch3: VirtualBox-7.0.2-default-to-Fedora.patch
+Patch4: VirtualBox-5.1.0-lib64-VBox.sh.patch
#Patch27: VirtualBox-gcc.patch
#to revert on EL7
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
+#from Debian
+Patch30: system-libs_cutted.patch
+Patch31: fix-build.patch
# from ArchLinux
Patch40: 007-python2-path.patch
# from Mageia
-Patch50: VirtualBox-6.1.36-add-Mageia-support.patch
-Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
-Patch52: VirtualBox-6.0.10-convert-map-python3.patch
+Patch50: VirtualBox-7.0.2-update-Mageia-support.patch
+Patch52: VirtualBox-6.1.14-fix-missing-includes-with-qt-5.15.patch
+Patch53: VirtualBox-6.0.10-remove-duplicated-define.patch
+Patch54: VirtualBox-7.0.2-ExtPacks-VBoxDTrace-no-publisher-in-version.patch
# from Fedora
-# Do not show an error dialog when not running under vbox
-# Do not start VBoxClient --vmsvga, we run VBoxClient --vmsvga as
-# a systemd service, this works with both Wayland and Xorg based sessions
-Patch60: VirtualBox-5.2.10-xclient.patch
+Patch60: VirtualBox-7.0.2-xclient-cleanups.patch
# from OpenSuse
-Patch70: vbox-python-selection.patch
-Patch71: fixes_for_Qt5.11to15.patch
+#Patch70: vbox-python-selection.patch
Patch72: virtualbox-snpritnf-buffer-overflow.patch
-Patch73: vb-6.1.16-modal-dialog-parent.patch
Patch80: VirtualBox-6.1.4-gcc10.patch
Patch88: VirtualBox-lzf.patch
@@ -106,21 +113,25 @@ BuildRequires: libcurl-devel
BuildRequires: iasl
BuildRequires: libxslt-devel
BuildRequires: libIDL-devel
+BuildRequires: nasm
BuildRequires: yasm
BuildRequires: alsa-lib-devel
BuildRequires: opus-devel
BuildRequires: pulseaudio-libs-devel
-%if %{with python2}
-BuildRequires: python2-devel
-%endif
%if %{with python3}
BuildRequires: python%{python3_pkgversion}-devel
%endif
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
-BuildRequires: qt5-qtbase-devel
-BuildRequires: qt5-qtx11extras-devel
-BuildRequires: qt5-linguist
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Help)
+BuildRequires: pkgconfig(Qt5OpenGL)
+BuildRequires: pkgconfig(Qt5PrintSupport)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(Qt5Xml)
+
%if %{with webservice}
BuildRequires: gsoap-devel
%endif
@@ -181,6 +192,15 @@ BuildRequires: mesa-libGLU-devel
%if %{with vnc}
BuildRequires: libvncserver-devel
%endif
+%if %{with system_libtpms}
+BuildRequires: pkgconfig(libtpms)
+%endif
+BuildRequires: pkgconfig(ogg)
+BuildRequires: pkgconfig(vorbis)
+%if %{with dxvk_native}
+BuildRequires: glslang
+#BuildRequires: dxvk-native-devel
+%endif
%{?systemd_requires}
BuildRequires: systemd
@@ -205,9 +225,6 @@ Group: Development/Tools
Requires: %{name}-kmod = %{version}
Requires: hicolor-icon-theme
Provides: %{name}-kmod-common = %{version}-%{release}
-%if ! %{with python2}
-Obsoletes: python2-%{name}%{?isa} < %{version}-%{release}
-%endif
%if ! %{with python3}
Obsoletes: python%{python3_pkgversion}-%{name}%{?isa} < %{version}-%{release}
%endif
@@ -229,9 +246,6 @@ webservice GUI part for %{name}.
Summary: %{name} SDK
Group: Development/Libraries
Requires: %{name}-server%{?isa} = %{version}-%{release}
-%if %{with python2}
-Requires: python2-%{name}%{?isa} = %{version}-%{release}
-%endif
%if %{with python3}
Requires: python%{python3_pkgversion}-%{name}%{?isa} = %{version}-%{release}
%endif
@@ -240,20 +254,6 @@ Requires: python%{python3_pkgversion}-%{name}%{?isa} = %{version}-%{release}
%{name} Software Development Kit.
-%package -n python2-%{name}
-Summary: Python bindings for %{name}
-Group: Development/Libraries
-Requires: %{name}-server%{?_isa} = %{version}-%{release}
-%{?python_provide:%python_provide python2-%{name}}
-# Remove before F30
-Provides: python-VirtualBox = %{version}-%{release}
-Provides: python-VirtualBox%{?_isa} = %{version}-%{release}
-Obsoletes: python-VirtualBox < %{version}-%{release}
-
-%description -n python2-%{name}
-Python XPCOM bindings to %{name}.
-
-
%package -n python%{python3_pkgversion}-%{name}
Summary: Python3 bindings for %{name}
Group: Development/Libraries
@@ -309,11 +309,14 @@ find -name '*.py[co]' -delete
rm -r src/VBox/Additions/WINNT
rm -r src/VBox/Additions/os2
rm -r kBuild/
+#mv tools/kBuildUnits .
rm -r tools/
+#mkdir tools
+#mv kBuildUnits tools/
+
# Remove bundle X11 sources and some lib sources, before patching.
rm -r src/VBox/Additions/x11/x11include/
-rm -r src/VBox/Additions/x11/x11stubs/
-rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/
+rm -r src/VBox/Additions/3D/mesa/mesa-21.3.8/
# wglext.h has typedefs for Windows-specific extensions
#rm include/VBox/HostServices/wglext.h
# src/VBox/GuestHost/OpenGL/include/GL/glext.h have VBOX definitions
@@ -322,27 +325,39 @@ rm -r src/VBox/Additions/3D/mesa/mesa-17.3.9/
rm -r src/libs/liblzf-3.*/
rm -r src/libs/libpng-1.6.*/
rm -r src/libs/libxml2-2.9.*/
-rm -r src/libs/openssl-1.*/
+rm -r src/libs/openssl-3.*/
rm -r src/libs/zlib-1.2.*/
+rm -r src/libs/curl-7.*/
+rm -r src/libs/libvorbis-1.3.*/
+rm -r src/libs/libogg-1.3.*/
+%if %{with system_libtpms}
+rm -r src/libs/libtpms-0.9.0/
+%endif
+%if %{with dxvk_native}
+#rm -r src/libs/dxvk-native-1.9.*/
+%endif
+#rm -r src/libs/softfloat-3e/
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .default_os_fedora
+%patch4 -p1 -b .lib64-VBox.sh
#patch27 -p1 -b .gcc
%if 0%{?rhel} && 0%{?rhel} < 8
%patch29 -p2 -R -b .gsoap3
%endif
+%patch30 -p1 -b .use_vorbis_and_ogg_system
+%patch31 -p1 -b .fix_build_noneed_kBuildUnits
%if %{with python3}
%patch40 -p1 -b .python2_path
-%patch52 -p1 -b .convert-map-python3
%endif
%patch50 -p1 -b .mageia-support
-%patch51 -p1 -b .revert-VBox.sh
+%patch52 -p1 -b .qt
+%patch53 -p1 -b .qt2
+%patch54 -p1 -b .dtrace
%patch60 -p1 -b .xclient
-%patch70 -p1 -b .python-detection
-%patch71 -p1 -b .qt
+#patch70 -p1 -b .python-detection
%patch72 -p1 -b .snpritnf-buffer-overflow
-%patch73 -p1 -b .modal-dialog-parent
%patch80 -p1 -b .gcc10
%patch88 -p1 -b .lzf
%patch90 -p1 -b .python3.11
@@ -362,7 +377,7 @@ rm -r src/libs/zlib-1.2.*/
%if !%{with docs}
--disable-docs \
%endif
-%if !%{with python2} && !%{with python3}
+%if !%{with python3}
--disable-python \
%endif
@@ -408,16 +423,40 @@ kmk %{_smp_mflags} \
SDK_VBOX_OPENSSL_INCS="" \
SDK_VBOX_OPENSSL_LIBS="ssl crypto" \
SDK_VBOX_ZLIB_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" \
+%{!?with_dxvk_native: VBOX_WITH_DXVK= } \
%{?with_docs: VBOX_WITH_DOCS=1 } \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_WITH_UPDATE_REQUEST= \
VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \
VBOX_BUILD_PUBLISHER=%{publisher}
+# VBOX_WITH_CLOUD_NET:=
# VBOX_WITH_TESTCASES= \
# VBOX_WITH_VALIDATIONKIT= \
# VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+
+# 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"} \
+#
+# In file included from /usr/include/dxvk-native/native/windows/windows.h:3,
+#from /usr/include/dxvk-native/native/directx/d3d11_1.h:12,
+#from /builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp:58:
+#/usr/include/dxvk-native/native/windows/windows_base.h:110:10: warning: ISO C++ prohibits anonymous structs [-Wpedantic]
+#110 | struct {
+#| ^
+#In file included from /builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA.h:68,
+#from /builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA-SVGA3d-win-dx.cpp:47:
+#/builddir/build/BUILD/VirtualBox-7.0.2/src/VBox/Devices/Graphics/DevVGA-SVGA.h:64:15: error: expected unqualified-id before numeric constant
+#64 | # define TRUE 1
+#| ^
+#/usr/include/dxvk-native/native/windows/windows_base.h:161:16: note: in expansion of macro 'TRUE'
+#161 | constexpr BOOL TRUE = 1;
+#| ^~~~
+
# doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml
# VBOX_WITH_DOCS_TRANSLATIONS=1 \
# we can't build CHM DOCS we need hhc.exe which is not in source and we need
@@ -462,8 +501,6 @@ install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox \
# Binaries
install -p -m 0755 obj/bin/VBox.sh %{buildroot}%{_bindir}/VBox
-install -p -m 0755 -t %{buildroot}%{_bindir} \
- obj/bin/VBoxTunctl
# Executables
install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
@@ -473,7 +510,6 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/VBoxNetNAT \
obj/bin/VBoxNetAdpCtl \
obj/bin/VBoxVolInfo \
- obj/bin/VBoxSDL \
obj/bin/SUPInstall \
obj/bin/SUPLoggerCtl \
obj/bin/SUPUninstall \
@@ -487,7 +523,7 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox \
obj/bin/VBoxXPCOMIPCD \
obj/bin/VBoxSysInfo.sh \
obj/bin/vboxweb-service.sh \
-%if %{with python2} || %{with python3}
+%if %{with python3}
obj/bin/vboxshell.py \
%endif
obj/bin/vbox-img \
@@ -537,18 +573,13 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \
obj/bin/nls/*
# Python
-%if %{with python2} || %{with python3}
+%if %{with python3}
pushd obj/bin/sdk/installer
export VBOX_INSTALL_PATH=%{_libdir}/virtualbox
-%if %{with python2}
- %{__python2} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
-%endif
-%if %{with python3}
- %{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
- if [ -x /usr/bin/pathfix.py ]; then
- pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}${VBOX_INSTALL_PATH}/vboxshell.py
- fi
-%endif
+%{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot}
+if [ -x /usr/bin/pathfix.py ]; then
+ pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}${VBOX_INSTALL_PATH}/vboxshell.py
+fi
popd
%endif
@@ -622,7 +653,6 @@ install -p -m 0644 -D %{SOURCE6} %{buildroot}%{_unitdir}/vboxclient.service
# Module Source Code
mkdir -p %{name}-kmod-%{version}
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
-#rm -r %{name}-kmod-%{version}/vboxvideo/
install -d %{buildroot}%{_datadir}/%{name}-kmod-%{version}
tar --use-compress-program xz -cf %{buildroot}%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
%{name}-kmod-%{version}
@@ -632,10 +662,6 @@ install -m 0644 -D %{SOURCE10} \
%{buildroot}%{_unitdir}/vboxweb.service
%endif
-# Installation root configuration
-install -d %{buildroot}%{_sysconfdir}/vbox
-echo 'INSTALL_DIR=%{_libdir}/virtualbox' > %{buildroot}%{_sysconfdir}/vbox/vbox.cfg
-
# Install udev rules
install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh %{buildroot}%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
@@ -644,7 +670,6 @@ install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_unitdir}/vboxdrv.service
install -p -m 0644 -D %{SOURCE9} %{buildroot}%{_presetdir}/96-vboxhost.preset
-
# Menu entry
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
--remove-key=Encoding obj/bin/virtualbox.desktop
@@ -661,12 +686,6 @@ install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_metainfodir}/%{name}.appdata.xml
#set_selinux_permissions /usr/lib/virtualbox /usr/share/virtualbox
# vboxautostart-service
-install -d %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
-install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox/rdesktop-vrdp-keymaps obj/bin/rdesktop-vrdp-keymaps/*
-install -p -m 0644 -t %{buildroot}%{_libdir}/virtualbox obj/bin/rdesktop-vrdp.tar.gz
-install -p -m 0755 -t %{buildroot}%{_bindir} obj/bin/rdesktop-vrdp
-
-
%pre server
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
@@ -787,21 +806,16 @@ getent passwd vboxadd >/dev/null || \
%{_bindir}/vboxmanage
%{_bindir}/VBoxSDL
%{_bindir}/vboxsdl
-%{_bindir}/VBoxTunctl
%{_bindir}/VBoxVRDP
%{_bindir}/VirtualBoxVM
%{_bindir}/virtualboxvm
%{_bindir}/vbox-img
%{_bindir}/vboximg-mount
-%{_bindir}/rdesktop-vrdp
%dir %{_libdir}/virtualbox
%{_libdir}/virtualbox/*.[^p]*
%exclude %{_libdir}/virtualbox/VBoxDbg.so
%exclude %{_libdir}/virtualbox/UICommon.so
%exclude %{_libdir}/virtualbox/VirtualBoxVM.so
-%if %{with python2}
-%exclude %{_libdir}/virtualbox/VBoxPython2_7.so
-%endif
%if %{with python3}
%exclude %{_libdir}/virtualbox/VBoxPython3*.so
%endif
@@ -821,18 +835,14 @@ getent passwd vboxadd >/dev/null || \
%{_libdir}/virtualbox/VBoxDTrace
%{_libdir}/virtualbox/vbox-img
%{_libdir}/virtualbox/vboximg-mount
-%{_libdir}/virtualbox/rdesktop-vrdp-keymaps
# This permissions have to be here, before generator of debuginfo need
# permissions to read this files
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetNAT
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxVolInfo
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxHeadless
-%attr(4511,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
%attr(4511,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
%attr(4511,root,root) %{_libdir}/virtualbox/VirtualBoxVM
-%dir %{_sysconfdir}/vbox
-%config %{_sysconfdir}/vbox/vbox.cfg
%{_udevrulesdir}/60-vboxdrv.rules
%{_unitdir}/vboxdrv.service
%{_presetdir}/96-vboxhost.preset
@@ -866,13 +876,6 @@ getent passwd vboxadd >/dev/null || \
%files devel
%{_libdir}/virtualbox/sdk
-%if %{with python2}
-%files -n python2-%{name}
-%{_libdir}/virtualbox/*.py*
-%{python2_sitelib}/vboxapi*
-%{_libdir}/virtualbox/VBoxPython2_7.so
-%endif
-
%if %{with python3}
%files -n python%{python3_pkgversion}-%{name}
%{_libdir}/virtualbox/*.py*
@@ -905,6 +908,19 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Oct 26 2022 Sérgio Basto <sergio(a)serjux.com> - 7.0.2-1
+- Update to 7.0.2
+- Drop python2 support
+- Based on Mageia and after on Debian packages
+- Drop VirtualBox-6.0.10-convert-map-python3.patch and vb-6.1.16-modal-dialog-parent.patch
+- Refresh default-to-Fedora, noupdate.patch, xclient.patch, build-xpcom18a4-with-c++17.patch and python3.11.patch
+- Replace fixes_for_Qt5.11to15.patch with remove-duplicated-define.patch, update-Mageia-support.patch and fix-missing-includes-with-qt-5.15.patch
+- Add ExtPacks-VBoxDTrace-no-publisher-in-version.patch from Mageia
+- Add partial system-libs.patch and fix-build.patch from Debian (libvorbis and libogg system support)
+- Add build conditionals for system_libtpms and dxvk-native
+- Add VirtualBox-5.1.0-lib64-VBox.sh.patch and finally drop /etc/vbox as upstream did in 5.1.0
+- Add BR: nasm (to fix nasm: not found message)
+
* Wed Oct 12 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.40-1
- Update VirtualBox to 6.1.40
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 0000000..020091b
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,21 @@
+Description: that file needs to be used on windows only.
+
+The build can also be fixed by exporting
+VBOX_WITH_HOST_SHIPPING_AUDIO_TEST=
+VBOX_WITH_VALIDATIONKIT=
+
+in LocalConfig.kmk
+
+diff --git a/src/VBox/ValidationKit/Config.kmk b/src/VBox/ValidationKit/Config.kmk
+index 7047a04b8..66ea42ca4 100644
+--- a/src/VBox/ValidationKit/Config.kmk
++++ b/src/VBox/ValidationKit/Config.kmk
+@@ -122,7 +122,7 @@ TEMPLATE_VBoxValidationKitR3_LNK_DEPS.win.amd64 = $(if $(eq $(tool_do),LINK_LIB
+
+ #TODO: TEMPLATE_VBoxValidationKitR3_EXTENDS = VBOXGUESTR3EXE
+
+-TEMPLATE_VBoxValidationKitR3_USES += vboximportchecker
++TEMPLATE_VBoxValidationKitR3_USES.win += vboximportchecker
+ TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.x86 = nt31
+ TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.amd64 = xp64
+
diff --git a/sources b/sources
index 2e82fd7..a0d4fed 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-6.1.40.tar.bz2) = 0dace071fe58500d0912fe4da4751de6840752375039554a56c8c753a0880a419c4a1ed7f1b0ebc51230f7099ca3f5d987dc7b91ad4d98dbd75bf63e3c27e096
-SHA512 (UserManual.pdf) = cba2baf8e196d1be939e2b0ffef0a4015d06eb2671df51a4ed9eac2389f0194cb2cce8984394855779bfeb51f4756f0939032358dc41b9b8bf9e5ac270f2e07f
+SHA512 (VirtualBox-7.0.2.tar.bz2) = c79d6365f83e1fde356a7f4a6ccd23bc7306d1b5b4be669634c575f08ba53338caca684758c9409ecef2b05ab6f9ad37dfa6075ad6afbc5d7909d46ee6794927
+SHA512 (UserManual.pdf) = 930e1e371b20e2d1d66ea66a3eda87338e9f51df7cfb6530147c649f4a0ab7e1ec194606b0cda2acbab40d426a0f496e17b327bacf196bf79b1978c51b83db66
diff --git a/system-libs_cutted.patch b/system-libs_cutted.patch
new file mode 100644
index 0000000..7de7ecf
--- /dev/null
+++ b/system-libs_cutted.patch
@@ -0,0 +1,121 @@
+--- ./configure.orig 2022-10-19 19:17:13.000000000 +0100
++++ ./configure 2022-10-31 15:16:29.775851599 +0000
+@@ -110,6 +110,8 @@ WITH_DOCS=1
+ WITH_LIBVPX=1
+ WITH_LIBOPUS=1
+ WITH_LIBTPMS=1
++WITH_LIBVORBIS=1
++WITH_LIBOGG=1
+ BUILD_LIBXML2=
+ BUILD_LIBCURL=
+ BUILD_LIBSSL=
+@@ -1846,6 +1848,78 @@ EOF
+
+
+ #
++# Check for libvorbis
++#
++check_libvorbis()
++{
++ test_header libvorbis
++ if which_wrapper pkg-config > /dev/null; then
++ libvorbis_ver=`pkg-config vorbis --modversion 2>> $LOG`
++ if [ $? -eq 0 ]; then
++ FLGVRB=`pkg-config vorbis --cflags`
++ INCVRB=`strip_I "$FLGVRB"`
++ LIBVRB=`pkg-config vorbis --libs`
++ fi
++ cat > $ODIR.tmp_src.cc << EOF
++#include <cstdio>
++#include <vorbis/vorbisenc.h>
++extern "C" int main(void)
++{
++ vorbis_info v;
++ vorbis_info_init(&v);
++ printf("found, OK.\n");
++}
++EOF
++ [ -n "$INCVRB" ] && I_INCVRB=`prefix_I "$INCVRB"`
++ if test_compile "$LIBVRB $I_INCVRB" vorbis vorbis nofatal; then
++ if test_execute; then
++ cnf_append "SDK_VBOX_VORBIS_INCS" "$INCVRB"
++ cnf_append "SDK_VBOX_VORBIS_LIBS" "`strip_l "$LIBVRB"`"
++ fi
++ else
++ echo "not found -- building libvorbis from in-tree code."
++ fi
++ fi
++}
++
++
++#
++# Check for libogg
++#
++check_libogg()
++{
++ test_header libogg
++ if which_wrapper pkg-config > /dev/null; then
++ libogg_ver=`pkg-config ogg --modversion 2>> $LOG`
++ if [ $? -eq 0 ]; then
++ FLGOGG=`pkg-config ogg --cflags`
++ INCOGG=`strip_I "$FLGOGG"`
++ LIBOGG=`pkg-config ogg --libs`
++ fi
++ cat > $ODIR.tmp_src.cc << EOF
++#include <cstdio>
++#include <ogg/ogg.h>
++extern "C" int main(void)
++{
++ oggpack_buffer o;
++ oggpack_get_buffer(&o);
++ printf("found, OK.\n");
++}
++EOF
++ [ -n "$INCOGG" ] && I_INCVRB=`prefix_I "$INCOGG"`
++ if test_compile "$LIBOGG $I_INCOGG" ogg ogg nofatal; then
++ if test_execute; then
++ cnf_append "SDK_VBOX_OGG_INCS" "$INCOGG"
++ cnf_append "SDK_VBOX_OGG_LIBS" "`strip_l "$LIBOGG"`"
++ fi
++ else
++ echo "not found -- building libogg from in-tree code."
++ fi
++ fi
++}
++
++
++#
+ # Check whether static libstdc++ is installed. This library is required
+ # for the Linux guest additions.
+ #
+@@ -2437,6 +2511,8 @@ EOF
+ [ $WITH_LIBVPX -eq 1 ] && echo " --disable-libvpx don't use libvpx for video capturing"
+ [ $WITH_LIBOPUS -eq 1 ] && echo " --disable-libopus don't use libopus for audio capturing"
+ [ $WITH_LIBTPMS -eq 1 ] && echo " --disable-libtpms don't use libtpms for TPM emulation"
++[ $WITH_LIBVORBIS -eq 1 ] && echo " --disable-libvorbis enable system libvorbis"
++[ $WITH_LIBOGG -eq 1 ] && echo " --disable-libogg enable system libogg"
+ [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo " --enable-vde enable VDE networking"
+ cat << EOF
+ --disable-udptunnel disable UDP tunnel networking
+@@ -2688,6 +2764,12 @@ for option in "$@"; do
+ --disable-libtpms)
+ WITH_LIBTPMS=0
+ ;;
++ --disable-libvorbis)
++ WITH_LIBVORBIS=0
++ ;;
++ --disable-libogg)
++ WITH_LIBOGG=0
++ ;;
+ --disable-sdl)
+ WITH_SDL=0
+ ;;
+@@ -2909,6 +2991,8 @@ if [ $ONLY_ADDITIONS -eq 0 ]; then
+ [ $WITH_LIBVPX -eq 1 ] && check_vpx
+ [ $WITH_LIBOPUS -eq 1 ] && check_libopus
+ [ $WITH_LIBTPMS -eq 1 ] && check_libtpms
++ check_libvorbis
++ check_libogg
+ [ "$OS" != "darwin" ] && check_png
+ [ $OSE -eq 0 -a "$OS" = "linux" ] && check_pam
+ if [ $WITH_SDL -eq 1 ]; then
diff --git a/update_vbox.sh b/update_vbox.sh
index d0d6284..21b46ae 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.1.40
+VERSION=7.0.2
REL=1
RAWHIDE=38
REPOS="f37 f36 f35 el9 el8 el7"
@@ -24,7 +24,7 @@ rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf
fi
echo Press enter scratch-build or n to skip ; read dummy;
if [[ "$dummy" != "n" ]]; then
- rfpkg scratch-build --srpm --nowait
+ rfpkg scratch-build --srpm
fi
echo Press enter to build on corp -build or n to skip ; read dummy;
if [[ "$dummy" != "n" ]]; then
@@ -47,7 +47,7 @@ echo STAGE 2
for repo in $REPOS ; do
echo Press enter to build on branch $repo or n to skip; read dummy;
if [[ "$dummy" != "n" ]]; then
-git checkout $repo && git merge master && git push && rfpkg build --nowait; git checkout master
+git checkout $repo && git merge master && git push && rfpkg build; git checkout master
fi
done
fi
1 year, 5 months
- 1
- 0
[nvidia-kmod/vulkan-beta] Update to 515.49.24
by Nicolas Chauvet
commit 8736ea8db98670e37e7d26510f9c6c8a2ad838e3
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 1 22:18:33 2022 +0100
Update to 515.49.24
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 6a38fda..6fb005a 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,7 +10,7 @@
Name: nvidia-kmod
Epoch: 3
-Version: 515.49.19
+Version: 515.49.24
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -80,6 +80,9 @@ done
%changelog
+* Tue Nov 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:515.49.24-1
+- Update to 515.49.24
+
* Tue Oct 04 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:515.49.19-1
- Update to 515.49.19
1 year, 5 months
- 1
- 0
[xorg-x11-drv-nvidia/vulkan-beta] Update to 515.49.24
by Nicolas Chauvet
commit 72b74091e82b41530d3e8526c85ac9ee30ae0115
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Nov 1 22:15:49 2022 +0100
Update to 515.49.24
sources | 2 +-
xorg-x11-drv-nvidia.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index b364c97..bd88474 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NVIDIA-Linux-x86_64-515.49.19.run) = 87b129b3d24a70a7ae18640e995e165fe3e8188ec984c84295fc5db8ed56843cbb787130fbf3a94540dcab234c929bc013b94c5408c573c047b207d1d7b921df
+SHA512 (NVIDIA-Linux-x86_64-515.49.24.run) = 30d697e02247698289410cc2a03a963d9031ec9a10acde1a34d79c8267e5c6dc5d82e7218c2a08c7c092d9d6428c9411395abed99ed7c02cc4e02494b70949d1
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 62005cb..4ed375b 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -26,8 +26,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
-Version: 515.49.19
-Release: 2%{?dist}
+Version: 515.49.24
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -588,6 +588,9 @@ fi ||:
%endif
%changelog
+* Tue Nov 01 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:515.49.24-1
+- Update to 515.49.24
+
* Tue Oct 11 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:515.49.19-2
- Allow higher nvidia tools
1 year, 5 months
- 1
- 0
[jellyfin] Update to 10.8.7
by Michael Cronenworth
commit 9d7cc95d3a48dc7974d1d08eec5e9e07abc3ee78
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Tue Nov 1 09:47:27 2022 -0500
Update to 10.8.7
jellyfin-offline.sh | 2 +-
jellyfin-web-package-lock.json | 16 ++++++++--------
jellyfin.spec | 5 ++++-
sources | 10 +++++-----
4 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/jellyfin-offline.sh b/jellyfin-offline.sh
index 970c3c0..9b58589 100755
--- a/jellyfin-offline.sh
+++ b/jellyfin-offline.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-JELLYFIN_VERSION=10.8.6
+JELLYFIN_VERSION=10.8.7
DOTNET_VERSION=6.0.9
DOTNET_HOST_VERSION=6.0.9
diff --git a/jellyfin-web-package-lock.json b/jellyfin-web-package-lock.json
index 0c20f24..95a5829 100644
--- a/jellyfin-web-package-lock.json
+++ b/jellyfin-web-package-lock.json
@@ -1,12 +1,12 @@
{
"name": "jellyfin-web",
- "version": "10.8.6",
+ "version": "10.8.7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "jellyfin-web",
- "version": "10.8.6",
+ "version": "10.8.7",
"license": "GPL-2.0-or-later",
"dependencies": {
"@fontsource/noto-sans": "4.5.1",
@@ -5498,9 +5498,9 @@
"dev": true
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001426",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz",
- "integrity": "sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A==",
+ "version": "1.0.30001429",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
+ "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==",
"devOptional": true,
"funding": [
{
@@ -24742,9 +24742,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30001426",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz",
- "integrity": "sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A==",
+ "version": "1.0.30001429",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001429.tgz",
+ "integrity": "sha512-511ThLu1hF+5RRRt0zYCf2U2yRr9GPF6m5y90SBCWsvSoYoW7yAGlv/elyPaNfvGCkp6kj/KFZWU0BMA69Prsg==",
"devOptional": true
},
"ccount": {
diff --git a/jellyfin.spec b/jellyfin.spec
index 4afab25..73cf060 100644
--- a/jellyfin.spec
+++ b/jellyfin.spec
@@ -2,7 +2,7 @@
%global debug_package %{nil}
Name: jellyfin
-Version: 10.8.6
+Version: 10.8.7
Release: 1%{?dist}
Summary: The Free Software Media System
License: GPL-2.0-only
@@ -260,6 +260,9 @@ exit 0
%changelog
+* Tue Nov 01 2022 Michael Cronenworth <mike(a)cchtml.com> - 10.8.7-1
+- Update to 10.8.7
+
* Sat Oct 29 2022 Michael Cronenworth <mike(a)cchtml.com> - 10.8.6-1
- Update to 10.8.6
diff --git a/sources b/sources
index 1179a27..d39549e 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (jellyfin-10.8.6.tar.gz) = 7dce0de837b8ade7b98c697b6c96f878efc2cb56eade373a8cdd8ac2efe00da88e86daf3a3922e7774cd01cff075ffafea2d3257d4e3dd44fe23605d455ee529
-SHA512 (jellyfin-web-10.8.6.tar.gz) = fa2a37616c7b8d1abb62a5c9bdd5cecc62c8b9ccbcde52daaf6e04739543302b9d03b091de949b4a0ca33ddc52e27070368ab5ed090dfb3b33c9b593daee839d
-SHA512 (jellyfin-npm.tar.xz) = 2f2f4d239e1194db50541444a1162c08e5da2465f1737e51d26e581283e80b60dfbe2c1529378377032a5b8b34a6d11fe009b2ac24506b837f75abdc5c5527fb
-SHA512 (jellyfin-nupkgs2.tar.xz) = e940832d92b1e9ebdac1adc9a6c30cf91aab3813c5a01fcb711061d8121ed5ca76a0b4d03e9addc20c74f3888b5f6ebba5e1736af4996b022ed2c36fbbdb681e
-SHA512 (jellyfin-nupkgs.tar.xz) = e8866c5f34e4422bfc5151d53b32860e13f104b11456035e70c153d28e7dccd907ac7a8090078858025fc399681188839bc2a41265fba1d4889d70a8c520e316
+SHA512 (jellyfin-10.8.7.tar.gz) = c97ed624bfc6810be99f2e837b8553b420033abfe57d1402fea60cd8a382dcf52a2235a3c031131b63006f5f349c1cd3c97d1c2feaa6bd11b15d58ed768993b9
+SHA512 (jellyfin-web-10.8.7.tar.gz) = d4b5ae31bf411de0a097dbc0a44248cb5d7722b045f7c91abe6e6fc49c5f44ce809a54576098db0e96fe46f4faef016beb4dc7df908c40f372347a1d8c5ec873
+SHA512 (jellyfin-npm.tar.xz) = c5e442fd5d2ac6c82947d2c08c15a9671f79a6543f0f091e61caa9b0ae3533ae11ca975c763972cab6eb9f2090e0025cda1beebde3493d4b7f58fb0fa011d17a
+SHA512 (jellyfin-nupkgs2.tar.xz) = 30b65ef5059490f3785e77f5deb15246737e084027dbb7b7608fe8bac387491f5b3d32f7714b4c23bbec439765cab87a47b351238b5bc3609f1d1f20f2fd677c
+SHA512 (jellyfin-nupkgs.tar.xz) = 9ccc71454e68ff302bcbaee44f36c3ab6b7fc91fb8bc3874fc3dc075e82b96f881b75c0038596078662d100ce47a08fdd4eae929c31b90c801819c8822b70e39
1 year, 5 months
- 1
- 0
[mythtv] Update fixes patch.
by Richard Shaw
commit b278c056fc5dd91c3d95040e7eba56a0d2c77596
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Tue Nov 1 08:08:40 2022 -0500
Update fixes patch.
v32.0..4cf469cbbf.patch => v32.0..ba52c13223.patch | 1582 +++++++++++++++++++-
1 file changed, 1539 insertions(+), 43 deletions(-)
---
diff --git a/v32.0..4cf469cbbf.patch b/v32.0..ba52c13223.patch
similarity index 96%
rename from v32.0..4cf469cbbf.patch
rename to v32.0..ba52c13223.patch
index 735702b..598c716 100644
--- a/v32.0..4cf469cbbf.patch
+++ b/v32.0..ba52c13223.patch
@@ -1,7 +1,7 @@
From 28d360e98916ae065292fa29675c48faff742923 Mon Sep 17 00:00:00 2001
From: Paul Harrison <paul(a)mythqml.net>
Date: Thu, 24 Feb 2022 11:40:20 +0000
-Subject: [PATCH 01/43] Revert "NuppelVideoRecorder.cpp: convert to QtEndian"
+Subject: [PATCH 01/66] Revert "NuppelVideoRecorder.cpp: convert to QtEndian"
This commit is causing problems with the Ubuntu s390x builds and
possibly other big endian builds.
@@ -165,7 +165,7 @@ index d880ff574bf..81ac26cc4ff 100644
From 56275b303bf7c7fec99993d1fff568708d0b985b Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton(a)khirnov.net>
Date: Thu, 24 Feb 2022 11:11:28 -0500
-Subject: [PATCH 02/43] configure: link to libatomic when it's present
+Subject: [PATCH 02/66] configure: link to libatomic when it's present
C11 atomics in some configurations (e.g. 64bit operations on ppc64 with
GCC) require linking to libatomic.
@@ -234,7 +234,7 @@ index c9fc6dc1ba4..19cae20bab6 100755
From 75cf5040eff2aa6b7dc075462311de7c277b9375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin(a)martin.st>
Date: Thu, 24 Feb 2022 20:00:00 -0500
-Subject: [PATCH 03/43] configure: arm: Don't add -march= to the compiler if no
+Subject: [PATCH 03/66] configure: arm: Don't add -march= to the compiler if no
preference was passed
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -296,7 +296,7 @@ index 19cae20bab6..a270a5a9fcf 100755
From 75b942fd8cdf6979463c72c75e2919e18552c644 Mon Sep 17 00:00:00 2001
From: Peter Bennett <pbennett(a)mythtv.org>
Date: Sat, 26 Feb 2022 11:13:47 -0500
-Subject: [PATCH 04/43] Fix CPU detection for armhf
+Subject: [PATCH 04/66] Fix CPU detection for armhf
This applies the same fix in MythTV as was applied in 75cf504 to FFmpeg.
The same code is in MythTV and needs the same fix.
@@ -329,7 +329,7 @@ index d7349a91cd4..fda2057a282 100755
From 44a45272517a8122369d74f149dc86432afe3ac0 Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Mon, 28 Feb 2022 21:23:06 +0100
-Subject: [PATCH 05/43] Remove extraneous ? character in Sat>IP OPTIONS message
+Subject: [PATCH 05/66] Remove extraneous ? character in Sat>IP OPTIONS message
The extraneous ? character occurs when the QUrl query is initialized to an empty string "".
Fixed by replacing the "" by a QString() in the OPTIONS and the PLAY query composition.
@@ -369,7 +369,7 @@ index 502b49f8d12..531eb64b009 100644
From e78a0c0042ea20240adef7566676ddeec4c2fb88 Mon Sep 17 00:00:00 2001
From: David Engel <dengel(a)mythtv.org>
Date: Fri, 4 Mar 2022 10:44:01 -0600
-Subject: [PATCH 06/43] Fix playback hangs at end of file.
+Subject: [PATCH 06/66] Fix playback hangs at end of file.
Refs #511
@@ -403,7 +403,7 @@ index 8f7ac450c67..6a9f0738ebd 100644
From 043507cd6f638af4033ae7faca00dec4edc8deb2 Mon Sep 17 00:00:00 2001
From: Scott Theisen <scott.the.elm(a)gmail.com>
Date: Wed, 9 Mar 2022 20:53:30 -0600
-Subject: [PATCH 07/43] Fig logic bug in std::chrono conversion commit
+Subject: [PATCH 07/66] Fig logic bug in std::chrono conversion commit
c71a8672.
Signed-off-by: David Engel <dengel(a)mythtv.org>
@@ -429,7 +429,7 @@ index 6a9f0738ebd..ebd060fd4d5 100644
From ae60e8302fab769dd0aacb091d195b1cef08ad9c Mon Sep 17 00:00:00 2001
From: Scott Theisen <scott.the.elm(a)gmail.com>
Date: Thu, 10 Mar 2022 20:30:13 -0600
-Subject: [PATCH 08/43] Use separate end-of-playback checks for
+Subject: [PATCH 08/66] Use separate end-of-playback checks for
audio-only/mostly content and normal/video-only content.
Refs #511
@@ -479,7 +479,7 @@ index 7041fa996fe..bb50f71d8cc 100644
From 36c5630035864fa5d8efdaec8b0ef6c98067bc67 Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Mon, 14 Mar 2022 11:57:26 -0400
-Subject: [PATCH 09/43] Fix MythDate::formatTime to handle times greater than
+Subject: [PATCH 09/66] Fix MythDate::formatTime to handle times greater than
24 hours.
(cherry picked from commit 2d7a09e40f55c13e203994aa4031f7de111fc97f)
@@ -562,7 +562,7 @@ index 17722debbec..e84e536e3ec 100644
From d5fe42fc6b994c716c70901173d876c53200b50c Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Tue, 15 Mar 2022 17:41:48 -0400
-Subject: [PATCH 10/43] Better fix for MythDate::formatTime to handle
+Subject: [PATCH 10/66] Better fix for MythDate::formatTime to handle
overflows.
Fixes #520.
@@ -855,7 +855,7 @@ index 85aaaadd14f..9b0e604bb1c 100644
From 9dcf2bb01eba126d304c323503c78ce36bbf595b Mon Sep 17 00:00:00 2001
From: Scott Theisen <scott.the.elm(a)gmail.com>
Date: Wed, 16 Mar 2022 12:42:28 -0400
-Subject: [PATCH 11/43] mythcommflag/CommDetector2.cpp: fix missed
+Subject: [PATCH 11/66] mythcommflag/CommDetector2.cpp: fix missed
MythDate::fortmatTime() uses
hh should be HH; missed chop not replaced.
@@ -900,7 +900,7 @@ index 244e8693602..aef37a8c1cf 100644
From 5432d11672605878a7ab1964996edc7b0103087d Mon Sep 17 00:00:00 2001
From: Scott Theisen <scott.the.elm(a)gmail.com>
Date: Wed, 16 Mar 2022 14:09:35 -0400
-Subject: [PATCH 12/43] MythDate::formatTime(): update doxygen comment
+Subject: [PATCH 12/66] MythDate::formatTime(): update doxygen comment
(cherry picked from commit 259a7fbe911da2ca229a513786172fcefeb8af07)
---
@@ -928,7 +928,7 @@ index 57eaceecd78..65c2b168e63 100644
From f69ce764b78a15989455957eda235d5b1993a08a Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Thu, 24 Mar 2022 17:44:32 -0400
-Subject: [PATCH 13/43] Validate AV stream index before accessing stream.
+Subject: [PATCH 13/66] Validate AV stream index before accessing stream.
Fixes #528.
@@ -956,7 +956,7 @@ index 95a0a8d9489..8af5cc853e8 100644
From dcf7e13cce89f363d20a9cdd3922a7741cc214a9 Mon Sep 17 00:00:00 2001
From: John Hoyt <john.hoyt(a)gmail.com>
Date: Sun, 3 Apr 2022 07:35:20 -0400
-Subject: [PATCH 14/43] Add missing include <array> to mythdate
+Subject: [PATCH 14/66] Add missing include <array> to mythdate
---
mythtv/libs/libmythbase/mythdate.cpp | 1 +
@@ -978,7 +978,7 @@ index 65c2b168e63..e7d2a99188a 100644
From 5b54d3bf89a6278c01169287ace4a0fd02cc2233 Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Tue, 29 Mar 2022 22:26:45 +0200
-Subject: [PATCH 15/43] Add symbolrate to transport list in mythtv-setup log
+Subject: [PATCH 15/66] Add symbolrate to transport list in mythtv-setup log
The symbolrate is added to the transport list
that is logged by mythtv-setup.
@@ -1014,7 +1014,7 @@ index c7bc185f6d7..303c2c28f4e 100644
From 560b425776dfced77ceb9a83b13f32cf00ff2d94 Mon Sep 17 00:00:00 2001
From: Peter Bennett <pbennett(a)mythtv.org>
Date: Thu, 7 Apr 2022 19:51:20 -0400
-Subject: [PATCH 16/43] Service API V2: Last Play Position APIs
+Subject: [PATCH 16/66] Service API V2: Last Play Position APIs
This adds 4 APIs:
V2Dvr::GetLastPlayPos
@@ -1319,7 +1319,7 @@ index 8e339bef1dd..639236a044a 100644
From 1eacadd5f413197746cb61ea036c522c65f95936 Mon Sep 17 00:00:00 2001
From: acediac <git.zon(a)dfgh.net>
Date: Sat, 9 Apr 2022 22:49:25 +1000
-Subject: [PATCH 17/43] mythfrontend audio fixes for macOS
+Subject: [PATCH 17/66] mythfrontend audio fixes for macOS
- Fixed audio device detection
- Fixed Surround Sound channel capability detection (5.1+ speakers)
@@ -1611,7 +1611,7 @@ index ef5cacc2913..7e18a10a62c 100644
From cd109ec6c08f578e1b0965e4726e6046d75af8e8 Mon Sep 17 00:00:00 2001
From: acediac <git.zon(a)dfgh.net>
Date: Sat, 9 Apr 2022 22:57:38 +1000
-Subject: [PATCH 18/43] Potential memory corruption problems in audiooutputbase
+Subject: [PATCH 18/66] Potential memory corruption problems in audiooutputbase
(cherry picked from commit 81aeb49c456ff4ecab82c2297b22c38bd70d706d)
---
@@ -1662,7 +1662,7 @@ index 69c28f2cc3d..d920d14dd0c 100644
From 9070e9e65b42b19b3a54c21117a07f627418999f Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Fri, 8 Apr 2022 13:10:03 -0400
-Subject: [PATCH 19/43] Fix zmserver compilation on rawhide.
+Subject: [PATCH 19/66] Fix zmserver compilation on rawhide.
(cherry picked from commit 9d2c68fdf4512be7aac95310d0bc69d54be63ac3)
---
@@ -1685,7 +1685,7 @@ index 5e13cb48e0b..f6ac052867a 100644
From bbd8355d8dbb5ef78080312c2d632232ea03b504 Mon Sep 17 00:00:00 2001
From: Stuart Auchterlonie <stuarta(a)mythtv.org>
Date: Mon, 11 Apr 2022 22:20:23 +0100
-Subject: [PATCH 20/43] [webapp] fix encoder status when recording
+Subject: [PATCH 20/66] [webapp] fix encoder status when recording
(cherry picked from commit 3da1ca7bc3c72a41cf7a910680cfb8e5ead4b49e)
---
@@ -1759,7 +1759,7 @@ index 554b0193b17..312ccafcf63 100644
From bfae001d5cbb6e6012c3971e605d961e639e1eb7 Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Sun, 3 Apr 2022 18:39:20 +0200
-Subject: [PATCH 21/43] Determine tuner type in ChannelScanSM constructor
+Subject: [PATCH 21/66] Determine tuner type in ChannelScanSM constructor
Initialize the m_scanDTVTunerType with the tuner type as found
in the card already in the ChannelScanSM constructor.
@@ -1796,7 +1796,7 @@ index d7de02b7fd9..12411eb9196 100644
From ec4558f3e1bbc021d771276a288039924f181a8b Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Wed, 20 Apr 2022 21:39:32 +0200
-Subject: [PATCH 22/43] Update preview picture after record playback exit
+Subject: [PATCH 22/66] Update preview picture after record playback exit
When exiting a record playback, the preview thumbnail picture that is shown
at the right/bottom corner of the MythCenter-wide theme, is updated to show
@@ -1876,7 +1876,7 @@ index 653b37c344b..40f5cda7e75 100644
From daa4e7e4474c019714d21674ee7e18f3bc89624d Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Fri, 22 Apr 2022 21:04:59 +0200
-Subject: [PATCH 23/43] Animation update interval lower bound
+Subject: [PATCH 23/66] Animation update interval lower bound
Add a lower bound of 10ms for the animation update interval.
The animation is used in the MythBuntu theme and there it can cause a stall of
@@ -1912,7 +1912,7 @@ index bfdc30710ff..69f9da7e655 100644
From 130f7054da73f8a23d04aacf683d743a449a4ec5 Mon Sep 17 00:00:00 2001
From: David Engel <dengel(a)mythtv.org>
Date: Tue, 26 Apr 2022 16:03:25 -0500
-Subject: [PATCH 24/43] Fix wakeup calculations in HLS.
+Subject: [PATCH 24/66] Fix wakeup calculations in HLS.
The std::chrono changes in commit 41225f80 inadvertently contained
bugs that caused the wakeup times to be too low, often 0 (aka no
@@ -1989,7 +1989,7 @@ index 2294f107a8a..22d1f377b72 100644
From 839d0f9ab6c7ced958bb5372376ab862461ae6d8 Mon Sep 17 00:00:00 2001
From: David Engel <dengel(a)mythtv.org>
Date: Tue, 26 Apr 2022 17:12:08 -0500
-Subject: [PATCH 25/43] Add cast needed by some compilers to last previous
+Subject: [PATCH 25/66] Add cast needed by some compilers to last previous
commit.
(cherry picked from commit e2877111bec395c6baa0468fc41adbb3526e2d69)
@@ -2015,7 +2015,7 @@ index 22d1f377b72..4db927faac7 100644
From ea669e1f825896355ebc3f428553d887b4d5b4c1 Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Wed, 27 Apr 2022 23:42:50 +0200
-Subject: [PATCH 26/43] Jump back in live TV
+Subject: [PATCH 26/66] Jump back in live TV
When jumping back in live TV and the jump time interval is larger than the
current play position then a jump is done to the end of the recording instead
@@ -2045,7 +2045,7 @@ index ebd060fd4d5..b68254f31bd 100644
From d80a8da3f0163e6020ce2b6c76b5b31571fae2df Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Fri, 29 Apr 2022 23:35:08 +0200
-Subject: [PATCH 27/43] Jump forward to next live TV segment
+Subject: [PATCH 27/66] Jump forward to next live TV segment
If playback is at the end of an earlier program in the live TV chain,
skipping forward jumps to the end of the next program
@@ -2077,7 +2077,7 @@ index b68254f31bd..c8c742725c2 100644
From c4fc53c651edbcf695694ee12807b9bc1b4f79ca Mon Sep 17 00:00:00 2001
From: Peter Bennett <pbennett(a)mythtv.org>
Date: Sat, 7 May 2022 17:43:11 -0400
-Subject: [PATCH 28/43] Services V2: Fix content length when length > 2 GB
+Subject: [PATCH 28/66] Services V2: Fix content length when length > 2 GB
Third parameter of std::accumulate determines the return type, so it has
to be explicitly cast to a uint64 to support 64 bit return.
@@ -2106,7 +2106,7 @@ index 5e685632130..c4611197857 100644
From 26079f815a1723021dbe6a13eca0e66018f71e7b Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Fri, 6 May 2022 20:47:05 +0200
-Subject: [PATCH 29/43] Free AVPacket with av_packet_free
+Subject: [PATCH 29/66] Free AVPacket with av_packet_free
Free AVPacket allocated with av_packet_alloc with av_packet_free
instead of with av_packet_unref followed by a delete statement.
@@ -2161,7 +2161,7 @@ index 8af5cc853e8..4e3f9691a1b 100644
From 53c77f01324e5d35dfb08827e16cb0a83b702213 Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Thu, 12 May 2022 23:21:08 +0200
-Subject: [PATCH 30/43] EIT start delay
+Subject: [PATCH 30/66] EIT start delay
Compute the second component of the EIT start delay with the highest
input number instead of with the number of inputs.
@@ -2223,7 +2223,7 @@ index f2d1a6eb8f2..7c37a2ed49a 100644
From b6286af7d82f81082f8d07dfcee3f7f8c9ab2542 Mon Sep 17 00:00:00 2001
From: Roland Ernst <rcrernst(a)gmail.com>
Date: Thu, 12 May 2022 21:06:41 +0200
-Subject: [PATCH 31/43] Python Bindings: Add compatibility to MariaDB 10.6
+Subject: [PATCH 31/66] Python Bindings: Add compatibility to MariaDB 10.6
MariaDB 10.6 introduced a new keyword 'offset' which collides with
the field 'offset' from the recordedseek table.
@@ -2357,7 +2357,7 @@ index d02de716032..d33bb70666b 100644
From 98c82d515d53ef57431d6bbfcd4264543a42426b Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Thu, 26 May 2022 12:30:10 -0400
-Subject: [PATCH 32/43] Fix problem with GetStatus API call while playing
+Subject: [PATCH 32/66] Fix problem with GetStatus API call while playing
video.
This bug was introduced while fixing a problem where all the network
@@ -2436,7 +2436,7 @@ index a4228de4d3a..b5f937f4f01 100644
From ef9d17307fa1237e35234dd96be55c95c42cde88 Mon Sep 17 00:00:00 2001
From: Korbinian Rosenegger <kroseneg(a)schmidham.net>
Date: Fri, 11 Mar 2022 09:57:52 +0100
-Subject: [PATCH 33/43] Show transcoding profiles menu when job is _not_
+Subject: [PATCH 33/66] Show transcoding profiles menu when job is _not_
running
The transcoding profiles menu needs to be shown when the transcoding job
@@ -2465,7 +2465,7 @@ index abed3de46bb..8e9236b28e8 100644
From 8347647e4208e0963270eddd1724182c61f3d15d Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Tue, 31 May 2022 23:58:59 +0200
-Subject: [PATCH 34/43] Change default Unicable frequency to 1210MHz
+Subject: [PATCH 34/66] Change default Unicable frequency to 1210MHz
The previous default value was 1400MHz which is not a valid Unicable userband frequency.
The new default value of 1210MHz is the frequency of the first userband.
@@ -2501,7 +2501,7 @@ index e3f01619d7e..191daf8c83c 100644
From 7077a824d2e746f305bcb215ea687220abaa17db Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Sat, 4 Jun 2022 21:05:22 +0200
-Subject: [PATCH 35/43] Fix AdaptationFieldSize function
+Subject: [PATCH 35/66] Fix AdaptationFieldSize function
Use the data() function to get a pointer to access the fifth element of
a transport stream packet instead of directly accessing the fifth element of a
@@ -2529,7 +2529,7 @@ index 0a971c436ff..a15ff12c346 100644
From 66573a3f9b95bd6b218e363da2eac76738f990c4 Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Wed, 15 Jun 2022 15:54:05 -0400
-Subject: [PATCH 36/43] Fix two logging relay functions to use
+Subject: [PATCH 36/66] Fix two logging relay functions to use
QString::vasprintf.
The code now calls QString::vasprintf, and not QString::asprintf like
@@ -2571,7 +2571,7 @@ index 481a156c667..42aa7ad8330 100644
From a26786f5b4f6890557274ab8435258447db7915c Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Thu, 16 Jun 2022 19:42:15 -0400
-Subject: [PATCH 37/43] Fix the std::vector ring_peek/poke functions to use
+Subject: [PATCH 37/66] Fix the std::vector ring_peek/poke functions to use
pass by reference.
Refs #581
@@ -2643,7 +2643,7 @@ index 4c954604b53..beaf29e2bae 100644
From 3bd5ef574c77b92095c5e2089d21473666f95830 Mon Sep 17 00:00:00 2001
From: David Hampton <mythtv(a)love2code.net>
Date: Mon, 20 Jun 2022 00:46:37 -0400
-Subject: [PATCH 38/43] mpeg2fix needs additional setup for FFmpeg 4.3 release.
+Subject: [PATCH 38/66] mpeg2fix needs additional setup for FFmpeg 4.3 release.
Refs: #581 #588
(cherry picked from commit 8f99b9a78611d34b08c3411cb48e910c5cc37b13)
@@ -2669,7 +2669,7 @@ index 42aa7ad8330..cc13738174c 100644
From 7bb5162be039ba2905efea0acf85b076c9be6769 Mon Sep 17 00:00:00 2001
From: Stuart Auchterlonie <stuarta(a)mythtv.org>
Date: Wed, 22 Jun 2022 08:27:28 +0100
-Subject: [PATCH 39/43] extra include required on freebsd 13.1
+Subject: [PATCH 39/66] extra include required on freebsd 13.1
(cherry picked from commit e60b4b35a19214e541ee3647e0d07007997367c1)
---
@@ -2693,7 +2693,7 @@ index 38e6100bb8c..695425e8134 100644
From 501f85b389d8b626cbe4325fff1c18d84fbe25c9 Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Fri, 24 Jun 2022 22:46:46 +0200
-Subject: [PATCH 40/43] Revert "Trim whitespace from beginning and end of
+Subject: [PATCH 40/66] Revert "Trim whitespace from beginning and end of
lyrics lines."
This reverts commit dee0dabda1c5b2c95b17f2365f8c68e8b66e3734.
@@ -2745,7 +2745,7 @@ index 9e371e6ad40..dccd0407468 100644
From b09ce5de48c1eabc433615011016cee4e50cfce8 Mon Sep 17 00:00:00 2001
From: Timothy D Witham <twitham(a)sbcglobal.net>
Date: Sat, 25 Jun 2022 01:17:14 -0500
-Subject: [PATCH 41/43] Fix #579 LCD time by replacing colon with space.
+Subject: [PATCH 41/66] Fix #579 LCD time by replacing colon with space.
(cherry picked from commit 5c2f8090e3a1051f2459d28060eaf531177d57f8)
---
@@ -2769,7 +2769,7 @@ index 71881f22b10..be249bed9d3 100644
From 811dad0e91b223bcd3e6f17950e81d296d93fc65 Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Thu, 23 Jun 2022 22:13:09 +0200
-Subject: [PATCH 42/43] Discard transport stream packets with invalid
+Subject: [PATCH 42/66] Discard transport stream packets with invalid
adaptation field length
See ISO/IEC 13818-1 : 2000 (E). 2.4.3.5 Semantic definition of fields in adaptation field
@@ -2818,7 +2818,7 @@ index b06ec00d9a2..c1ce2f102be 100644
From 4cf469cbbf02eb9343de4b776d3fee6d19b6af5d Mon Sep 17 00:00:00 2001
From: Klaas de Waal <klaas(a)kldo.nl>
Date: Fri, 24 Jun 2022 21:33:46 +0200
-Subject: [PATCH 43/43] Remove superfluous VERBOSE_LEVEL_CHECK macro in
+Subject: [PATCH 43/66] Remove superfluous VERBOSE_LEVEL_CHECK macro in
adaptation field size check
This check is not needed because LOG is a macro that starts with the VERBOSE_LEVEL_CHECK
@@ -2849,3 +2849,1499 @@ index c1ce2f102be..09b9599d20a 100644
return false;
}
}
+
+From 66ba83839a20e7c9adf0347ab6963dcdf1a58e6e Mon Sep 17 00:00:00 2001
+From: Scott Theisen <scott.the.elm(a)gmail.com>
+Date: Fri, 24 Jun 2022 17:07:00 -0400
+Subject: [PATCH 44/66] MythEDID: fix out of bounds memory access
+
+found by valgrind while investigating segmentation faults that
+occured randomly on startup of mythfrontend.
+
+There are only 4 descriptors in the EDID data structure.
+By incorrectly looping 5 times in MythEDID::ParseBaseBlock(),
+an offset of 126 is passed to ParseDisplayDescriptor() or
+ParseDetailedTimingDescriptor() which will then read past
+the end of the 128 byte EDID data structure.
+
+This appears to have always been wrong since it was added in
+53d170221983764ae108939cbdb0bcbfc48b6114 .
+
+(cherry picked from commit 8e36123478cb98f0134bdc4447beb51d8e708385)
+---
+ mythtv/libs/libmythui/mythedid.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mythtv/libs/libmythui/mythedid.cpp b/mythtv/libs/libmythui/mythedid.cpp
+index 9940c24992b..704fbd09b7f 100644
+--- a/mythtv/libs/libmythui/mythedid.cpp
++++ b/mythtv/libs/libmythui/mythedid.cpp
+@@ -274,7 +274,7 @@ bool MythEDID::ParseBaseBlock(const quint8* Data)
+ qFuzzyCompare(m_gamma + 1.0F, 2.20F + 1.0F);
+
+ // Parse blocks
+- for (uint i = 0; i < 5; ++i)
++ for (uint i = 0; i < 4; ++i)
+ {
+ uint offset = DATA_BLOCK_OFFSET + i * 18;
+ if (Data[offset] == 0 || Data[offset + 1] == 0 || Data[offset + 2] == 0)
+
+From 2514e9eb4d53d4c0690ebc80f9c4b88405835129 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Sun, 26 Jun 2022 20:41:00 +0200
+Subject: [PATCH 45/66] Remove quotes in filelyrics.py argument values
+
+The string quotes around each argument value in the command to start filelyrics.py causes a failure in reading the .lrc file.
+This is a regression; behavior of fixes/31 is correct but fixes/32 and master is broken.
+These quotes have been added as part of commit b50234ef0229f1c08d32149fcb7937b15b75a603.
+
+Refs #590
+
+(cherry picked from commit 2ecdd5d6d6055d1beea55c227d2b92883a775600)
+---
+ mythtv/programs/mythutil/musicmetautils.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mythtv/programs/mythutil/musicmetautils.cpp b/mythtv/programs/mythutil/musicmetautils.cpp
+index cf42f396357..21126b9b60e 100644
+--- a/mythtv/programs/mythutil/musicmetautils.cpp
++++ b/mythtv/programs/mythutil/musicmetautils.cpp
+@@ -545,10 +545,10 @@ static int FindLyrics(const MythUtilCommandLineParser &cmdline)
+
+ QProcess p;
+ QStringList args { grabber.m_filename,
+- QString(R"(--artist="%1")").arg(artist),
+- QString(R"(--album="%1")").arg(album),
+- QString(R"(--title="%1")").arg(title),
+- QString(R"(--filename="%1")").arg(filename) };
++ QString("--artist=%1").arg(artist),
++ QString("--album=%1").arg(album),
++ QString("--title=%1").arg(title),
++ QString("--filename=%1").arg(filename) };
+ p.start(PYTHON_EXE, args);
+ p.waitForFinished(-1);
+ QString result = p.readAllStandardOutput();
+
+From ced41a5f8f5a53c685755cde67fbe16206c9aa55 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Thu, 30 Jun 2022 22:26:16 +0200
+Subject: [PATCH 46/66] Option to exit playback and clear last played position
+
+Add the "Clear last played position and exit" choice to the "Action on playback exit"
+configuration in mythfrontend/Setup/Video/Playback/General Playback.
+Add the "Exit Without Saving" option to the playback exit menu. This menu is shown when in the
+"Action on playback exit" configuration in mythfrontend/Setup/Video/Playback/General Playback
+an option for a prompt on playback exit is selected.
+In fixes/31 the bookmark representing the last_played_position is only updated
+on playback exit when so configured.
+In fixes/32 the last_played_position is continuously updated so there is no easy way to do
+a real "Exit Without Saving" because the last_played_position has been saved already.
+Instead, the "Exit Without Saving" and "Clear last played position and exit" actions
+are implemented by clearing the last played position on playback exit.
+This insures that the next playback starts at the beginning of the recording or
+at the bookmark, when there is a bookmark present.
+This is the same as the behavior of fixes/31 when so configured.
+
+Refs #543
+
+(cherry picked from commit c46e186c3b48c07e87331ece16e0858d2d9d4470)
+---
+ mythtv/libs/libmythtv/tv_play.cpp | 20 ++++++++++++++++++-
+ mythtv/libs/libmythtv/tv_play.h | 3 ++-
+ .../programs/mythfrontend/globalsettings.cpp | 1 +
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
+index 2803837fb23..61a10db4ff6 100644
+--- a/mythtv/libs/libmythtv/tv_play.cpp
++++ b/mythtv/libs/libmythtv/tv_play.cpp
+@@ -2717,13 +2717,19 @@ void TV::PrepToSwitchToRecordedProgram(const ProgramInfo &ProgInfo)
+ void TV::PrepareToExitPlayer(int Line)
+ {
+ m_playerContext.LockDeletePlayer(__FILE__, Line);
+- if (m_savePosOnExit && m_player && m_playerContext.m_playingInfo)
++ if ((m_savePosOnExit || m_clearPosOnExit) && m_player && m_playerContext.m_playingInfo)
+ {
+ // Clear last play position when we're at the end of a recording.
+ // unless the recording is in-progress.
+ bool at_end = !StateIsRecording(m_playerContext.GetState()) &&
+ (GetEndOfRecording() || m_playerContext.m_player->IsNearEnd());
+
++ // Clear last play position on exit when the user requested this
++ if (m_clearPosOnExit)
++ {
++ at_end = true;
++ }
++
+ // Clear/Save play position without notification
+ // The change must be broadcast when file is no longer in use
+ // to update previews, ie. with the MarkNotInUse notification
+@@ -3899,6 +3905,10 @@ bool TV::ActiveHandleAction(const QStringList &Actions,
+ ShowOSDStopWatchingRecording();
+ return handled;
+ }
++ if (2 & m_dbPlaybackExitPrompt)
++ {
++ m_clearPosOnExit = true;
++ }
+ PrepareToExitPlayer(__LINE__);
+ m_requestDelete = false;
+ exit = true;
+@@ -9811,6 +9821,8 @@ void TV::ShowOSDStopWatchingRecording()
+
+ dialog.m_buttons.push_back({tr("Exit %1").arg(videotype), ACTION_STOP});
+
++ dialog.m_buttons.push_back({tr("Exit Without Saving"), "DIALOG_VIDEOEXIT_CLEARLASTPLAYEDPOSITION_0"});
++
+ if (IsDeleteAllowed())
+ dialog.m_buttons.push_back({tr("Delete this recording"), "DIALOG_VIDEOEXIT_CONFIRMDELETE_0"});
+
+@@ -9958,6 +9970,12 @@ bool TV::HandleOSDVideoExit(const QString& Action)
+ {
+ DoTogglePause(true);
+ }
++ else if (Action == "CLEARLASTPLAYEDPOSITION")
++ {
++ m_clearPosOnExit = true;
++ PrepareToExitPlayer(__LINE__);
++ SetExitPlayer(true, true);
++ }
+
+ return hide;
+ }
+diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
+index 6bc0acc587c..015e9f995f3 100644
+--- a/mythtv/libs/libmythtv/tv_play.h
++++ b/mythtv/libs/libmythtv/tv_play.h
+@@ -528,7 +528,7 @@ class MTV_PUBLIC TV : public TVPlaybackState, public MythTVMenuItemDisplayer, pu
+ uint m_vbimode {VBIMode::None};
+ uint m_switchToInputId {0};
+
+- /// True if the user told MythTV to stop plaback. If this is false
++ /// True if the user told MythTV to stop playback. If this is false
+ /// when we exit the player, we display an error screen.
+ mutable bool m_wantsToQuit {true};
+ bool m_stretchAdjustment {false}; ///< True if time stretch is turned on
+@@ -543,6 +543,7 @@ class MTV_PUBLIC TV : public TVPlaybackState, public MythTVMenuItemDisplayer, pu
+ bool m_doSmartForward {false};
+ bool m_queuedTranscode {false};
+ bool m_savePosOnExit {false}; ///< False until first timer event
++ bool m_clearPosOnExit {false}; ///< False unless requested by user on playback exit
+ /// Picture attribute type to modify.
+ PictureAdjustType m_adjustingPicture {kAdjustingPicture_None};
+ /// Picture attribute to modify (on arrow left or right)
+diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
+index e2fcc817adb..e92eee290ed 100644
+--- a/mythtv/programs/mythfrontend/globalsettings.cpp
++++ b/mythtv/programs/mythfrontend/globalsettings.cpp
+@@ -1763,6 +1763,7 @@ static HostComboBoxSetting *PlaybackExitPrompt()
+ gc->setLabel(PlaybackSettings::tr("Action on playback exit"));
+
+ gc->addSelection(PlaybackSettings::tr("Just exit"), "0");
++ gc->addSelection(PlaybackSettings::tr("Clear last played position and exit"), "2");
+ gc->addSelection(PlaybackSettings::tr("Always prompt (excluding Live TV)"),
+ "1");
+ gc->addSelection(PlaybackSettings::tr("Always prompt (including Live TV)"),
+
+From 6b2d23d4de0fe9034c81cbc5893f8febf38594a0 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Sun, 10 Jul 2022 08:18:52 +0200
+Subject: [PATCH 47/66] Revert "Option to exit playback and clear last played
+ position"
+
+This reverts commit ced41a5f8f5a53c685755cde67fbe16206c9aa55.
+
+Reason is reported regression in handling the last played position.
+---
+ mythtv/libs/libmythtv/tv_play.cpp | 20 +------------------
+ mythtv/libs/libmythtv/tv_play.h | 3 +--
+ .../programs/mythfrontend/globalsettings.cpp | 1 -
+ 3 files changed, 2 insertions(+), 22 deletions(-)
+
+diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
+index 61a10db4ff6..2803837fb23 100644
+--- a/mythtv/libs/libmythtv/tv_play.cpp
++++ b/mythtv/libs/libmythtv/tv_play.cpp
+@@ -2717,19 +2717,13 @@ void TV::PrepToSwitchToRecordedProgram(const ProgramInfo &ProgInfo)
+ void TV::PrepareToExitPlayer(int Line)
+ {
+ m_playerContext.LockDeletePlayer(__FILE__, Line);
+- if ((m_savePosOnExit || m_clearPosOnExit) && m_player && m_playerContext.m_playingInfo)
++ if (m_savePosOnExit && m_player && m_playerContext.m_playingInfo)
+ {
+ // Clear last play position when we're at the end of a recording.
+ // unless the recording is in-progress.
+ bool at_end = !StateIsRecording(m_playerContext.GetState()) &&
+ (GetEndOfRecording() || m_playerContext.m_player->IsNearEnd());
+
+- // Clear last play position on exit when the user requested this
+- if (m_clearPosOnExit)
+- {
+- at_end = true;
+- }
+-
+ // Clear/Save play position without notification
+ // The change must be broadcast when file is no longer in use
+ // to update previews, ie. with the MarkNotInUse notification
+@@ -3905,10 +3899,6 @@ bool TV::ActiveHandleAction(const QStringList &Actions,
+ ShowOSDStopWatchingRecording();
+ return handled;
+ }
+- if (2 & m_dbPlaybackExitPrompt)
+- {
+- m_clearPosOnExit = true;
+- }
+ PrepareToExitPlayer(__LINE__);
+ m_requestDelete = false;
+ exit = true;
+@@ -9821,8 +9811,6 @@ void TV::ShowOSDStopWatchingRecording()
+
+ dialog.m_buttons.push_back({tr("Exit %1").arg(videotype), ACTION_STOP});
+
+- dialog.m_buttons.push_back({tr("Exit Without Saving"), "DIALOG_VIDEOEXIT_CLEARLASTPLAYEDPOSITION_0"});
+-
+ if (IsDeleteAllowed())
+ dialog.m_buttons.push_back({tr("Delete this recording"), "DIALOG_VIDEOEXIT_CONFIRMDELETE_0"});
+
+@@ -9970,12 +9958,6 @@ bool TV::HandleOSDVideoExit(const QString& Action)
+ {
+ DoTogglePause(true);
+ }
+- else if (Action == "CLEARLASTPLAYEDPOSITION")
+- {
+- m_clearPosOnExit = true;
+- PrepareToExitPlayer(__LINE__);
+- SetExitPlayer(true, true);
+- }
+
+ return hide;
+ }
+diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
+index 015e9f995f3..6bc0acc587c 100644
+--- a/mythtv/libs/libmythtv/tv_play.h
++++ b/mythtv/libs/libmythtv/tv_play.h
+@@ -528,7 +528,7 @@ class MTV_PUBLIC TV : public TVPlaybackState, public MythTVMenuItemDisplayer, pu
+ uint m_vbimode {VBIMode::None};
+ uint m_switchToInputId {0};
+
+- /// True if the user told MythTV to stop playback. If this is false
++ /// True if the user told MythTV to stop plaback. If this is false
+ /// when we exit the player, we display an error screen.
+ mutable bool m_wantsToQuit {true};
+ bool m_stretchAdjustment {false}; ///< True if time stretch is turned on
+@@ -543,7 +543,6 @@ class MTV_PUBLIC TV : public TVPlaybackState, public MythTVMenuItemDisplayer, pu
+ bool m_doSmartForward {false};
+ bool m_queuedTranscode {false};
+ bool m_savePosOnExit {false}; ///< False until first timer event
+- bool m_clearPosOnExit {false}; ///< False unless requested by user on playback exit
+ /// Picture attribute type to modify.
+ PictureAdjustType m_adjustingPicture {kAdjustingPicture_None};
+ /// Picture attribute to modify (on arrow left or right)
+diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
+index e92eee290ed..e2fcc817adb 100644
+--- a/mythtv/programs/mythfrontend/globalsettings.cpp
++++ b/mythtv/programs/mythfrontend/globalsettings.cpp
+@@ -1763,7 +1763,6 @@ static HostComboBoxSetting *PlaybackExitPrompt()
+ gc->setLabel(PlaybackSettings::tr("Action on playback exit"));
+
+ gc->addSelection(PlaybackSettings::tr("Just exit"), "0");
+- gc->addSelection(PlaybackSettings::tr("Clear last played position and exit"), "2");
+ gc->addSelection(PlaybackSettings::tr("Always prompt (excluding Live TV)"),
+ "1");
+ gc->addSelection(PlaybackSettings::tr("Always prompt (including Live TV)"),
+
+From b0db4141b336648b2b89ec0c488e920f0d0b1f48 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Sun, 10 Jul 2022 21:22:58 +0200
+Subject: [PATCH 48/66] Option to exit playback and clear last played position
+
+Add the "Clear last played position and exit" choice to the "Action on playback exit"
+configuration in mythfrontend/Setup/Video/Playback/General Playback.
+Add the "Exit Without Saving" option to the playback exit menu. This menu is shown when in the
+"Action on playback exit" configuration in mythfrontend/Setup/Video/Playback/General Playback
+an option for a prompt on playback exit is selected.
+In fixes/31 the bookmark representing the last_played_position is only updated
+on playback exit when so configured.
+In fixes/32 the last_played_position is continuously updated so there is no easy way to do
+a real "Exit Without Saving" because the last_played_position has been saved already.
+Instead, the "Exit Without Saving" and "Clear last played position and exit" actions
+are implemented by clearing the last played position on playback exit.
+This insures that the next playback starts at the beginning of the recording or
+at the bookmark, when there is a bookmark present.
+This is the same as the behavior of fixes/31 when so configured.
+
+The difference with the previous version of this feature in commit c46e186c3b48c07e87331ece16e0858d2d9d4470
+is that the code used for choice "Clear last played position and exit" had the same numerical
+value as the choice "Save position and exit" in fixes/31. This caused a change in behavior when upgrading
+from fixes/31 to fixes/32.
+This is now avoided by using a numerical value that has not previously been used in this context.
+
+Refs #543
+
+(cherry picked from commit a03fbcac8789f21c638f58907486e5344ece2975)
+---
+ mythtv/libs/libmythtv/tv_play.cpp | 20 ++++++++++++++++++-
+ mythtv/libs/libmythtv/tv_play.h | 3 ++-
+ .../programs/mythfrontend/globalsettings.cpp | 1 +
+ 3 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
+index 2803837fb23..78aa5c2f9f2 100644
+--- a/mythtv/libs/libmythtv/tv_play.cpp
++++ b/mythtv/libs/libmythtv/tv_play.cpp
+@@ -2717,13 +2717,19 @@ void TV::PrepToSwitchToRecordedProgram(const ProgramInfo &ProgInfo)
+ void TV::PrepareToExitPlayer(int Line)
+ {
+ m_playerContext.LockDeletePlayer(__FILE__, Line);
+- if (m_savePosOnExit && m_player && m_playerContext.m_playingInfo)
++ if ((m_savePosOnExit || m_clearPosOnExit) && m_player && m_playerContext.m_playingInfo)
+ {
+ // Clear last play position when we're at the end of a recording.
+ // unless the recording is in-progress.
+ bool at_end = !StateIsRecording(m_playerContext.GetState()) &&
+ (GetEndOfRecording() || m_playerContext.m_player->IsNearEnd());
+
++ // Clear last play position on exit when the user requested this
++ if (m_clearPosOnExit)
++ {
++ at_end = true;
++ }
++
+ // Clear/Save play position without notification
+ // The change must be broadcast when file is no longer in use
+ // to update previews, ie. with the MarkNotInUse notification
+@@ -3899,6 +3905,10 @@ bool TV::ActiveHandleAction(const QStringList &Actions,
+ ShowOSDStopWatchingRecording();
+ return handled;
+ }
++ if (16 & m_dbPlaybackExitPrompt)
++ {
++ m_clearPosOnExit = true;
++ }
+ PrepareToExitPlayer(__LINE__);
+ m_requestDelete = false;
+ exit = true;
+@@ -9811,6 +9821,8 @@ void TV::ShowOSDStopWatchingRecording()
+
+ dialog.m_buttons.push_back({tr("Exit %1").arg(videotype), ACTION_STOP});
+
++ dialog.m_buttons.push_back({tr("Exit Without Saving"), "DIALOG_VIDEOEXIT_CLEARLASTPLAYEDPOSITION_0"});
++
+ if (IsDeleteAllowed())
+ dialog.m_buttons.push_back({tr("Delete this recording"), "DIALOG_VIDEOEXIT_CONFIRMDELETE_0"});
+
+@@ -9958,6 +9970,12 @@ bool TV::HandleOSDVideoExit(const QString& Action)
+ {
+ DoTogglePause(true);
+ }
++ else if (Action == "CLEARLASTPLAYEDPOSITION")
++ {
++ m_clearPosOnExit = true;
++ PrepareToExitPlayer(__LINE__);
++ SetExitPlayer(true, true);
++ }
+
+ return hide;
+ }
+diff --git a/mythtv/libs/libmythtv/tv_play.h b/mythtv/libs/libmythtv/tv_play.h
+index 6bc0acc587c..015e9f995f3 100644
+--- a/mythtv/libs/libmythtv/tv_play.h
++++ b/mythtv/libs/libmythtv/tv_play.h
+@@ -528,7 +528,7 @@ class MTV_PUBLIC TV : public TVPlaybackState, public MythTVMenuItemDisplayer, pu
+ uint m_vbimode {VBIMode::None};
+ uint m_switchToInputId {0};
+
+- /// True if the user told MythTV to stop plaback. If this is false
++ /// True if the user told MythTV to stop playback. If this is false
+ /// when we exit the player, we display an error screen.
+ mutable bool m_wantsToQuit {true};
+ bool m_stretchAdjustment {false}; ///< True if time stretch is turned on
+@@ -543,6 +543,7 @@ class MTV_PUBLIC TV : public TVPlaybackState, public MythTVMenuItemDisplayer, pu
+ bool m_doSmartForward {false};
+ bool m_queuedTranscode {false};
+ bool m_savePosOnExit {false}; ///< False until first timer event
++ bool m_clearPosOnExit {false}; ///< False unless requested by user on playback exit
+ /// Picture attribute type to modify.
+ PictureAdjustType m_adjustingPicture {kAdjustingPicture_None};
+ /// Picture attribute to modify (on arrow left or right)
+diff --git a/mythtv/programs/mythfrontend/globalsettings.cpp b/mythtv/programs/mythfrontend/globalsettings.cpp
+index e2fcc817adb..67bd6dd460d 100644
+--- a/mythtv/programs/mythfrontend/globalsettings.cpp
++++ b/mythtv/programs/mythfrontend/globalsettings.cpp
+@@ -1763,6 +1763,7 @@ static HostComboBoxSetting *PlaybackExitPrompt()
+ gc->setLabel(PlaybackSettings::tr("Action on playback exit"));
+
+ gc->addSelection(PlaybackSettings::tr("Just exit"), "0");
++ gc->addSelection(PlaybackSettings::tr("Clear last played position and exit"), "16");
+ gc->addSelection(PlaybackSettings::tr("Always prompt (excluding Live TV)"),
+ "1");
+ gc->addSelection(PlaybackSettings::tr("Always prompt (including Live TV)"),
+
+From b615b139d85a4024307cdaf7ff2ff7b01e5cd513 Mon Sep 17 00:00:00 2001
+From: Bill Meek <billmeek(a)mythtv.org>
+Date: Sun, 12 Jun 2022 18:42:16 -0500
+Subject: [PATCH 49/66] UserJobs/Events: quotes in %MATCH% type variables can
+ cause lost text
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+All %MATCH% type variable contents used by a job/event are expanded
+into a QStringList.
+
+Quotes in %TITLE%, %SUBTITLE% and/or %DESCRIPTION% can cause their
+text to be truncated. And, if the user's script has following %MATCH%
+variables, lost text can end up in them.
+
+This commit replaces the " QUOTATION MARK (U+0022) with
+ ʺ MODIFIER LETTER DOUBLE PRIME (U+02BA)
+
+Just to compare the two: "ʺ"ʺ"ʺ"ʺ"ʺ.
+
+Forum URL: https://forum.mythtv.org/viewtopic.php?f=36&t=4883
+
+(cherry picked from commit dd68df4676224979a625c379c60985e272af3b1a)
+---
+ mythtv/libs/libmyth/programinfo.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
+index 7f6fe7c421f..02079a7d691 100644
+--- a/mythtv/libs/libmyth/programinfo.cpp
++++ b/mythtv/libs/libmyth/programinfo.cpp
+@@ -5405,13 +5405,13 @@ void ProgramInfo::SubstituteMatches(QString &str)
+ }
+
+ str.replace(QString("%FILE%"), GetBasename());
+- str.replace(QString("%TITLE%"), m_title);
+- str.replace(QString("%SUBTITLE%"), m_subtitle);
++ str.replace(QString("%TITLE%"), m_title.replace("\"", "ʺ"));
++ str.replace(QString("%SUBTITLE%"), m_subtitle.replace("\"", "ʺ"));
+ str.replace(QString("%SEASON%"), QString::number(m_season));
+ str.replace(QString("%EPISODE%"), QString::number(m_episode));
+ str.replace(QString("%TOTALEPISODES%"), QString::number(m_totalEpisodes));
+ str.replace(QString("%SYNDICATEDEPISODE%"), m_syndicatedEpisode);
+- str.replace(QString("%DESCRIPTION%"), m_description);
++ str.replace(QString("%DESCRIPTION%"), m_description.replace("\"", "ʺ"));
+ str.replace(QString("%HOSTNAME%"), m_hostname);
+ str.replace(QString("%CATEGORY%"), m_category);
+ str.replace(QString("%RECGROUP%"), m_recGroup);
+
+From 365406638a4a9239e114e5ad3353d9411545a3d5 Mon Sep 17 00:00:00 2001
+From: Bill Meek <billmeek(a)mythtv.org>
+Date: Sat, 16 Jul 2022 14:41:20 -0500
+Subject: [PATCH 50/66] programinfo.cpp: adds comment about quotes in %MATCH%
+ variables
+
+(cherry picked from commit a31c085783948070a3840c5190370599043fd629)
+---
+ mythtv/libs/libmyth/programinfo.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
+index 02079a7d691..4e3f5fd36a8 100644
+--- a/mythtv/libs/libmyth/programinfo.cpp
++++ b/mythtv/libs/libmyth/programinfo.cpp
+@@ -5404,6 +5404,10 @@ void ProgramInfo::SubstituteMatches(QString &str)
+ str.replace(QString("%DIR%"), dirInfo.path());
+ }
+
++ // N.B. Contents of %MATCH% string variables get parsed into a single
++ // QStringLists. Quotes in strings will cause lost/truncated output.
++ // Replace QUOTATION MARK (U+0022)j with MODIFIER LETTER DOUBLE PRIME (U+02BA).
++
+ str.replace(QString("%FILE%"), GetBasename());
+ str.replace(QString("%TITLE%"), m_title.replace("\"", "ʺ"));
+ str.replace(QString("%SUBTITLE%"), m_subtitle.replace("\"", "ʺ"));
+
+From e72127d5d90151d338decbe1cc044c38cca5e203 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Fri, 22 Jul 2022 22:11:07 +0200
+Subject: [PATCH 51/66] SatIP SETUP status handling
+
+After SETUP, update status only after SETUP successful.
+This should enable a retry when the SETUP is not succesful.
+
+(cherry picked from commit 5d0147cb58e3a167dea3e55d753a24ad056360dc)
+---
+ .../libs/libmythtv/recorders/satipstreamhandler.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/mythtv/libs/libmythtv/recorders/satipstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/satipstreamhandler.cpp
+index 17e607a3329..5e76a8f42c7 100644
+--- a/mythtv/libs/libmythtv/recorders/satipstreamhandler.cpp
++++ b/mythtv/libs/libmythtv/recorders/satipstreamhandler.cpp
+@@ -171,9 +171,11 @@ void SatIPStreamHandler::run(void)
+ m_setupinvoked = false;
+ }
+
+- m_rtsp->Setup(m_tuningurl);
+- m_setupinvoked = true;
+- m_oldtuningurl = m_tuningurl;
++ if (m_rtsp->Setup(m_tuningurl))
++ {
++ m_oldtuningurl = m_tuningurl;
++ m_setupinvoked = true;
++ }
+
+ last_update.restart();
+ }
+@@ -287,6 +289,9 @@ bool SatIPStreamHandler::Tune(const DTVMultiplex &tuning)
+ if (rval)
+ {
+ rval = m_rtsp->Setup(m_tuningurl);
++ }
++ if (rval)
++ {
+ m_oldtuningurl = m_tuningurl;
+ m_setupinvoked = true;
+ }
+
+From d761e9f0565a7702daa7be15b84ab899e7af7156 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Tue, 26 Jul 2022 12:42:20 +0200
+Subject: [PATCH 52/66] Size of recording start time field in MythCenter-wide
+
+Increase the width of the field showing the recording
+start time in theme MythCenter-wide from 94 to 104.
+This makes the field wide enough to show time values
+in the AM/PM time presentation mode.
+
+Refs #578
+
+(cherry picked from commit 50c58fb05b20ba99460a2346c3ae5a479bb9ae0f)
+---
+ mythtv/themes/MythCenter-wide/recordings-ui.xml | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/mythtv/themes/MythCenter-wide/recordings-ui.xml b/mythtv/themes/MythCenter-wide/recordings-ui.xml
+index 61ebab7e298..2a8ca1ab096 100644
+--- a/mythtv/themes/MythCenter-wide/recordings-ui.xml
++++ b/mythtv/themes/MythCenter-wide/recordings-ui.xml
+@@ -250,20 +250,20 @@
+ <state name="marked"></state>
+ </statetype>
+ <textarea name="titlesubtitle" from="buttontext">
+- <area>32,2,618,28</area>
++ <area>32,2,608,28</area>
+ <align>vcenter</align>
+ </textarea>
+ <textarea name="watchedpercent" from="buttontext">
+- <area>650,2,60,28</area>
++ <area>640,2,60,28</area>
+ <align>right,vcenter</align>
+ <template>%|watchedpercent|%%</template>
+ </textarea>
+ <textarea name="shortstartdate" from="buttontext">
+- <area>710,2,70,28</area>
++ <area>700,2,70,28</area>
+ <align>right,vcenter</align>
+ </textarea>
+ <textarea name="starttime" from="buttontext">
+- <area>780,2,94,28</area>
++ <area>770,2,104,28</area>
+ <align>right,vcenter</align>
+ </textarea>
+ <statetype name="watched">
+@@ -305,19 +305,19 @@
+ <align>vcenter</align>
+ </textarea>
+ <textarea name="titlesubtitle" from="fonts">
+- <area>32,2,618,28</area>
++ <area>32,2,608,28</area>
+ </textarea>
+ <textarea name="watchedpercent" from="fonts">
+- <area>650,2,60,28</area>
++ <area>640,2,60,28</area>
+ <align>right,vcenter</align>
+ <template>%|watchedpercent|%%</template>
+ </textarea>
+ <textarea name="shortstartdate" from="fonts">
+- <area>710,2,70,28</area>
++ <area>700,2,70,28</area>
+ <align>right,vcenter</align>
+ </textarea>
+ <textarea name="starttime" from="fonts">
+- <area>780,2,94,28</area>
++ <area>770,2,104,28</area>
+ <align>right,vcenter</align>
+ </textarea>
+ </state>
+
+From 8550188f02d0c10402444f5e2e55d21352f3f38d Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Sat, 23 Jul 2022 13:48:00 +0200
+Subject: [PATCH 53/66] Add tuning data for Eutelsat 7 satellite
+
+This is the tuning data for one transponder on Eutelsat 7 from which
+all other transponders can be found with a "Full Scan (Tuned)".
+
+(cherry picked from commit 88c7d97dc94cf761cf20481da4770e1db5ee16e2)
+---
+ .../libs/libmythtv/channelscan/channelscanmiscsettings.h | 9 +++++----
+ mythtv/libs/libmythtv/channelscan/channelscanner.cpp | 2 --
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h b/mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h
+index cf66557d4f9..773e4fa6ac9 100644
+--- a/mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h
++++ b/mythtv/libs/libmythtv/channelscan/channelscanmiscsettings.h
+@@ -231,10 +231,11 @@ class ScanTransponder: public TransMythUIComboBoxSetting
+ addSelection("(Select Satellite)", "Select", true);
+
+ // Satellite tuning data
+- m_tdm["Hotbird"] = { "Hotbird", "Hotbird 13.0E", "12015000", "h", "27500000", "8PSK", "DVB-S2", "3/4" };
+- m_tdm["Astra-1"] = { "Astra-1", "Astra-1 19.2E", "11229000", "v", "22000000", "8PSK", "DVB-S2", "2/3" };
+- m_tdm["Astra-3"] = { "Astra-3", "Astra-3 23.5E", "12031500", "h", "27500000", "QPSK", "DVB-S2", "auto"};
+- m_tdm["Astra-2"] = { "Astra-2", "Astra-2 28.2E", "10714000", "h", "22000000", "QPSK", "DVB-S", "5/6" };
++ m_tdm["1 E7"] = { "1 E7", "Eutelsat 7.0E", "10804000", "v", "30000000", "QPSK", "DVB-S2", "5/6" };
++ m_tdm["2 HB"] = { "2 HB", "Hotbird 13.0E", "12015000", "h", "27500000", "8PSK", "DVB-S2", "3/4" };
++ m_tdm["3 A1"] = { "3 A1", "Astra-1 19.2E", "11229000", "v", "22000000", "8PSK", "DVB-S2", "2/3" };
++ m_tdm["4 A3"] = { "4 A3", "Astra-3 23.5E", "12031500", "h", "27500000", "QPSK", "DVB-S2", "auto"};
++ m_tdm["5 A2"] = { "5 A2", "Astra-2 28.2E", "10714000", "h", "22000000", "QPSK", "DVB-S", "5/6" };
+
+ for (auto &td: m_tdm)
+ {
+diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
+index 94e97078024..46bf7d77cc7 100644
+--- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
++++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
+@@ -106,8 +106,6 @@ void ChannelScanner::Teardown(void)
+ }
+ }
+
+-// full scan of existing transports broken
+-// existing transport scan broken
+ void ChannelScanner::Scan(
+ int scantype,
+ uint cardid,
+
+From f458821fa0f7fd70bbba22469234d882b0ee7fe9 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Sun, 24 Jul 2022 17:43:25 +0200
+Subject: [PATCH 54/66] EIT fixup for Eutelsat 7.0E satellite
+
+Needed for the guide data in the Turkish language.
+
+(cherry picked from commit 109b9348c4ee077e0bece8bd3db01eaa51628ab1)
+---
+ mythtv/libs/libmythtv/eithelper.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mythtv/libs/libmythtv/eithelper.cpp b/mythtv/libs/libmythtv/eithelper.cpp
+index 98c0572380b..901bb991236 100644
+--- a/mythtv/libs/libmythtv/eithelper.cpp
++++ b/mythtv/libs/libmythtv/eithelper.cpp
+@@ -1398,6 +1398,9 @@ static void init_fixup(FixupMap &fix)
+ fix[ 57LL << 32 | 1LL << 16 ] = EITFixUp::kEFixForceISO8859_1;
+ fix[ 58LL << 32 | 1LL << 16 ] = EITFixUp::kEFixForceISO8859_1;
+ fix[ 59LL << 32 | 1LL << 16 ] = EITFixUp::kEFixForceISO8859_1;
++
++ // Eutelsat Satellite System at 7°E
++ fix[ 126U << 16 ] = EITFixUp::kEFixForceISO8859_9;
+ }
+
+ /** \fn EITHelper::RescheduleRecordings(void)
+
+From 6e1706ee66c94dff097c2e3b91ff1d312d8992f5 Mon Sep 17 00:00:00 2001
+From: Scott Theisen <scott.the.elm(a)gmail.com>
+Date: Wed, 27 Jul 2022 14:06:10 -0400
+Subject: [PATCH 55/66] GitHub Actions: add Ubuntu 22.04 builder
+
+---
+ .github/workflows/buildfixes32.yml | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/.github/workflows/buildfixes32.yml b/.github/workflows/buildfixes32.yml
+index b9a557f9384..b1fe6f6d7e1 100644
+--- a/.github/workflows/buildfixes32.yml
++++ b/.github/workflows/buildfixes32.yml
+@@ -11,7 +11,7 @@ jobs:
+ name: build
+ strategy:
+ matrix:
+- os: ['ubuntu-18.04', 'ubuntu-20.04', 'macos-10.15', 'macos-11']
++ os: ['ubuntu-18.04', 'ubuntu-20.04', 'ubuntu-22.04', 'macos-10.15', 'macos-11']
+ cc: ['gcc', 'clang']
+ include:
+ - cc: 'gcc'
+@@ -79,10 +79,18 @@ jobs:
+ if: runner.os == 'Linux'
+
+ - name: Install plugin dependencies (linux)
+- run: sudo apt install libvorbis-dev libflac++-dev libminizip-dev libcdio-dev libcdio-paranoia-dev python3-oauth python3-pycurl
++ run: sudo apt install libvorbis-dev libflac++-dev libminizip-dev libcdio-dev libcdio-paranoia-dev python3-pycurl
+ libxml-xpath-perl libdate-manip-perl libdatetime-format-iso8601-perl libsoap-lite-perl libjson-perl libimage-size-perl
+ if: runner.os == 'Linux'
+
++ - name: Install plugin dependencies (ubuntu-18.04 and ubuntu-20.04)
++ run: sudo apt install python3-oauth
++ if: matrix.os == 'ubuntu-18.04' || matrix.os == 'ubuntu-20.04'
++
++ - name: Install plugin dependencies (ubuntu-22.04)
++ run: sudo apt install python3-oauthlib
++ if: matrix.os == 'ubuntu-22.04'
++
+ - name: Install plugin dependencies (macOS)
+ run: brew install minizip flac libvorbis libcdio
+ if: runner.os == 'macOS'
+
+From c9e66de14b1770ad09bdf1df39e65bf6a6c0f54a Mon Sep 17 00:00:00 2001
+From: Scott Theisen <scott.the.elm(a)gmail.com>
+Date: Wed, 27 Jul 2022 14:07:10 -0400
+Subject: [PATCH 56/66] GitHub Actions: update macOS versions
+
+The macOS-10.15 environment is deprecated and will be removed on August 30th, 2022.
+---
+ .github/workflows/buildfixes32.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/.github/workflows/buildfixes32.yml b/.github/workflows/buildfixes32.yml
+index b1fe6f6d7e1..22e312121ec 100644
+--- a/.github/workflows/buildfixes32.yml
++++ b/.github/workflows/buildfixes32.yml
+@@ -11,7 +11,7 @@ jobs:
+ name: build
+ strategy:
+ matrix:
+- os: ['ubuntu-18.04', 'ubuntu-20.04', 'ubuntu-22.04', 'macos-10.15', 'macos-11']
++ os: ['ubuntu-18.04', 'ubuntu-20.04', 'ubuntu-22.04', 'macos-11', 'macos-12']
+ cc: ['gcc', 'clang']
+ include:
+ - cc: 'gcc'
+
+From c11ed8650141bff134e8537eb984ce57e46fad79 Mon Sep 17 00:00:00 2001
+From: David Hampton <mythtv(a)love2code.net>
+Date: Fri, 29 Jul 2022 16:55:38 -0400
+Subject: [PATCH 57/66] Fix MythCenter-wide format to not duplicate year in
+ recordings page.
+
+Remove the 'startyear' field which apparently only contains a value in
+years before the current year? The display looks fine without it for
+both current and prior year recordings.
+
+Fixes #582.
+
+(cherry picked from commit 967910821b95d9b45678af3ca8be1128f3c189a0)
+---
+ mythtv/themes/MythCenter-wide/recordings-ui.xml | 2 +-
+ mythtv/themes/MythCenter-wide/themeinfo.xml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mythtv/themes/MythCenter-wide/recordings-ui.xml b/mythtv/themes/MythCenter-wide/recordings-ui.xml
+index 2a8ca1ab096..a4dd5bcb018 100644
+--- a/mythtv/themes/MythCenter-wide/recordings-ui.xml
++++ b/mythtv/themes/MythCenter-wide/recordings-ui.xml
+@@ -444,7 +444,7 @@
+ <textarea name="timedate" from="basetextarea">
+ <area>295,444,415,30</area>
+ <align>hcenter</align>
+- <template>%startdate%%| startyear%, %starttime% </template>
++ <template>%startdate%, %starttime% </template>
+ </textarea>
+
+ <textarea name="filesize_str" from="basetextarea">
+diff --git a/mythtv/themes/MythCenter-wide/themeinfo.xml b/mythtv/themes/MythCenter-wide/themeinfo.xml
+index dd7442bb9c0..00d68afce33 100644
+--- a/mythtv/themes/MythCenter-wide/themeinfo.xml
++++ b/mythtv/themes/MythCenter-wide/themeinfo.xml
+@@ -34,7 +34,7 @@
+ <major>1</major>
+
+ <!-- Minor version changes are backwards compatible -->
+- <minor>9</minor>
++ <minor>10</minor>
+ </version>
+
+ <!-- Theme Details (Required) -->
+
+From cf553e438c0c2cf09a47aa9d40810f61e4ba1db5 Mon Sep 17 00:00:00 2001
+From: Bill Meek <bmeek(a)mythtv.org>
+Date: Wed, 27 Jul 2022 08:15:14 -0500
+Subject: [PATCH 58/66] Housekeeper: allows initial INSERTs to the housekeeping
+ table
+
+Fresh DBs have no entries in housekeeping. INSERTs weren't
+being made because the test that decided to do it always
+failed and caused an UPDATE. That did nothing because a
+matching tag wasn't found.
+
+Now, always do an UPDATE and if the no rows were affected,
+then do an INSERT.
+---
+ mythtv/libs/libmythbase/housekeeper.cpp | 97 +++++++++++++------------
+ 1 file changed, 50 insertions(+), 47 deletions(-)
+
+diff --git a/mythtv/libs/libmythbase/housekeeper.cpp b/mythtv/libs/libmythbase/housekeeper.cpp
+index 637875f7e97..7eda555f04b 100644
+--- a/mythtv/libs/libmythbase/housekeeper.cpp
++++ b/mythtv/libs/libmythbase/housekeeper.cpp
+@@ -107,7 +107,6 @@ HouseKeeperTask::HouseKeeperTask(const QString &dbTag, HouseKeeperScope scope,
+
+ bool HouseKeeperTask::CheckRun(const QDateTime& now)
+ {
+- LOG(VB_GENERAL, LOG_DEBUG, QString("Checking to run %1").arg(GetTag()));
+ bool check = false;
+ if (!m_confirm && !m_running && (check = DoCheckRun(now)))
+ {
+@@ -115,6 +114,8 @@ bool HouseKeeperTask::CheckRun(const QDateTime& now)
+ // and should not be queued a second time
+ m_confirm = true;
+ }
++ LOG(VB_GENERAL, LOG_DEBUG, QString("%1 Running? %2/In window? %3.")
++ .arg(GetTag()).arg(m_running ? "Yes" : "No").arg(check ? "Yes" : "No"));
+ return check;
+ }
+
+@@ -227,52 +228,19 @@ QDateTime HouseKeeperTask::UpdateLastRun(const QDateTime& last, bool successful)
+ if (!query.isConnected())
+ return last;
+
+- if (m_lastRun == MythDate::fromSecsSinceEpoch(0))
+- {
+- // not previously set, perform insert
+-
+- if (m_scope == kHKGlobal)
+- {
+- query.prepare("INSERT INTO housekeeping"
+- " (tag, lastrun, lastsuccess)"
+- " VALUES (:TAG, :TIME, :STIME)");
+- }
+- else
+- {
+- query.prepare("INSERT INTO housekeeping"
+- " (tag, hostname, lastrun, lastsuccess)"
+- " VALUES (:TAG, :HOST, :TIME, :STIME)");
+- }
+- }
+- else
+- {
+- // previously set, perform update
+-
+- if (m_scope == kHKGlobal)
+- {
+- query.prepare("UPDATE housekeeping SET lastrun=:TIME,"
+- " lastsuccess=:STIME"
+- " WHERE tag = :TAG"
+- " AND hostname IS NULL");
+- }
+- else
+- {
+- query.prepare("UPDATE housekeeping SET lastrun=:TIME,"
+- " lastsuccess=:STIME"
+- " WHERE tag = :TAG"
+- " AND hostname = :HOST");
+- }
+- }
+-
+ if (m_scope == kHKGlobal)
+ {
+- LOG(VB_GENERAL, LOG_DEBUG,
+- QString("Updating global run time for %1").arg(m_dbTag));
++ query.prepare("UPDATE `housekeeping` SET `lastrun`=:TIME,"
++ " `lastsuccess`=:STIME"
++ " WHERE `tag` = :TAG"
++ " AND `hostname` IS NULL");
+ }
+ else
+ {
+- LOG(VB_GENERAL, LOG_DEBUG,
+- QString("Updating local run time for %1").arg(m_dbTag));
++ query.prepare("UPDATE `housekeeping` SET `lastrun`=:TIME,"
++ " `lastsuccess`=:STIME"
++ " WHERE `tag` = :TAG"
++ " AND `hostname` = :HOST");
+ }
+
+ if (m_scope == kHKLocal)
+@@ -282,7 +250,42 @@ QDateTime HouseKeeperTask::UpdateLastRun(const QDateTime& last, bool successful)
+ query.bindValue(":STIME", MythDate::as_utc(m_lastSuccess));
+
+ if (!query.exec())
+- MythDB::DBError("HouseKeeperTask::updateLastRun", query);
++ MythDB::DBError("HouseKeeperTask::updateLastRun, UPDATE", query);
++
++ if (VERBOSE_LEVEL_CHECK(VB_GENERAL, LOG_DEBUG) &&
++ query.numRowsAffected() > 0)
++ {
++ LOG(VB_GENERAL, LOG_DEBUG, QString("%1: UPDATEd %2 run time.")
++ .arg(m_dbTag).arg(m_scope == kHKGlobal ? "global" : "local"));
++ }
++
++ if (query.numRowsAffected() == 0)
++ {
++ if (m_scope == kHKGlobal)
++ {
++ query.prepare("INSERT INTO `housekeeping`"
++ " (`tag`, `lastrun`, `lastsuccess`)"
++ " VALUES (:TAG, :TIME, :STIME)");
++ }
++ else
++ {
++ query.prepare("INSERT INTO `housekeeping`"
++ " (`tag`, `hostname`, `lastrun`, `lastsuccess`)"
++ " VALUES (:TAG, :HOST, :TIME, :STIME)");
++ }
++
++ if (m_scope == kHKLocal)
++ query.bindValue(":HOST", gCoreContext->GetHostName());
++ query.bindValue(":TAG", m_dbTag);
++ query.bindValue(":TIME", MythDate::as_utc(m_lastRun));
++ query.bindValue(":STIME", MythDate::as_utc(m_lastSuccess));
++
++ if (!query.exec())
++ MythDB::DBError("HouseKeeperTask::updateLastRun INSERT", query);
++
++ LOG(VB_GENERAL, LOG_DEBUG, QString("%1: INSERTed %2 run time.")
++ .arg(m_dbTag).arg(m_scope == kHKGlobal ? "global" : "local"));
++ }
+ }
+
+ QString msg;
+@@ -676,10 +679,10 @@ void HouseKeeper::Start(void)
+ return;
+
+ MSqlQuery query(MSqlQuery::InitCon());
+- query.prepare("SELECT tag,lastrun"
+- " FROM housekeeping"
+- " WHERE hostname = :HOST"
+- " OR hostname IS NULL");
++ query.prepare("SELECT `tag`,`lastrun`"
++ " FROM `housekeeping`"
++ " WHERE `hostname` = :HOST"
++ " OR `hostname` IS NULL");
+ query.bindValue(":HOST", gCoreContext->GetHostName());
+
+ if (!query.exec())
+
+From e5c974e40248d335be477a02fa5742582690e2d9 Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Sat, 13 Aug 2022 18:37:55 +0200
+Subject: [PATCH 59/66] Revert "Potential memory corruption problems in
+ audiooutputbase"
+
+This reverts commit 81aeb49c456ff4ecab82c2297b22c38bd70d706d.
+
+Rationale:
+This commit creates problems with recognition of 5.1 audio devices, see the thread
+in mythtv-users "Digital audio Capability grayed out" from James Abernathy.
+
+The problem is that the field "Digital Audio Capabilities" is always disabled
+(shown as grey and not accessible) independent of the selected audio device.
+Correct behavior is that when a digital output such as HDMI is selected that
+it is then possible to select the capabilities of that digital output.
+This is not possible when the field is disabled.
+
+I see the following two changes in this commit:
+Around line 198 the "bugfix: don't allocate".
+The original code creates a copy of the complete struct pointed to by m_outputSettingsDigitalRaw; then
+the Users are added and that is then saved in m_outputSettingsDigital.
+This means the m_outputSettingsDigitalRaw and m_outputSettingsDigital are always different addresses.
+
+The "bugfix: don't allocate" code changes this by copying the pointer value from m_outputSettingsDigitalRaw, then
+the Users are added and then it is saved in m_outputSettingsDigital.
+
+This does change two things:
+- The m_outputSettingsDigitalRaw and m_outputSettingsDigital now point to the same struct, so the pointer values are the same.
+- The m_outputSettingsDigitalRaw has been modified by adding the users, so it is not the Raw data anymore.
+Note that if the idea is that m_outputSettingsDigital and m_outputSettingsDigitalRaw point to the same data then one pointer would be enough.
+My conclusion is that this must be the change that causes the device recognition problems.
+
+The "bugfix: don't allocate" code then causes problems in the destructor where now m_outputSettingsDigitalRaw
+and m_outputSettingsDigital point to the same object and have the same value.
+To protect against twice deleting the same memory the code starting at line 93
+"// These all seem to be the same pointer, avoid freeing multiple times"
+has been added.
+
+To summarize my analysis:
+- The "bugfix: don't allocate" code does create the problem in device recognition by copying a pointer instead of copying a struct.
+- The fix in the destructor is only needed as a consequence of this.
+
+Reverting the commit and then checking the behavior of the code with valgrind does not show memory corruption problems.
+
+(cherry picked from commit c370f513cce8f4bb01d7bada7a10e2dcfeae3e24)
+---
+ mythtv/libs/libmyth/audio/audiooutputbase.cpp | 19 +++++++------------
+ 1 file changed, 7 insertions(+), 12 deletions(-)
+
+diff --git a/mythtv/libs/libmyth/audio/audiooutputbase.cpp b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+index d920d14dd0c..69c28f2cc3d 100644
+--- a/mythtv/libs/libmyth/audio/audiooutputbase.cpp
++++ b/mythtv/libs/libmyth/audio/audiooutputbase.cpp
+@@ -90,18 +90,13 @@ AudioOutputBase::~AudioOutputBase()
+ "~AudioOutputBase called, but KillAudio has not been called!");
+
+ // We got this from a subclass, delete it
+- // These all seem to be the same pointer, avoid freeing multiple times
+- VBAUDIO(QString("m_outputSettings != m_outputSettingsDigital : %1").arg(m_outputSettings != m_outputSettingsDigital));
+- if (m_outputSettingsDigital != m_outputSettings)
++ delete m_outputSettings;
++ delete m_outputSettingsRaw;
++ if (m_outputSettings != m_outputSettingsDigital)
+ {
+- if (m_outputSettingsDigitalRaw != m_outputSettingsDigital && m_outputSettingsDigitalRaw != m_outputSettings)
+- delete m_outputSettingsDigitalRaw;
+ delete m_outputSettingsDigital;
++ delete m_outputSettingsDigitalRaw;
+ }
+- VBAUDIO(QString("m_outputSettingsRaw != m_outputSettings %1").arg(m_outputSettingsRaw != m_outputSettings));
+- if (m_outputSettingsRaw != m_outputSettings)
+- delete m_outputSettingsRaw;
+- delete m_outputSettings;
+
+ if (m_kAudioSRCOutputSize > 0)
+ delete[] m_srcOut;
+@@ -195,9 +190,9 @@ AudioOutputSettings* AudioOutputBase::GetOutputSettingsUsers(bool digital)
+ else if (m_outputSettingsDigital)
+ return m_outputSettingsDigital;
+
+- //bugfix: don't allocate as GetOutputSettings will do it
+- //auto* aosettings = new AudioOutputSettings;
+- AudioOutputSettings* aosettings = GetOutputSettingsCleaned(digital);
++ auto* aosettings = new AudioOutputSettings;
++
++ *aosettings = *GetOutputSettingsCleaned(digital);
+ aosettings->GetUsers();
+
+ if (digital)
+
+From 6c0b5cc5c37507b9fb454a137092be5b61b4f137 Mon Sep 17 00:00:00 2001
+From: ulmus-scott <scott.the.elm(a)gmail.com>
+Date: Sat, 8 Jan 2022 19:06:02 -0500
+Subject: [PATCH 60/66] libmythfreemheg: replace nonstandard <malloc.h> with
+ <cstdlib>
+
+(cherry picked from commit 30f8922d548cbedeac8f72692f0f0b22003af48f)
+---
+ mythtv/libs/libmythfreemheg/BaseClasses.h | 5 ++---
+ mythtv/libs/libmythfreemheg/ParseBinary.cpp | 1 +
+ mythtv/libs/libmythfreemheg/ParseText.cpp | 3 +++
+ mythtv/libs/libmythfreemheg/ParseText.h | 2 ++
+ 4 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/mythtv/libs/libmythfreemheg/BaseClasses.h b/mythtv/libs/libmythfreemheg/BaseClasses.h
+index 587e3fbd37a..27ef64e6173 100644
+--- a/mythtv/libs/libmythfreemheg/BaseClasses.h
++++ b/mythtv/libs/libmythfreemheg/BaseClasses.h
+@@ -23,9 +23,8 @@
+ #define BASECLASSES_H
+
+ #include "config.h"
+-#if HAVE_MALLOC_H
+-#include <malloc.h>
+-#endif
++
++#include <cstdlib> // malloc etc.
+
+ #include <array>
+ #include <QString>
+diff --git a/mythtv/libs/libmythfreemheg/ParseBinary.cpp b/mythtv/libs/libmythfreemheg/ParseBinary.cpp
+index 83c50e84e3d..98c1ef36aca 100644
+--- a/mythtv/libs/libmythfreemheg/ParseBinary.cpp
++++ b/mythtv/libs/libmythfreemheg/ParseBinary.cpp
+@@ -23,6 +23,7 @@
+ Parser for ASN1 binary notation. Does minimal syntax checking, assuming that this will already have
+ been done before the binary was produced. Creates a MHParseNode tree structure.
+ */
++#include <cstdlib> // malloc etc.
+
+ #include "Engine.h"
+ #include "ParseBinary.h"
+diff --git a/mythtv/libs/libmythfreemheg/ParseText.cpp b/mythtv/libs/libmythfreemheg/ParseText.cpp
+index dd7c98a996d..56fecdf4036 100644
+--- a/mythtv/libs/libmythfreemheg/ParseText.cpp
++++ b/mythtv/libs/libmythfreemheg/ParseText.cpp
+@@ -25,6 +25,9 @@ This is very basic and is only there to enable some test programs to be run.
+ */
+
+ #include "ParseText.h"
++
++#include <cstdlib> // malloc etc.
++
+ #include "ParseNode.h"
+ #include "BaseClasses.h"
+ #include "ASN1Codes.h"
+diff --git a/mythtv/libs/libmythfreemheg/ParseText.h b/mythtv/libs/libmythfreemheg/ParseText.h
+index f63adc1a47f..12f478517c0 100644
+--- a/mythtv/libs/libmythfreemheg/ParseText.h
++++ b/mythtv/libs/libmythfreemheg/ParseText.h
+@@ -23,6 +23,8 @@
+ #if !defined(PARSETEXT_H)
+ #define PARSETEXT_H
+
++#include <cstdlib> // malloc etc.
++
+ class MHGroup;
+
+ #include "ParseNode.h"
+
+From 659a080e9a545114295cef8dc8ea34e4d9f1d8ee Mon Sep 17 00:00:00 2001
+From: ulmus-scott <scott.the.elm(a)gmail.com>
+Date: Sat, 8 Jan 2022 19:15:25 -0500
+Subject: [PATCH 61/66] configure: remove unused malloc.h and memalign checks
+
+(cherry picked from commit 47c6ed9d34dfaebb91e7f43cdb426586873dcf2b)
+---
+ mythtv/configure | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/mythtv/configure b/mythtv/configure
+index fda2057a282..3540f4a1885 100755
+--- a/mythtv/configure
++++ b/mythtv/configure
+@@ -1670,7 +1670,6 @@ HEADERS_LIST="
+ mach_mach_time_h
+ machine_ioctl_bt848_h
+ machine_ioctl_meteor_h
+- malloc_h
+ mntent_h
+ opencv2_core_core_c_h
+ OpenGL_gl3_h
+@@ -1741,7 +1740,6 @@ MATH_FUNCS="
+
+ SYSTEM_FUNCS="
+ access
+- aligned_malloc
+ arc4random
+ clock_gettime
+ closesocket
+@@ -1774,13 +1772,11 @@ SYSTEM_FUNCS="
+ lzo1x_999_compress
+ mach_absolute_time
+ MapViewOfFile
+- memalign
+ mkstemp
+ mmap
+ mprotect
+ nanosleep
+ PeekNamedPipe
+- posix_memalign
+ pthread_cancel
+ sched_getaffinity
+ SetConsoleTextAttribute
+@@ -4800,7 +4796,6 @@ case $target_os in
+ disable dv1394
+ disable dvb
+ disable ceton
+- enable memalign_hack
+ disable mythtranscode
+ disable network
+ enable opengl
+@@ -5677,10 +5672,6 @@ case "$custom_allocator" in
+ ;;
+ esac
+
+-check_func_headers malloc.h _aligned_malloc && enable aligned_malloc
+-check_func ${malloc_prefix}memalign && enable memalign
+-check_func ${malloc_prefix}posix_memalign && enable posix_memalign
+-
+ check_func access
+ check_func_headers stdlib.h arc4random
+ check_func_headers time.h clock_gettime ||
+@@ -7095,12 +7086,6 @@ check_deps $CONFIG_LIST \
+
+ enabled threads && ! enabled pthreads && ! enabled atomics_native && die "non pthread threading without atomics not supported, try adding --enable-pthreads or --cpu=i486 or higher if you are on x86"
+
+-
+-if test $target_os = "haiku"; then
+- disable memalign
+- disable posix_memalign
+-fi
+-
+ # add_dep lib dep
+ # -> enable ${lib}_deps_${dep}
+ # -> add $dep to ${lib}_deps only once
+
+From 668f9409cef9f8de41331629264c6b7c8626ddb3 Mon Sep 17 00:00:00 2001
+From: ulmus-scott <scott.the.elm(a)gmail.com>
+Date: Sat, 8 Jan 2022 19:45:16 -0500
+Subject: [PATCH 62/66] libmythfreemheg/BaseClasses.h: remove unnecessary
+ include "config.h"
+
+Programs.cpp needed reordering of includes for HAVE_GETTIMEOFDAY (-Wundef)
+
+(cherry picked from commit d5d9cf320c73ca10830d3209503a73795e6adb48)
+---
+ mythtv/libs/libmythfreemheg/BaseClasses.h | 2 --
+ mythtv/libs/libmythfreemheg/Programs.cpp | 6 +++---
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/mythtv/libs/libmythfreemheg/BaseClasses.h b/mythtv/libs/libmythfreemheg/BaseClasses.h
+index 27ef64e6173..4538809052b 100644
+--- a/mythtv/libs/libmythfreemheg/BaseClasses.h
++++ b/mythtv/libs/libmythfreemheg/BaseClasses.h
+@@ -22,8 +22,6 @@
+ #if !defined(BASECLASSES_H)
+ #define BASECLASSES_H
+
+-#include "config.h"
+-
+ #include <cstdlib> // malloc etc.
+
+ #include <array>
+diff --git a/mythtv/libs/libmythfreemheg/Programs.cpp b/mythtv/libs/libmythfreemheg/Programs.cpp
+index ba58f6773c6..1e85c6bb564 100644
+--- a/mythtv/libs/libmythfreemheg/Programs.cpp
++++ b/mythtv/libs/libmythfreemheg/Programs.cpp
+@@ -32,6 +32,9 @@
+ #include "freemheg.h"
+ #include "mythrandom.h"
+
++#include "config.h"
++#include "compat.h"
++
+ #include <QDateTime>
+ #include <QLocale>
+ #include <QStringList>
+@@ -46,9 +49,6 @@
+ #include <ctime>
+ #endif
+
+-#include "config.h"
+-#include "compat.h"
+-
+ /*
+ * Resident programs are subroutines to provide various string and date functions
+ * but also interface to surrounding tuner. They are defined in the UK MHEG profile.
+
+From dfb1bc1fd309702b71dcbc5e8029c36b63d09294 Mon Sep 17 00:00:00 2001
+From: ulmus-scott <scott.the.elm(a)gmail.com>
+Date: Sat, 8 Jan 2022 20:27:39 -0500
+Subject: [PATCH 63/66] libmythfreemheg/Programs.cpp: remove unnecessary
+ includes
+
+<sys/timeb.h> is unused
+<sys/time.h> is unconditionally included by mythchrono.h but not used directly
+
+<ctime> is used unconditionally
+
+(cherry picked from commit adda7f2401107421c9832b954ab4ff49277cbba9)
+---
+ mythtv/libs/libmythfreemheg/Programs.cpp | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+diff --git a/mythtv/libs/libmythfreemheg/Programs.cpp b/mythtv/libs/libmythfreemheg/Programs.cpp
+index 1e85c6bb564..ce593841414 100644
+--- a/mythtv/libs/libmythfreemheg/Programs.cpp
++++ b/mythtv/libs/libmythfreemheg/Programs.cpp
+@@ -40,14 +40,9 @@
+ #include <QStringList>
+ #include <QUrl>
+ #include <QUrlQuery>
+-#if HAVE_GETTIMEOFDAY == 0
+-#include <sys/timeb.h>
+-#endif
+-#ifdef __FreeBSD__
+-#include <sys/time.h>
+-#else
++
+ #include <ctime>
+-#endif
++
+
+ /*
+ * Resident programs are subroutines to provide various string and date functions
+
+From b135b27364812ef1bbc65baa3712abd55cc04882 Mon Sep 17 00:00:00 2001
+From: ulmus-scott <scott.the.elm(a)gmail.com>
+Date: Sat, 8 Jan 2022 20:47:12 -0500
+Subject: [PATCH 64/66] libmythfreemheg/Programs.cpp: remove more unnecessary
+ headers
+
+no symbols are used from either (myth)config.h or compat.h
+
+(cherry picked from commit 2b2f27471b6d2e19b680015e1d99e605faf896db)
+---
+ mythtv/libs/libmythfreemheg/Programs.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/mythtv/libs/libmythfreemheg/Programs.cpp b/mythtv/libs/libmythfreemheg/Programs.cpp
+index ce593841414..351dc5ded8e 100644
+--- a/mythtv/libs/libmythfreemheg/Programs.cpp
++++ b/mythtv/libs/libmythfreemheg/Programs.cpp
+@@ -32,9 +32,6 @@
+ #include "freemheg.h"
+ #include "mythrandom.h"
+
+-#include "config.h"
+-#include "compat.h"
+-
+ #include <QDateTime>
+ #include <QLocale>
+ #include <QStringList>
+
+From b6ef30288fd81d93d2c3ad34ac9adb61c257aebb Mon Sep 17 00:00:00 2001
+From: ulmus-scott <scott.the.elm(a)gmail.com>
+Date: Sun, 9 Jan 2022 04:02:29 -0500
+Subject: [PATCH 65/66] libmythfreemheg/Programs.cpp: finish conversion to
+ QDateTime
+
+<ctime> and "mythchrono.h" are no longer needed
+
+The QDateTime conversion in FormatDate was incorrect. fromMSecsSinceEpoch instead of fromSecsSinceEpoch
+
+However, no one must use FormatDate since that error is from 0d195a9c6598f8b7d3a3e46a129ce03a1ffbaf09 on 2020-07-02.
+
+(cherry picked from commit b987f5bbaff2d820bd1967348a5abb98bcb82dd2)
+---
+ mythtv/libs/libmythfreemheg/Programs.cpp | 67 +++++++++++++++++-------
+ 1 file changed, 47 insertions(+), 20 deletions(-)
+
+diff --git a/mythtv/libs/libmythfreemheg/Programs.cpp b/mythtv/libs/libmythfreemheg/Programs.cpp
+index 351dc5ded8e..5035ed2491e 100644
+--- a/mythtv/libs/libmythfreemheg/Programs.cpp
++++ b/mythtv/libs/libmythfreemheg/Programs.cpp
+@@ -18,8 +18,8 @@
+ Or, point your browser to http://www.gnu.org/copyleft/gpl.html
+
+ */
+-
+-#include "mythchrono.h"
++#include <algorithm>
++#include <limits>
+
+ #include "Programs.h"
+ #include "Ingredients.h"
+@@ -38,9 +38,6 @@
+ #include <QUrl>
+ #include <QUrlQuery>
+
+-#include <ctime>
+-
+-
+ /*
+ * Resident programs are subroutines to provide various string and date functions
+ * but also interface to surrounding tuner. They are defined in the UK MHEG profile.
+@@ -152,6 +149,34 @@ static void GetString(MHParameter *parm, MHOctetString &str, MHEngine *engine)
+ str.Copy(un.m_strVal);
+ }
+
++/** @brief Midnight on 17 November 1858, the epoch of the modified Julian day.
++
++This is Qt::LocalTime, to match GetCurrentDate's use of local time.
++
++ETSI ES 202 184 V2.4.1 (2016-06) does not mention timezones.
++§11.10.4.2 GetCurrentDate "Retrieves the current @e local date and time."
++Emphasis mine.
++
++Therefore, for consistency, I will assume all dates are in the local timezone.
++Thus, the meaning of FormatDate using the output of GetCurrentDate is equivalent
++to QDateTime::currentDateTime().toString(…) with a suitably converted format string.
++*/
++static const QDateTime k_mJD_epoch = QDateTime(QDate(1858, 11, 17), QTime(0, 0), Qt::LocalTime);
++
++// match types with Qt
++static inline QDateTime recoverDateTime(int64_t mJDN, int64_t seconds)
++{
++ QDateTime dt = k_mJD_epoch;
++ return dt.addDays(mJDN).addSecs(seconds);
++}
++
++static void GetCurrentDate(int64_t& mJDN, int& seconds)
++{
++ auto dt = QDateTime::currentDateTime();
++ mJDN = k_mJD_epoch.daysTo(dt); // returns a qint64
++ seconds = dt.time().msecsSinceStartOfDay() / 1000;
++}
++
+ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, const MHSequence<MHParameter *> &args, MHEngine *engine)
+ {
+ if (! m_fAvailable)
+@@ -170,13 +195,10 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
+ {
+ if (args.Size() == 2)
+ {
+- // Adjust the time to local. TODO: Check this.
+- auto epochSeconds = nowAsDuration<std::chrono::seconds>(true);
+- // Time as seconds since midnight.
+- int nTimeAsSecs = (epochSeconds % 24h).count();
+- // Modified Julian date as number of days since 17th November 1858.
+- // 1st Jan 1970 was date 40587.
+- int nModJulianDate = 40587 + epochSeconds / 24h;
++ int64_t mJDN = 0;
++ int nTimeAsSecs = 0;
++ GetCurrentDate(mJDN, nTimeAsSecs);
++ int nModJulianDate = std::clamp<int64_t>(mJDN, 0, std::numeric_limits<int>::max());
+
+ engine->FindObject(*(args.GetAt(0)->GetReference()))->SetVariableValue(nModJulianDate);
+ engine->FindObject(*(args.GetAt(1)->GetReference()))->SetVariableValue(nTimeAsSecs);
+@@ -197,9 +219,8 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
+ GetString(args.GetAt(0), format, engine);
+ int date = GetInt(args.GetAt(1), engine); // As produced in GCD
+ int time = GetInt(args.GetAt(2), engine);
+- // Convert to a Unix date (secs since 1st Jan 1970) but adjusted for time zone.
+- time_t timet = (date - 40587) * (24 * 60 * 60) + time;
+- QDateTime dt = QDateTime::fromMSecsSinceEpoch(timet);
++
++ QDateTime dt = recoverDateTime(date, time);
+ MHOctetString result;
+
+ for (int i = 0; i < format.Size(); i++)
+@@ -270,11 +291,17 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
+ if (args.Size() == 2)
+ {
+ int date = GetInt(args.GetAt(0), engine); // Date as produced in GCD
+- // Convert to a Unix date (secs since 1st Jan 1970) but adjusted for time zone.
+- time_t timet = (date - 40587) * (24 * 60 * 60);
+- struct tm *timeStr = gmtime(&timet);
+- // 0 => Sunday, 1 => Monday etc.
+- engine->FindObject(*(args.GetAt(1)->GetReference()))->SetVariableValue(timeStr->tm_wday);
++ QDateTime dt = recoverDateTime(date, 0);
++ // ETSI ES 202 184 V2.4.1 (2016-06) §11.10.4.4 GetDayOfWeek
++ // specifies "0 represents Sunday, 1 Monday, etc."
++
++ int dayOfWeek = dt.date().dayOfWeek();
++ // Gregorian calendar, returns 0 if invalid, 1 = Monday to 7 = Sunday
++ if (dayOfWeek == 7)
++ {
++ dayOfWeek = 0;
++ }
++ engine->FindObject(*(args.GetAt(1)->GetReference()))->SetVariableValue(dayOfWeek);
+ SetSuccessFlag(success, true, engine);
+ }
+ else
+
+From ba52c132238b16a4bbca3d243c8ee9dd483bc3da Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas(a)kldo.nl>
+Date: Wed, 19 Oct 2022 22:07:21 +0200
+Subject: [PATCH 66/66] Live TV select channel from another video source
+
+In Live TV mode it is possible to select any other channel by entering the channel number.
+In fixes/32 and in master this is broken; it is now only possible to select a channel in
+the same video source as the current channel.
+Fixed by removing a static_cast in two lines in function get_chanid that was introduced
+in commit 976989051502f54abb7173f9e9127f25f8fd6c13 on September 29, 2020.
+
+(cherry picked from commit 61b82f2b5a4124c4369fa9ae1b408b6d36251e05)
+---
+ mythtv/libs/libmythtv/tv_play.cpp | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
+index 78aa5c2f9f2..8c812ccc499 100644
+--- a/mythtv/libs/libmythtv/tv_play.cpp
++++ b/mythtv/libs/libmythtv/tv_play.cpp
+@@ -5956,19 +5956,20 @@ static uint get_chanid(const PlayerContext *ctx,
+ {
+ uint chanid = 0;
+ uint cur_sourceid = 0;
++
+ // try to find channel on current input
+ if (ctx && ctx->m_playingInfo && ctx->m_playingInfo->GetSourceID())
+ {
+ cur_sourceid = ctx->m_playingInfo->GetSourceID();
+- chanid = std::max(static_cast<uint>(ChannelUtil::GetChanID(cur_sourceid, channum)), 0U);
++ chanid = std::max(ChannelUtil::GetChanID(cur_sourceid, channum), 0);
+ if (chanid)
+ return chanid;
+ }
+- // try to find channel on specified input
+
++ // try to find channel on specified input
+ uint sourceid = CardUtil::GetSourceID(cardid);
+ if (cur_sourceid != sourceid && sourceid)
+- chanid = std::max(static_cast<uint>(ChannelUtil::GetChanID(sourceid, channum)), 0U);
++ chanid = std::max(ChannelUtil::GetChanID(sourceid, channum), 0);
+ return chanid;
+ }
+
1 year, 5 months
- 1
- 0