[mythtv] Update to latest fixes/33 to fix ftbs on 6.5 kernel

commit 0e2ff5a581e886fc6601685298b4de6b2a20a7f5 Author: Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; Date: Tue Jul 25 09:27:48 2023 -0500 Update to latest fixes/33 to fix ftbs on 6.5 kernel recommend gnome-shell-extension-no-overview for mythfrontend mythtv.spec | 11 +++- v33.1..beaf2bacbe.patch => v33.1..402c6d7758.patch | 64 +++++++++++++++++----- 2 files changed, 59 insertions(+), 16 deletions(-) --- diff --git a/mythtv.spec b/mythtv.spec index 6751b36..1cd06c2 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -1,9 +1,9 @@ # The full MythTV Version string is computed from the output of git describe. -%global vers_string v33.1-14-gbeaf2bacbe +%global vers_string v33.1-15-g402c6d7758 # The git date of last commit on mythtv repo # git_date=$(git log -1 --format=%cd --date=format:"%Y%m%d") -%global git_date 20230714 +%global git_date 20230725 # Specfile for building MythTV and MythPlugins RPMs from a git checkout. # @@ -470,6 +470,9 @@ Provides: mythtv-frontend-api%{?_isa} = %{mythfeapiver} # https://www.mythtv.org/wiki/Using_MythTV#Optical_Disks Recommends: libdvdcss +# Disable the startup overview on newer Gnome desktops to allow proper kiosk mode +Recommends: gnome-shell-extension-no-overview + %description frontend MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. @@ -1284,6 +1287,10 @@ exit 0 ################################################################################ %changelog +* Tue Jul 25 2023 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 33.1-1.15.20230725gitg402c6d775 +- Update to latest fixes/33 to fix ftbs on 6.5 kernel +- recommend gnome-shell-extension-no-overview for mythfrontend + * Mon Jul 24 2023 Andrew Bauer <zonexpertconsulting(a)outlook.com&gt; - 33.1-1.14.20230714gitggbeaf2bacb - Update to latest fixes/33 - add firewalld config for new web frontend diff --git a/v33.1..beaf2bacbe.patch b/v33.1..402c6d7758.patch similarity index 94% rename from v33.1..beaf2bacbe.patch rename to v33.1..402c6d7758.patch index 58cbd92..eff2279 100644 --- a/v33.1..beaf2bacbe.patch +++ b/v33.1..402c6d7758.patch @@ -1,7 +1,7 @@ From 3db72cc1d34609a1e07ec44b0d999c673501963c Mon Sep 17 00:00:00 2001 From: David Hampton <mythtv(a)love2code.net&gt; Date: Mon, 6 Feb 2023 22:53:49 -0500 -Subject: [PATCH 01/14] Arch linux refuses to accept egrep. Switch to 'grep +Subject: [PATCH 01/15] Arch linux refuses to accept egrep. Switch to 'grep -E'. (cherry picked from commit bbcc7db3fdcd338af1889c8226c933cc7172715d) @@ -26,7 +26,7 @@ index 871d9748821..cbbd696721c 100755 From 0c373c3b98e2cf8426457ff75be2935ec6f53248 Mon Sep 17 00:00:00 2001 From: Mark Spieth <mspieth(a)digivation.com.au&gt; Date: Sat, 11 Feb 2023 13:48:57 +1100 -Subject: [PATCH 02/14] Android: OpenSSL 1.1.1 load system CA certificates +Subject: [PATCH 02/15] Android: OpenSSL 1.1.1 load system CA certificates explicitly Issue: 125 * Move all android library dependencies to the packaging repo @@ -118,7 +118,7 @@ index 0b17943c309..4b9913f9d93 100644 From a803b198a84e04aa9a83dee5047193e431e9b3ed Mon Sep 17 00:00:00 2001 From: Klaas de Waal <klaas(a)kldo.nl&gt; Date: Thu, 9 Feb 2023 21:44:34 +0100 -Subject: [PATCH 03/14] Send REC_PENDING event before recording starts +Subject: [PATCH 03/15] Send REC_PENDING event before recording starts Fix the logic that sends the REC_PENDING event. - REC_PENDING event is sent always before the REC_STARTED. @@ -221,7 +221,7 @@ index 2fc66467a10..aba76438cec 100644 From c273ed0f9a2491b7f6ec377be0a0a861f7788849 Mon Sep 17 00:00:00 2001 From: jhoyt4 <john.hoyt(a)gmail.com&gt; Date: Sat, 18 Feb 2023 09:42:47 -0500 -Subject: [PATCH 04/14] OSX: Handle constants deprecated for 11.7 +Subject: [PATCH 04/15] OSX: Handle constants deprecated for 11.7 - Fixes regression caused by deprecation of constants by Apple in 11.5.7. @@ -505,7 +505,7 @@ index 98b054f9874..d6da5c653c0 100644 From 7f288be61b5fa653b5afd35b0ceea3b524ae8a1c Mon Sep 17 00:00:00 2001 From: Klaas de Waal <klaas(a)kldo.nl&gt; Date: Sun, 12 Mar 2023 20:54:07 +0100 -Subject: [PATCH 05/14] mythtv-setup hanging at Video Sources +Subject: [PATCH 05/15] mythtv-setup hanging at Video Sources On Ubuntu 22.10 mythtv-setup hangs in Video Sources when creating a new Video source. The problem has been traced to running tv_find_grabbers by MythSystemLegacy. @@ -536,7 +536,7 @@ index 6bb169409eb..1bb70946466 100644 From b391cfb6a7ac87d245f697edb77c0114d67de683 Mon Sep 17 00:00:00 2001 From: Klaas de Waal <klaas(a)kldo.nl&gt; Date: Fri, 17 Mar 2023 23:01:07 +0100 -Subject: [PATCH 06/14] Conversion of negative time values to string +Subject: [PATCH 06/15] Conversion of negative time values to string When converting a negative time value with format string "m:ss" there is a minus sign before the minutes and also a minus sign before the seconds. @@ -583,7 +583,7 @@ index 8f3397241a6..21a307cb453 100644 From 142a8e070841c74d200e3444f6b815cde5452809 Mon Sep 17 00:00:00 2001 From: Klaas de Waal <klaas(a)kldo.nl&gt; Date: Sun, 26 Mar 2023 14:29:59 +0200 -Subject: [PATCH 07/14] End-of-file in MythMusic +Subject: [PATCH 07/15] End-of-file in MythMusic Detect end-of-file when reading music files and return the AVERROR_EOF status to FFmpeg. In version 33 MythTV has upgraded to a version of FFmpeg that does require this. @@ -614,7 +614,7 @@ index 92c9c6264cf..0a1b713ff09 100644 From f2a964ed814a08d8a3016e5b0b1f0979e4586360 Mon Sep 17 00:00:00 2001 From: Jan Hambrecht <jaham(a)gmx.net&gt; Date: Sat, 18 Mar 2023 23:16:08 +0100 -Subject: [PATCH 08/14] Fix detection of optical drives +Subject: [PATCH 08/15] Fix detection of optical drives Checking for mount points is not reliable to determine if a block device is an optical drive. This commit uses the 'MediaCompatibility' property @@ -701,7 +701,7 @@ index c9536f5584a..1a752c4aeb9 100644 From 44b1ac1d59aff9b9e4340e9a693a0e7a2b3e0799 Mon Sep 17 00:00:00 2001 From: Jan Hambrecht <jaham(a)gmx.net&gt; Date: Sun, 19 Mar 2023 16:20:43 +0100 -Subject: [PATCH 09/14] Remove checking 'ReadOnly' drive property +Subject: [PATCH 09/15] Remove checking 'ReadOnly' drive property When checking if a drive is an optical drive, rely only on the 'MediaCompatibility' property and not the 'ReadOnly' property @@ -740,7 +740,7 @@ index 1a752c4aeb9..85ef34218d4 100644 From 0682d4d42dd50ad8592c522fe39fc8a81a11ee59 Mon Sep 17 00:00:00 2001 From: Jan Hambrecht <jaham(a)gmx.net&gt; Date: Sun, 19 Mar 2023 16:26:15 +0100 -Subject: [PATCH 10/14] Cleanup function 'DetectDevice' +Subject: [PATCH 10/15] Cleanup function 'DetectDevice' Remove dead code which is not going to be used anymore @@ -783,7 +783,7 @@ index 85ef34218d4..36aa9f4c906 100644 From 51cb10a67855bae82a97ca1995956622b0902021 Mon Sep 17 00:00:00 2001 From: Bill Meek <bmeek(a)mythtv.org&gt; Date: Mon, 10 Apr 2023 10:45:38 -0500 -Subject: [PATCH 11/14] ApplyRecordRecGroupChange: replace chanid/starttime +Subject: [PATCH 11/15] ApplyRecordRecGroupChange: replace chanid/starttime with recordedid Solves issue here: https://forum.mythtv.org/viewtopic.php?p=25852#p25852 @@ -814,7 +814,7 @@ index c5126376f47..a16c7f2c6bd 100644 From c4b7e4c43321154bf5eaa67af02b7ba7ea6bffb8 Mon Sep 17 00:00:00 2001 From: Bill Meek <bmeek(a)mythtv.org&gt; Date: Sun, 16 Apr 2023 23:59:37 -0500 -Subject: [PATCH 12/14] mythdbcon: force QMetaType::QDateTime values to use +Subject: [PATCH 12/15] mythdbcon: force QMetaType::QDateTime values to use MythDate::kDatabase This cares for a recent ibqt5sql5-mysql update in at least one @@ -880,7 +880,7 @@ index 1ec6e1ca7da..b1e251fd809 100644 From 83e1df82c2094586a585b8d5cde9de14e9be0735 Mon Sep 17 00:00:00 2001 From: Klaas de Waal <klaas(a)kldo.nl&gt; Date: Thu, 18 May 2023 21:00:28 +0200 -Subject: [PATCH 13/14] Fix mythbackend segfault after failed Live TV +Subject: [PATCH 13/15] Fix mythbackend segfault after failed Live TV A failing Live TV can cause a segfault of mythbackend due to a delete of an already deleted object. @@ -910,7 +910,7 @@ index 7d16a16ddb1..d4a106c6b9e 100644 From beaf2bacbe63da92da49e37807efa1738e1fa5c1 Mon Sep 17 00:00:00 2001 From: MmAaXx500 <viktor.balogh45(a)gmail.com&gt; Date: Thu, 6 Jul 2023 17:58:46 +0200 -Subject: [PATCH 14/14] Fix heap-use-after-free in TVRec with Live TV +Subject: [PATCH 14/15] Fix heap-use-after-free in TVRec with Live TV When playing Live TV continuously on the same channel, there is a moment when according to the guide one program ends and the next @@ -942,3 +942,39 @@ index d4a106c6b9e..2b1708176d4 100644 if (pginfo) { if (m_curRecording) + +From 402c6d7758d02733e0b4c76a80df862c977e3307 Mon Sep 17 00:00:00 2001 +From: David Hampton <mythtv(a)love2code.net&gt; +Date: Fri, 21 Jul 2023 00:59:43 -0400 +Subject: [PATCH 15/15] Work around Linux kernel header 6.5 using C++ reserved + keyword. + +Starting with kernel 6.5.0, a rewrite of the linux/ioprio.h header +file uses the C++ reserved keyword "class" as a variable name. +Fortunately we can redefine the string "class" for the duration of the +inclusion without any ill effects. + +Fixes #778. + +(cherry picked from commit 7d6c7d605f87b697c7488d1eb4a3246b83e31f01) +--- + mythtv/libs/libmythbase/mythmiscutil.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/mythtv/libs/libmythbase/mythmiscutil.cpp b/mythtv/libs/libmythbase/mythmiscutil.cpp +index 1fc0e93b0b5..6f4241268f7 100644 +--- a/mythtv/libs/libmythbase/mythmiscutil.cpp ++++ b/mythtv/libs/libmythbase/mythmiscutil.cpp +@@ -703,7 +703,12 @@ void myth_yield(void) + #include <sys/ptrace.h> + #include <sys/syscall.h> + #if __has_include(<linux/ioprio.h>) ++// Starting with kernel 6.5.0, the following include uses the C++ ++// reserved keyword "class" as a variable name. Fortunately we can ++// redefine it without any ill effects. ++#define class class2 + #include <linux/ioprio.h> ++#undef class + #else + static constexpr int8_t IOPRIO_BITS { 16 }; + static constexpr int8_t IOPRIO_CLASS_SHIFT { 13 };