[gentoo-commits] repo/gentoo:master commit in: media-tv/mythtv/files/, media-tv/mythtv/

["Sam James" <sam@gentoo.org>]

commit:     ecc8eaf12dc554f02cdf1a7a4e1a7435f88f311d
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 10 22:54:26 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 12:02:27 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecc8eaf1

media-tv/mythtv: fix broken patch

Recreate patch to work when applied with -p2, since ${S} is not the
tarball root.

Fixes: f785d71faf63548afe5e2f6fb4ee03da1c686597
Closes: https://bugs.gentoo.org/921694
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-tv/mythtv/files/mythtv-33.1-python3.12.patch | 20 +++-----------------
 media-tv/mythtv/mythtv-33.1-r1.ebuild              |  9 +++++----
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/media-tv/mythtv/files/mythtv-33.1-python3.12.patch b/media-tv/mythtv/files/mythtv-33.1-python3.12.patch
index 48a97b09623d..91f72ab13ac3 100644
--- a/media-tv/mythtv/files/mythtv-33.1-python3.12.patch
+++ b/media-tv/mythtv/files/mythtv-33.1-python3.12.patch
@@ -1,4 +1,4 @@
-From f1848eb41bf35d57b63b3a8cb19763c5b4656717 Mon Sep 17 00:00:00 2001
+From ea59f869dcbd73b1d0dca973314604f689b50c34 Mon Sep 17 00:00:00 2001
 From: Eli Schwartz <eschwartz93@gmail.com>
 Date: Thu, 4 Jan 2024 16:18:00 -0500
 Subject: [PATCH 1/2] hardwareprofile: remove external dependency on simplejson
@@ -41,24 +41,10 @@ Fixes: 1df343e9ab7defa284a73390210a65cf2112f17e
 Reimplements: bb154a843b737cc3ad8c1a45fa04a1a3609aff05
 (cherry picked from commit 6348dc01a45af6ed63c09326ec94cd425db1d6d7)
 ---
- .github/workflows/buildmaster.yml                | 2 +-
  mythtv/configure                                 | 1 -
  mythtv/programs/scripts/hardwareprofile/smolt.py | 5 ++---
- 3 files changed, 3 insertions(+), 5 deletions(-)
+ 2 files changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/.github/workflows/buildmaster.yml b/.github/workflows/buildmaster.yml
-index eea6e9fc2a..325cc7da64 100644
---- a/.github/workflows/buildmaster.yml
-+++ b/.github/workflows/buildmaster.yml
-@@ -48,7 +48,7 @@ jobs:
-         sudo apt install ccache qt5-qmake qtscript5-dev nasm libsystemd-dev libfreetype6-dev libmp3lame-dev libx264-dev libx265-dev libxrandr-dev libxml2-dev
-         sudo apt install libavahi-compat-libdnssd-dev libasound2-dev liblzo2-dev libhdhomerun-dev libsamplerate0-dev libva-dev libdrm-dev libvdpau-dev
-         sudo apt install libass-dev libpulse-dev libcec-dev libssl-dev libtag1-dev libbluray-dev libbluray-bdj libgnutls28-dev libqt5webkit5-dev
--        sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-simplejson python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl
-+        sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl
-         sudo apt install libio-socket-inet6-perl libxml-simple-perl libqt5sql5-mysql libwayland-dev qtbase5-private-dev libzip-dev libsoundtouch-dev
-       if: runner.os == 'Linux'
- 
 diff --git a/mythtv/configure b/mythtv/configure
 index 7e966ef817..3429c208e2 100755
 --- a/mythtv/configure
@@ -98,7 +84,7 @@ index 1bcc8060d0..464f068d6f 100644
 2.41.0
 
 
-From 13f65c0015d3e0d82d01a1dd5c15afe0ff1e8029 Mon Sep 17 00:00:00 2001
+From 7c1dbe7a86dc9b445a1a491f5a849b0eba21aead Mon Sep 17 00:00:00 2001
 From: Eli Schwartz <eschwartz93@gmail.com>
 Date: Wed, 13 Dec 2023 23:11:11 -0500
 Subject: [PATCH 2/2] hardwareprofile: remove ancient "future" compatibility

diff --git a/media-tv/mythtv/mythtv-33.1-r1.ebuild b/media-tv/mythtv/mythtv-33.1-r1.ebuild
index 344b691045d3..d0d9cd8758c6 100644
--- a/media-tv/mythtv/mythtv-33.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-33.1-r1.ebuild
@@ -147,10 +147,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-33.1-libva.patch
 	"${FILESDIR}"/${PN}-33.1-ffmpeg-binutils-2.41.patch
 	"${FILESDIR}"/${PN}-33.1-linux-headers-6.5.patch
-	# https://github.com/MythTV/mythtv/pull/824
-	# https://github.com/MythTV/mythtv/pull/838
-	# https://bugs.gentoo.org/888291
-	"${FILESDIR}"/${PN}-33.1-python3.12.patch
 )
 
 python_check_deps() {
@@ -167,6 +163,11 @@ pkg_setup() {
 
 src_prepare() {
 	default
+	# https://github.com/MythTV/mythtv/pull/824
+	# https://github.com/MythTV/mythtv/pull/838
+	# https://bugs.gentoo.org/888291
+	eapply -p2 "${FILESDIR}"/${PN}-33.1-python3.12.patch
+
 
 	# Perl bits need to go into vendor_perl and not site_perl
 	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \