Attachment #881880 for bug #921694

View | Details | Raw Unified | Return to bug 921694
Collapse All | Expand All




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

Reimplements: bb154a843b737cc3ad8c1a45fa04a1a3609aff05
(cherry picked from commit 6348dc01a45af6ed63c09326ec94cd425db1d6d7)
---
 .github/workflows/buildmaster.yml                | 2 +-
 mythtv/configure                                 | 1 -
 mythtv/programs/scripts/hardwareprofile/smolt.py | 5 ++---
 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

2.41.0


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




	"${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() {


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:" \
- 

Return to bug 921694

Lines 147-156 PATCHES=( Link Here

(-)a/media-tv/mythtv/mythtv-33.1-r1.ebuild (-5 / +5 lines)
147	"${FILESDIR}"/${PN}-33.1-libva.patch	147	"${FILESDIR}"/${PN}-33.1-libva.patch
148	"${FILESDIR}"/${PN}-33.1-ffmpeg-binutils-2.41.patch	148	"${FILESDIR}"/${PN}-33.1-ffmpeg-binutils-2.41.patch
149	"${FILESDIR}"/${PN}-33.1-linux-headers-6.5.patch	149	"${FILESDIR}"/${PN}-33.1-linux-headers-6.5.patch
150	# https://github.com/MythTV/mythtv/pull/824
151	# https://github.com/MythTV/mythtv/pull/838
152	# https://bugs.gentoo.org/888291
153	"${FILESDIR}"/${PN}-33.1-python3.12.patch
154	)	150	)
155		151
156	python_check_deps() {	152	python_check_deps() {
Lines 167-172 pkg_setup() { Link Here
167		163
168	src_prepare() {	164	src_prepare() {
169	default	165	default
		166	# https://github.com/MythTV/mythtv/pull/824
		167	# https://github.com/MythTV/mythtv/pull/838
		168	# https://bugs.gentoo.org/888291
		169	eapply -p2 "${FILESDIR}"/${PN}-33.1-python3.12.patch
		170
170		171
171	# Perl bits need to go into vendor_perl and not site_perl	172	# Perl bits need to go into vendor_perl and not site_perl
172	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \	173	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
173	-

Lines 1-4 Link Here

(-)a/media-tv/mythtv/files/mythtv-33.1-python3.12.patch (-17 / +3 lines)
1	From f1848eb41bf35d57b63b3a8cb19763c5b4656717 Mon Sep 17 00:00:00 2001	1	From ea59f869dcbd73b1d0dca973314604f689b50c34 Mon Sep 17 00:00:00 2001
2	From: Eli Schwartz <eschwartz93@gmail.com>	2	From: Eli Schwartz <eschwartz93@gmail.com>
3	Date: Thu, 4 Jan 2024 16:18:00 -0500	3	Date: Thu, 4 Jan 2024 16:18:00 -0500
4	Subject: [PATCH 1/2] hardwareprofile: remove external dependency on simplejson	4	Subject: [PATCH 1/2] hardwareprofile: remove external dependency on simplejson
Lines 41-64 Fixes: 1df343e9ab7defa284a73390210a65cf2112f17e Link Here
41	Reimplements: bb154a843b737cc3ad8c1a45fa04a1a3609aff05	41	Reimplements: bb154a843b737cc3ad8c1a45fa04a1a3609aff05
42	(cherry picked from commit 6348dc01a45af6ed63c09326ec94cd425db1d6d7)	42	(cherry picked from commit 6348dc01a45af6ed63c09326ec94cd425db1d6d7)
43	---	43	---
44	.github/workflows/buildmaster.yml \| 2 +-
45	mythtv/configure \| 1 -	44	mythtv/configure \| 1 -
46	mythtv/programs/scripts/hardwareprofile/smolt.py \| 5 ++---	45	mythtv/programs/scripts/hardwareprofile/smolt.py \| 5 ++---
47	3 files changed, 3 insertions(+), 5 deletions(-)	46	2 files changed, 2 insertions(+), 4 deletions(-)
48		47
49	diff --git a/.github/workflows/buildmaster.yml b/.github/workflows/buildmaster.yml
50	index eea6e9fc2a..325cc7da64 100644
51	--- a/.github/workflows/buildmaster.yml
52	+++ b/.github/workflows/buildmaster.yml
53	@@ -48,7 +48,7 @@ jobs:
54	sudo apt install ccache qt5-qmake qtscript5-dev nasm libsystemd-dev libfreetype6-dev libmp3lame-dev libx264-dev libx265-dev libxrandr-dev libxml2-dev
55	sudo apt install libavahi-compat-libdnssd-dev libasound2-dev liblzo2-dev libhdhomerun-dev libsamplerate0-dev libva-dev libdrm-dev libvdpau-dev
56	sudo apt install libass-dev libpulse-dev libcec-dev libssl-dev libtag1-dev libbluray-dev libbluray-bdj libgnutls28-dev libqt5webkit5-dev
57	- sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-simplejson python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl
58	+ sudo apt install libvpx-dev python3-mysqldb python3-lxml python3-future python3-setuptools libdbi-perl libdbd-mysql-perl libnet-upnp-perl
59	sudo apt install libio-socket-inet6-perl libxml-simple-perl libqt5sql5-mysql libwayland-dev qtbase5-private-dev libzip-dev libsoundtouch-dev
60	if: runner.os == 'Linux'
61
62	diff --git a/mythtv/configure b/mythtv/configure	48	diff --git a/mythtv/configure b/mythtv/configure
63	index 7e966ef817..3429c208e2 100755	49	index 7e966ef817..3429c208e2 100755
64	--- a/mythtv/configure	50	--- a/mythtv/configure
Lines 98-104 index 1bcc8060d0..464f068d6f 100644 Link Here
98	2.41.0	84	2.41.0
99		85
100		86
101	From 13f65c0015d3e0d82d01a1dd5c15afe0ff1e8029 Mon Sep 17 00:00:00 2001	87	From 7c1dbe7a86dc9b445a1a491f5a849b0eba21aead Mon Sep 17 00:00:00 2001
102	From: Eli Schwartz <eschwartz93@gmail.com>	88	From: Eli Schwartz <eschwartz93@gmail.com>
103	Date: Wed, 13 Dec 2023 23:11:11 -0500	89	Date: Wed, 13 Dec 2023 23:11:11 -0500
104	Subject: [PATCH 2/2] hardwareprofile: remove ancient "future" compatibility	90	Subject: [PATCH 2/2] hardwareprofile: remove ancient "future" compatibility