git: 78547822a1f4 - main - multimedia/mythtv: update to 35.0

From: Hiroki Tagato <tagattie_at_FreeBSD.org>
Date: Sat, 04 Oct 2025 05:24:36 UTC
The branch main has been updated by tagattie:

URL: https://cgit.FreeBSD.org/ports/commit/?id=78547822a1f4b22f0b340632cc6d87481a85dc5b

commit 78547822a1f4b22f0b340632cc6d87481a85dc5b
Author:     Alan Hicks <ahicks@p-o.co.uk>
AuthorDate: 2025-10-04 04:50:51 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-10-04 05:24:15 +0000

    multimedia/mythtv: update to 35.0
    
    Release Notes: https://www.mythtv.org/wiki/Release_Notes_-_35
    
    Notable changes are:
    * mythweb is no longer maintained in MythTV. It is now marked as
      DEPRECATED without a specific EXPIRATION_DATE since it is still
      usable.
    * mythtv-setup, is deprecated and replaced with the Web
      App (<yourBackend>:6544/setupwizard). It is still available from the
      command line.
    
    PR:             285284
    Reported by:    Alan Hicks <ahicks@p-o.co.uk> (maintainer)
---
 multimedia/mythtv/Makefile                         |  76 ++----
 multimedia/mythtv/distinfo                         |   6 +-
 multimedia/mythtv/files/patch-configure            |  11 -
 ...ternal_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c | 145 -----------
 multimedia/mythtv/pkg-plist                        | 275 ++++++++++-----------
 5 files changed, 153 insertions(+), 360 deletions(-)

diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 2ade2d67bb2d..f49d821152f7 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	mythtv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	34.0
-PORTREVISION=	6
+DISTVERSION=	35.0
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 
@@ -10,12 +9,10 @@ COMMENT=	Homebrew PVR project
 WWW=		https://www.mythtv.org/
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc powerpc64 powerpc64le
-.if ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
-BROKEN_i386=	ld: error: can't create dynamic relocation R_386_32 against local symbol in readonly segment
-.endif
-
+BUILD_DEPENDS=	yasm:devel/yasm \
+		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 		libmp3lame.so:audio/lame \
 		libsamplerate.so:audio/libsamplerate \
@@ -38,24 +35,32 @@ LIB_DEPENDS=	liblzo2.so:archivers/lzo2 \
 		libgnutls.so:security/gnutls \
 		libzip.so:archivers/libzip \
 		libexpat.so:textproc/expat2
-BUILD_DEPENDS=	yasm:devel/yasm \
-		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
+RUN_DEPENDS+=	tv_check:textproc/p5-xmltv \
+		wget:ftp/wget
 
-USES=		compiler:c++17-lang gmake gl gnome iconv libtool pkgconfig pathfix \
-		perl5 python qmake:no_env qt:5 shebangfix ssl xorg
+USES=		compiler:c++17-lang gmake gl gnome iconv libtool localbase:ldflags \
+		pkgconfig pathfix perl5 python qmake:no_env qt:5 shebangfix ssl xorg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 USE_GL=		gl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
+USE_PERL5=	run build
 USE_QT=		buildtools:build core dbus gui imageformats:run \
 		linguist:build multimedia network opengl qmake:build script \
 		sql sql-mysql:run widgets xml
-USE_PERL5=	run build
+USE_RC_SUBR=	mythbackend
 USE_XORG=	x11 xv xrandr xxf86vm xinerama xext xcb
+
 SHEBANG_FILES=	programs/scripts/database/*.pl \
-		programs/scripts/metadata/Music/mbutils.py
+		programs/scripts/internetcontent/*.py \
+		programs/scripts/internetcontent/*.pl \
+		programs/scripts/internetcontent/nv_python_libs/*.py \
+		programs/scripts/hardwareprofile/*.py \
+		programs/scripts/metadata/Movie/tmdb3.py \
+		programs/scripts/metadata/Music/mbutils.py \
+		programs/scripts/metadata/Music/lyrics/testlyrics.pl
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
@@ -66,31 +71,20 @@ CONFIGURE_ENV=	QMAKESPEC="${QMAKESPEC}" MOC="${MOC}" \
 		QTDIR="${PREFIX}" PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
 MAKE_ENV=	QTDIR="${PREFIX}" \
 		QMAKESPEC="${QMAKESPEC}"
-NOPRECIOUSMAKEVARS=	# don't override ARCH in ffmpeg makefiles
 DESTDIRNAME=	INSTALL_ROOT
 CFLAGS_powerpc=	-Wno-error=int-conversion
 CPPFLAGS+=	${QTCPPFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib
 LDFLAGS_aarch64=-Wl,-z,notext
+LDFLAGS_i386=	-Wl,-z,notext
 
-REINPLACE_ARGS=	-i ""
-WRKSRC_SUBDIR=	${PORTNAME}
+CONFLICTS_INSTALL=	mythtv-frontend
 
 DESKTOP_ENTRIES="MythTV Frontend" "MythTV is a homebrew PVR project" "" \
 		"mythfrontend" "AudioVideo;Video;" false
-
-CONFLICTS_INSTALL=	mythtv-frontend
-
-RUN_DEPENDS+=	tv_check:textproc/p5-xmltv \
-		wget:ftp/wget
-USE_RC_SUBR=	mythbackend
-SHEBANG_FILES=	programs/scripts/database/*.pl \
-		programs/scripts/internetcontent/*.py \
-		programs/scripts/internetcontent/*.pl \
-		programs/scripts/internetcontent/nv_python_libs/*.py \
-		programs/scripts/hardwareprofile/*.py \
-		programs/scripts/metadata/Movie/tmdb3.py \
-		programs/scripts/metadata/Music/mbutils.py
+REINPLACE_ARGS=	-i ""
+NOPRECIOUSMAKEVARS=	# don't override ARCH in ffmpeg makefiles
+SUB_FILES=	pkg-message
+WRKSRC_SUBDIR=	${PORTNAME}
 
 CONFIGURE_ARGS+=--dvb-path="${WRKSRC}/media_tree/include/uapi" \
 		--enable-v4l2
@@ -98,13 +92,12 @@ CONFIGURE_ARGS+=--dvb-path="${WRKSRC}/media_tree/include/uapi" \
 USERS=		mythtv
 GROUPS=		mythtv
 
-SUB_FILES=	pkg-message
-
 OPTIONS_DEFINE=		BINDINGS HDHOMERUN JACK LIRC MYSQL PULSEAUDIO VDPAU
 OPTIONS_DEFAULT=	BINDINGS HDHOMERUN VDPAU
 OPTIONS_SUB=		yes
 
 BINDINGS_DESC=		Perl and Python bindings
+HDHOMERUN_DESC=		Native support for HDHomeRun network tuners
 BINDINGS_BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 			${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
@@ -131,11 +124,10 @@ BINDINGS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=1.2.2:databases/py-mys
 			p5-XML-Simple>=0:textproc/p5-XML-Simple \
 			p5-HTTP-Request-Params>=0:www/p5-HTTP-Request-Params \
 			p5-LWP-UserAgent-Determined>=0:www/p5-LWP-UserAgent-Determined
+BINDINGS_USES=		mysql
 BINDINGS_CONFIGURE_ON=	--python="${PYTHON_CMD}" --with-bindings=perl,python
 BINDINGS_CONFIGURE_OFF=	--without-bindings=perl,python
-BINDINGS_USES=		mysql
 
-HDHOMERUN_DESC=		Native support for HDHomeRun network tuners
 HDHOMERUN_LIB_DEPENDS=	libhdhomerun.so:multimedia/libhdhomerun
 HDHOMERUN_CONFIGURE_OFF=	--disable-hdhomerun
 
@@ -145,7 +137,6 @@ JACK_CONFIGURE_OFF=	--disable-audio-jack
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_OFF=	--disable-lirc
 
-MYSQL_DESC=		Install MySQL server in addition to client
 MYSQL_USES=		mysql:client,server
 MYSQL_USES_OFF=		mysql
 
@@ -232,19 +223,4 @@ post-install:
 		${GREP} -q 'x-executable; charset=binary'" \; -print | ${XARGS} ${STRIP_CMD}
 	@${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name lib\*.so.\* | ${XARGS} ${STRIP_CMD}
 
-# Apply additional substitutions to pkg-plist generated by the 'makeplist' target
-create-plist: stage
-	@(cd ${.CURDIR} && ${MAKE} makeplist > pkg-plist && \
-		${REINPLACE_CMD} -E \
-		-e '1d' -e '/etc\/rc.d\/mythbackend/d' -e '/[.]packlist$$/d' \
-		-e '/[.]bak$$/d' \
-		-e '/[.]gitignore$$/d' \
-		-e 's#^bin/mythpython#%%BINDINGS%%bin/mythpython#' \
-		-e 's#^bin/mythwikiscripts#%%BINDINGS%%bin/mythwikiscripts#' \
-		-e 's#^%%PYTHON_SITELIBDIR%%#%%BINDINGS%%%%PYTHON_SITELIBDIR%%#' \
-		-e 's#^%%DATADIR%%hardwareprofile#%%BINDINGS%%hardwareprofile#' \
-		-e 's#^%%DATADIR%%internetcontent#%%BINDINGS%%internetcontent#' \
-		-e 's#^%%SITE_PERL%%#%%BINDINGS%%%%SITE_PERL%%#' \
-		pkg-plist)
-
 .include <bsd.port.mk>
diff --git a/multimedia/mythtv/distinfo b/multimedia/mythtv/distinfo
index 817a516dabd2..9c318037eaa0 100644
--- a/multimedia/mythtv/distinfo
+++ b/multimedia/mythtv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708697729
-SHA256 (MythTV-mythtv-v34.0_GH0.tar.gz) = 1c0a0f9ae190468d07ebfb534c720ef8c62811148a9f928c56876e9fdbd5d6bf
-SIZE (MythTV-mythtv-v34.0_GH0.tar.gz) = 118820346
+TIMESTAMP = 1741345770
+SHA256 (MythTV-mythtv-v35.0_GH0.tar.gz) = 1d06520d1f0726a8d131aa323e9cd04f34a8154b32efe827dd570c2b212196c8
+SIZE (MythTV-mythtv-v35.0_GH0.tar.gz) = 120302443
diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure
deleted file mode 100644
index 1479055767a4..000000000000
--- a/multimedia/mythtv/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2024-02-25 17:30:55 UTC
-+++ configure
-@@ -5435,7 +5435,7 @@ if enabled system_libexiv2 ; then
- 
- # libexiv2
- if enabled system_libexiv2 ; then
--    if $(pkg-config --atleast-version="0.99" exiv2); then
-+    if $(pkg-config --atleast-version="0.28" exiv2); then
-         use_pkg_config exiv2 exiv2 exiv2/exiv2.hpp versionNumber
-     elif [ $target_os != "android" ] ; then
-         disable system_libexiv2
diff --git a/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c b/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c
deleted file mode 100644
index 1208098c1e5d..000000000000
--- a/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c
+++ /dev/null
@@ -1,145 +0,0 @@
-Revert 3a557c5d88b7b15b5954ba2743febb055549b536 to fix build on powerpc and powerpc64.
-
-Error:
-CC	libswscale/ppc/yuv2rgb_altivec.o
-libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_abgr?:
-libswscale/ppc/yuv2rgb_altivec.c:338:18: error: implicit declaration of function ?vec_xl?; did you mean ?vec_rl?? [-Werror=implicit-function-declaration]
-  338 |             y0 = vec_xl(0, y1i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:437:1: note: in expansion of macro ?DEFCSP420_CVT?
-  437 | DEFCSP420_CVT(yuv2_abgr,  out_abgr)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  338 |             y0 = vec_xl(0, y1i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:437:1: note: in expansion of macro ?DEFCSP420_CVT?
-  437 | DEFCSP420_CVT(yuv2_abgr,  out_abgr)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  340 |             y1 = vec_xl(0, y2i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:437:1: note: in expansion of macro ?DEFCSP420_CVT?
-  437 | DEFCSP420_CVT(yuv2_abgr,  out_abgr)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:437:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c:437:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_bgra?:
-libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  338 |             y0 = vec_xl(0, y1i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:438:1: note: in expansion of macro ?DEFCSP420_CVT?
-  438 | DEFCSP420_CVT(yuv2_bgra,  out_bgra)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  340 |             y1 = vec_xl(0, y2i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:438:1: note: in expansion of macro ?DEFCSP420_CVT?
-  438 | DEFCSP420_CVT(yuv2_bgra,  out_bgra)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:438:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c:438:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_rgba?:
-libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  338 |             y0 = vec_xl(0, y1i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:439:1: note: in expansion of macro ?DEFCSP420_CVT?
-  439 | DEFCSP420_CVT(yuv2_rgba,  out_rgba)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  340 |             y1 = vec_xl(0, y2i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:439:1: note: in expansion of macro ?DEFCSP420_CVT?
-  439 | DEFCSP420_CVT(yuv2_rgba,  out_rgba)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:439:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c:439:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_argb?:
-libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  338 |             y0 = vec_xl(0, y1i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:440:1: note: in expansion of macro ?DEFCSP420_CVT?
-  440 | DEFCSP420_CVT(yuv2_argb,  out_argb)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  340 |             y1 = vec_xl(0, y2i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:440:1: note: in expansion of macro ?DEFCSP420_CVT?
-  440 | DEFCSP420_CVT(yuv2_argb,  out_argb)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:440:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c:440:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_rgb24?:
-libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  338 |             y0 = vec_xl(0, y1i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:441:1: note: in expansion of macro ?DEFCSP420_CVT?
-  441 | DEFCSP420_CVT(yuv2_rgb24, out_rgb24)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  340 |             y1 = vec_xl(0, y2i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:441:1: note: in expansion of macro ?DEFCSP420_CVT?
-  441 | DEFCSP420_CVT(yuv2_rgb24, out_rgb24)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:441:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c:441:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c: In function ?altivec_yuv2_bgr24?:
-libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  338 |             y0 = vec_xl(0, y1i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:442:1: note: in expansion of macro ?DEFCSP420_CVT?
-  442 | DEFCSP420_CVT(yuv2_bgr24, out_bgr24)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:340:18: error: incompatible types when assigning to type ?__vector unsigned char? {aka ?__vector(16) unsigned char?} from type ?int?
-  340 |             y1 = vec_xl(0, y2i);                                              \
-      |                  ^~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:442:1: note: in expansion of macro ?DEFCSP420_CVT?
-  442 | DEFCSP420_CVT(yuv2_bgr24, out_bgr24)
-      | ^~~~~~~~~~~~~
-libswscale/ppc/yuv2rgb_altivec.c:442:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-libswscale/ppc/yuv2rgb_altivec.c:442:1: error: can?t convert a value of type ?int? to vector type ?__vector(16) signed char? which has different size
-cc1: some warnings being treated as errors
-
---- external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c.orig	2020-06-15 18:54:24 UTC
-+++ external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c
-@@ -305,6 +305,9 @@ static int altivec_ ## name(SwsContext *c, const unsig
-     vector signed short R1, G1, B1;                                           \
-     vector unsigned char R, G, B;                                             \
-                                                                               \
-+    const vector unsigned char *y1ivP, *y2ivP, *uivP, *vivP;                  \
-+    vector unsigned char align_perm;                                          \
-+                                                                              \
-     vector signed short lCY       = c->CY;                                    \
-     vector signed short lOY       = c->OY;                                    \
-     vector signed short lCRV      = c->CRV;                                   \
-@@ -335,13 +338,26 @@ static int altivec_ ## name(SwsContext *c, const unsig
-         vec_dstst(oute, (0x02000002 | (((w * 3 + 32) / 32) << 16)), 1);       \
-                                                                               \
-         for (j = 0; j < w / 16; j++) {                                        \
--            y0 = vec_xl(0, y1i);                                              \
-+            y1ivP = (const vector unsigned char *) y1i;                       \
-+            y2ivP = (const vector unsigned char *) y2i;                       \
-+            uivP  = (const vector unsigned char *) ui;                        \
-+            vivP  = (const vector unsigned char *) vi;                        \
-                                                                               \
--            y1 = vec_xl(0, y2i);                                              \
-+            align_perm = vec_lvsl(0, y1i);                                    \
-+            y0 = (vector unsigned char)                                       \
-+                     vec_perm(y1ivP[0], y1ivP[1], align_perm);                \
-                                                                               \
--            u = (vector signed char) vec_xl(0, ui);                           \
-+            align_perm = vec_lvsl(0, y2i);                                    \
-+            y1 = (vector unsigned char)                                       \
-+                     vec_perm(y2ivP[0], y2ivP[1], align_perm);                \
-                                                                               \
--            v = (vector signed char) vec_xl(0, vi);                           \
-+            align_perm = vec_lvsl(0, ui);                                     \
-+            u = (vector signed char)                                          \
-+                    vec_perm(uivP[0], uivP[1], align_perm);                   \
-+                                                                              \
-+            align_perm = vec_lvsl(0, vi);                                     \
-+            v = (vector signed char)                                          \
-+                    vec_perm(vivP[0], vivP[1], align_perm);                   \
-                                                                               \
-             u = (vector signed char)                                          \
-                     vec_sub(u,                                                \
diff --git a/multimedia/mythtv/pkg-plist b/multimedia/mythtv/pkg-plist
index a10d3f1ca979..aaa0cfcab48a 100644
--- a/multimedia/mythtv/pkg-plist
+++ b/multimedia/mythtv/pkg-plist
@@ -55,7 +55,6 @@ include/mythtv/libavcodec/version.h
 include/mythtv/libavcodec/version_major.h
 include/mythtv/libavcodec/videotoolbox.h
 include/mythtv/libavcodec/vorbis_parser.h
-include/mythtv/libavcodec/xvmc.h
 include/mythtv/libavdevice/avdevice.h
 include/mythtv/libavdevice/version.h
 include/mythtv/libavdevice/version_major.h
@@ -71,6 +70,7 @@ include/mythtv/libavformat/version_major.h
 include/mythtv/libavutil/adler32.h
 include/mythtv/libavutil/aes.h
 include/mythtv/libavutil/aes_ctr.h
+include/mythtv/libavutil/ambient_viewing_environment.h
 include/mythtv/libavutil/attributes.h
 include/mythtv/libavutil/audio_fifo.h
 include/mythtv/libavutil/avassert.h
@@ -98,6 +98,7 @@ include/mythtv/libavutil/downmix_info.h
 include/mythtv/libavutil/encryption_info.h
 include/mythtv/libavutil/error.h
 include/mythtv/libavutil/eval.h
+include/mythtv/libavutil/executor.h
 include/mythtv/libavutil/ffversion.h
 include/mythtv/libavutil/fifo.h
 include/mythtv/libavutil/file.h
@@ -110,6 +111,7 @@ include/mythtv/libavutil/hmac.h
 include/mythtv/libavutil/hwcontext.h
 include/mythtv/libavutil/hwcontext_cuda.h
 include/mythtv/libavutil/hwcontext_d3d11va.h
+include/mythtv/libavutil/hwcontext_d3d12va.h
 include/mythtv/libavutil/hwcontext_drm.h
 include/mythtv/libavutil/hwcontext_dxva2.h
 include/mythtv/libavutil/hwcontext_mediacodec.h
@@ -119,6 +121,7 @@ include/mythtv/libavutil/hwcontext_vaapi.h
 include/mythtv/libavutil/hwcontext_vdpau.h
 include/mythtv/libavutil/hwcontext_videotoolbox.h
 include/mythtv/libavutil/hwcontext_vulkan.h
+include/mythtv/libavutil/iamf.h
 include/mythtv/libavutil/imgutils.h
 include/mythtv/libavutil/intfloat.h
 include/mythtv/libavutil/intreadwrite.h
@@ -158,6 +161,7 @@ include/mythtv/libavutil/tx.h
 include/mythtv/libavutil/uuid.h
 include/mythtv/libavutil/version.h
 include/mythtv/libavutil/video_enc_params.h
+include/mythtv/libavutil/video_hint.h
 include/mythtv/libavutil/xtea.h
 include/mythtv/libmyth/audio/audioconvert.h
 include/mythtv/libmyth/audio/audiooutput.h
@@ -166,23 +170,17 @@ include/mythtv/libmyth/audio/audiooutpututil.h
 include/mythtv/libmyth/audio/audiosettings.h
 include/mythtv/libmyth/audio/eldutils.h
 include/mythtv/libmyth/audio/volumebase.h
-include/mythtv/libmyth/langsettings.h
 include/mythtv/libmyth/mythaverror.h
+include/mythtv/libmyth/mythavframe.h
 include/mythtv/libmyth/mythcontext.h
 include/mythtv/libmyth/mythexp.h
-include/mythtv/libmyth/mythmediamonitor.h
-include/mythtv/libmyth/mythterminal.h
 include/mythtv/libmyth/output.h
-include/mythtv/libmyth/schemawizard.h
-include/mythtv/libmyth/standardsettings.h
-include/mythtv/libmyth/storagegroupeditor.h
 include/mythtv/libmyth/visual.h
 include/mythtv/libmythbase/autodeletedeque.h
 include/mythtv/libmythbase/bonjourregister.h
 include/mythtv/libmythbase/compat.h
 include/mythtv/libmythbase/dbutil.h
 include/mythtv/libmythbase/exitcodes.h
-include/mythtv/libmythbase/ffmpeg-mmx.h
 include/mythtv/libmythbase/filesysteminfo.h
 include/mythtv/libmythbase/hardwareprofile.h
 include/mythtv/libmythbase/iso3166.h
@@ -232,7 +230,6 @@ include/mythtv/libmythbase/netutils.h
 include/mythtv/libmythbase/programinfo.h
 include/mythtv/libmythbase/programtypeflags.h
 include/mythtv/libmythbase/programtypes.h
-include/mythtv/libmythbase/qtuplift.h
 include/mythtv/libmythbase/recordingstatus.h
 include/mythtv/libmythbase/recordingtypes.h
 include/mythtv/libmythbase/referencecounter.h
@@ -286,77 +283,8 @@ include/mythtv/libmythmetadata/videoscan.h
 include/mythtv/libmythmetadata/videoutils.h
 include/mythtv/libmythmpeg2/mpeg2.h
 include/mythtv/libmythservicecontracts/datacontracthelper.h
-include/mythtv/libmythservicecontracts/datacontracts/artworkInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/artworkInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/backendInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/blurayInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/buildInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/captureCard.h
-include/mythtv/libmythservicecontracts/datacontracts/captureCardList.h
-include/mythtv/libmythservicecontracts/datacontracts/castMember.h
-include/mythtv/libmythservicecontracts/datacontracts/castMemberList.h
-include/mythtv/libmythservicecontracts/datacontracts/channelGroup.h
-include/mythtv/libmythservicecontracts/datacontracts/channelGroupList.h
-include/mythtv/libmythservicecontracts/datacontracts/channelInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/connectionInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/cutList.h
-include/mythtv/libmythservicecontracts/datacontracts/cutting.h
-include/mythtv/libmythservicecontracts/datacontracts/databaseInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/enum.h
-include/mythtv/libmythservicecontracts/datacontracts/enumItem.h
-include/mythtv/libmythservicecontracts/datacontracts/envInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/frontendActionList.h
-include/mythtv/libmythservicecontracts/datacontracts/frontendStatus.h
-include/mythtv/libmythservicecontracts/datacontracts/imageMetadataInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/imageMetadataInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/imageSyncInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/input.h
-include/mythtv/libmythservicecontracts/datacontracts/inputList.h
-include/mythtv/libmythservicecontracts/datacontracts/labelValue.h
-include/mythtv/libmythservicecontracts/datacontracts/lineup.h
-include/mythtv/libmythservicecontracts/datacontracts/liveStreamInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/liveStreamInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/logInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/logMessage.h
-include/mythtv/libmythservicecontracts/datacontracts/logMessageList.h
-include/mythtv/libmythservicecontracts/datacontracts/musicMetadataInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/musicMetadataInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/programAndChannel.h
-include/mythtv/libmythservicecontracts/datacontracts/programGuide.h
-include/mythtv/libmythservicecontracts/datacontracts/recRule.h
-include/mythtv/libmythservicecontracts/datacontracts/recRuleFilter.h
-include/mythtv/libmythservicecontracts/datacontracts/recRuleFilterList.h
-include/mythtv/libmythservicecontracts/datacontracts/recRuleList.h
-include/mythtv/libmythservicecontracts/datacontracts/recording.h
-include/mythtv/libmythservicecontracts/datacontracts/settingList.h
-include/mythtv/libmythservicecontracts/datacontracts/timeZoneInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/titleInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/titleInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/versionInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/videoLookupInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/videoLookupInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/videoMetadataInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/videoMetadataInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/videoMultiplex.h
-include/mythtv/libmythservicecontracts/datacontracts/videoMultiplexList.h
-include/mythtv/libmythservicecontracts/datacontracts/videoSource.h
-include/mythtv/libmythservicecontracts/datacontracts/videoSourceList.h
-include/mythtv/libmythservicecontracts/datacontracts/videoStreamInfo.h
-include/mythtv/libmythservicecontracts/datacontracts/videoStreamInfoList.h
-include/mythtv/libmythservicecontracts/datacontracts/wolInfo.h
 include/mythtv/libmythservicecontracts/service.h
 include/mythtv/libmythservicecontracts/serviceexp.h
-include/mythtv/libmythservicecontracts/services/captureServices.h
-include/mythtv/libmythservicecontracts/services/channelServices.h
-include/mythtv/libmythservicecontracts/services/contentServices.h
-include/mythtv/libmythservicecontracts/services/dvrServices.h
-include/mythtv/libmythservicecontracts/services/frontendServices.h
-include/mythtv/libmythservicecontracts/services/guideServices.h
-include/mythtv/libmythservicecontracts/services/imageServices.h
-include/mythtv/libmythservicecontracts/services/musicServices.h
-include/mythtv/libmythservicecontracts/services/mythServices.h
-include/mythtv/libmythservicecontracts/services/rttiServices.h
-include/mythtv/libmythservicecontracts/services/videoServices.h
 include/mythtv/libmythtv/metadataimagehelper.h
 include/mythtv/libmythtv/mythavutil.h
 include/mythtv/libmythtv/mythframe.h
@@ -374,6 +302,8 @@ include/mythtv/libmythtv/visualisations/goom/mathtools.h
 include/mythtv/libmythtv/visualisations/goom/mmx.h
 include/mythtv/libmythtv/visualisations/goom/tentacle3d.h
 include/mythtv/libmythtv/visualisations/goom/v3d.h
+include/mythtv/libmythui/langsettings.h
+include/mythtv/libmythui/mediamonitor.h
 include/mythtv/libmythui/mythcolourspace.h
 include/mythtv/libmythui/mythdialogbox.h
 include/mythtv/libmythui/mythfontproperties.h
@@ -390,6 +320,7 @@ include/mythtv/libmythui/mythprogressdialog.h
 include/mythtv/libmythui/mythrect.h
 include/mythtv/libmythui/mythscreenstack.h
 include/mythtv/libmythui/mythscreentype.h
+include/mythtv/libmythui/mythterminal.h
 include/mythtv/libmythui/myththemebase.h
 include/mythtv/libmythui/myththemedmenu.h
 include/mythtv/libmythui/mythuiactions.h
@@ -425,6 +356,9 @@ include/mythtv/libmythui/mythuiutils.h
 include/mythtv/libmythui/mythuivideo.h
 include/mythtv/libmythui/mythuiwebbrowser.h
 include/mythtv/libmythui/mythvirtualkeyboard.h
+include/mythtv/libmythui/schemawizard.h
+include/mythtv/libmythui/standardsettings.h
+include/mythtv/libmythui/storagegroupeditor.h
 include/mythtv/libmythui/themeinfo.h
 include/mythtv/libmythui/x11colors.h
 include/mythtv/libmythui/xmlparsebase.h
@@ -471,76 +405,76 @@ include/mythtv/libswscale/version_major.h
 include/mythtv/mythconfig.h
 include/mythtv/mythconfig.mak
 include/mythtv/udfread.h
-lib/libmyth-34.so
-lib/libmyth-34.so.34
-lib/libmyth-34.so.34.0
-lib/libmyth-34.so.34.0.0
+lib/libmyth-35.so
+lib/libmyth-35.so.35
+lib/libmyth-35.so.35.0
+lib/libmyth-35.so.35.0.0
 lib/libmythavcodec.so
-lib/libmythavcodec.so.59
-lib/libmythavcodec.so.59.37.100
+lib/libmythavcodec.so.61
+lib/libmythavcodec.so.61.19.100
 lib/libmythavdevice.so
-lib/libmythavdevice.so.59
-lib/libmythavdevice.so.59.7.100
+lib/libmythavdevice.so.61
+lib/libmythavdevice.so.61.3.100
 lib/libmythavfilter.so
-lib/libmythavfilter.so.8
-lib/libmythavfilter.so.8.44.100
+lib/libmythavfilter.so.10
+lib/libmythavfilter.so.10.4.100
 lib/libmythavformat.so
-lib/libmythavformat.so.59
-lib/libmythavformat.so.59.27.100
+lib/libmythavformat.so.61
+lib/libmythavformat.so.61.7.100
 lib/libmythavutil.so
-lib/libmythavutil.so.57
-lib/libmythavutil.so.57.28.100
-lib/libmythbase-34.so
-lib/libmythbase-34.so.34
-lib/libmythbase-34.so.34.0
-lib/libmythbase-34.so.34.0.0
-lib/libmythfreemheg-34.so
-lib/libmythfreemheg-34.so.34
-lib/libmythfreemheg-34.so.34.0
-lib/libmythfreemheg-34.so.34.0.0
-lib/libmythmetadata-34.so
-lib/libmythmetadata-34.so.34
-lib/libmythmetadata-34.so.34.0
-lib/libmythmetadata-34.so.34.0.0
+lib/libmythavutil.so.59
+lib/libmythavutil.so.59.39.100
+lib/libmythbase-35.so
+lib/libmythbase-35.so.35
+lib/libmythbase-35.so.35.0
+lib/libmythbase-35.so.35.0.0
+lib/libmythfreemheg-35.so
+lib/libmythfreemheg-35.so.35
+lib/libmythfreemheg-35.so.35.0
+lib/libmythfreemheg-35.so.35.0.0
+lib/libmythmetadata-35.so
+lib/libmythmetadata-35.so.35
+lib/libmythmetadata-35.so.35.0
+lib/libmythmetadata-35.so.35.0.0
 lib/libmythpostproc.so
-lib/libmythpostproc.so.56
-lib/libmythpostproc.so.56.6.100
-lib/libmythprotoserver-34.so
-lib/libmythprotoserver-34.so.34
-lib/libmythprotoserver-34.so.34.0
-lib/libmythprotoserver-34.so.34.0.0
-lib/libmythservicecontracts-34.so
-lib/libmythservicecontracts-34.so.34
-lib/libmythservicecontracts-34.so.34.0
-lib/libmythservicecontracts-34.so.34.0.0
+lib/libmythpostproc.so.58
+lib/libmythpostproc.so.58.3.100
+lib/libmythprotoserver-35.so
+lib/libmythprotoserver-35.so.35
+lib/libmythprotoserver-35.so.35.0
+lib/libmythprotoserver-35.so.35.0.0
+lib/libmythservicecontracts-35.so
+lib/libmythservicecontracts-35.so.35
+lib/libmythservicecontracts-35.so.35.0
+lib/libmythservicecontracts-35.so.35.0.0
 lib/libmythswresample.so
-lib/libmythswresample.so.4
-lib/libmythswresample.so.4.7.100
+lib/libmythswresample.so.5
+lib/libmythswresample.so.5.3.100
 lib/libmythswscale.so
-lib/libmythswscale.so.6
-lib/libmythswscale.so.6.7.100
-lib/libmythtv-34.so
-lib/libmythtv-34.so.34
-lib/libmythtv-34.so.34.0
-lib/libmythtv-34.so.34.0.0
-lib/libmythui-34.so
-lib/libmythui-34.so.34
-lib/libmythui-34.so.34.0
-lib/libmythui-34.so.34.0.0
-lib/libmythupnp-34.so
-lib/libmythupnp-34.so.34
-lib/libmythupnp-34.so.34.0
-lib/libmythupnp-34.so.34.0.0
+lib/libmythswscale.so.8
+lib/libmythswscale.so.8.3.100
+lib/libmythtv-35.so
+lib/libmythtv-35.so.35
+lib/libmythtv-35.so.35.0
+lib/libmythtv-35.so.35.0.0
+lib/libmythui-35.so
+lib/libmythui-35.so.35
+lib/libmythui-35.so.35.0
+lib/libmythui-35.so.35.0.0
+lib/libmythupnp-35.so
+lib/libmythupnp-35.so.35
+lib/libmythupnp-35.so.35.0
+lib/libmythupnp-35.so.35.0.0
 %%BINDINGS%%%%SITE_PERL%%/IO/Socket/INET/MythTV.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/Channel.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/Program.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/Recording.pm
 %%BINDINGS%%%%SITE_PERL%%/MythTV/StorageGroup.pm
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-34.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-34.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-34.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-34.0-py%%PYTHON_VER%%.egg-info/top_level.txt
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-35.0-py%%PYTHON_VER%%.egg-info/PKG-INFO
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-35.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-35.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-35.0-py%%PYTHON_VER%%.egg-info/top_level.txt
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__init__.py
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/__init__%%PYTHON_TAG%%.pyc
 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/_conn_mysqldb%%PYTHON_TAG%%.pyc
@@ -2802,9 +2736,7 @@ lib/libmythupnp-34.so.34.0.0
 %%DATADIR%%/html/apps/backend/runtime.js
 %%DATADIR%%/html/apps/backend/styles.css
 %%DATADIR%%/html/apps/frontend.css
-%%DATADIR%%/html/apps/frontend.css.map
 %%DATADIR%%/html/apps/frontend.js
-%%DATADIR%%/html/apps/frontend.js.map
 %%DATADIR%%/html/assets/guidecolors.css
 %%DATADIR%%/html/assets/i18n/bg.json
 %%DATADIR%%/html/assets/i18n/ca.json
@@ -2862,22 +2794,10 @@ lib/libmythupnp-34.so.34.0.0
 %%DATADIR%%/html/assets/themes/fonts/roboto-v20-latin-ext_latin-700.woff2
 %%DATADIR%%/html/assets/themes/fonts/roboto-v20-latin-ext_latin-regular.woff
 %%DATADIR%%/html/assets/themes/fonts/roboto-v20-latin-ext_latin-regular.woff2
-%%DATADIR%%/html/assets/themes/lara-dark-blue.css
-%%DATADIR%%/html/assets/themes/lara-dark-indigo.css
-%%DATADIR%%/html/assets/themes/lara-dark-purple.css
-%%DATADIR%%/html/assets/themes/lara-dark-teal.css
-%%DATADIR%%/html/assets/themes/lara-light-blue.css
-%%DATADIR%%/html/assets/themes/lara-light-indigo.css
-%%DATADIR%%/html/assets/themes/lara-light-purple.css
-%%DATADIR%%/html/assets/themes/lara-light-teal.css
 %%DATADIR%%/html/assets/themes/luna-amber.css
 %%DATADIR%%/html/assets/themes/luna-blue.css
 %%DATADIR%%/html/assets/themes/luna-green.css
 %%DATADIR%%/html/assets/themes/luna-pink.css
-%%DATADIR%%/html/assets/themes/md-dark-deeppurple.css
-%%DATADIR%%/html/assets/themes/md-dark-indigo.css
-%%DATADIR%%/html/assets/themes/md-light-deeppurple.css
-%%DATADIR%%/html/assets/themes/md-light-indigo.css
 %%DATADIR%%/html/assets/themes/mdc-dark-deeppurple.css
 %%DATADIR%%/html/assets/themes/mdc-dark-indigo.css
 %%DATADIR%%/html/assets/themes/mdc-light-deeppurple.css
@@ -3565,11 +3485,20 @@ lib/libmythupnp-34.so.34.0.0
 %%DATADIR%%/metadata/Music/discid/libdiscid.py
 %%DATADIR%%/metadata/Music/discid/track.py
 %%DATADIR%%/metadata/Music/discid/util.py
+%%DATADIR%%/metadata/Music/lyrics/Kodistubs/README
+%%DATADIR%%/metadata/Music/lyrics/Kodistubs/xbmc.py
+%%DATADIR%%/metadata/Music/lyrics/Kodistubs/xbmcaddon.py
+%%DATADIR%%/metadata/Music/lyrics/Kodistubs/xbmcgui.py
+%%DATADIR%%/metadata/Music/lyrics/Kodistubs/xbmcvfs.py
+%%DATADIR%%/metadata/Music/lyrics/LICENSE.txt
 %%DATADIR%%/metadata/Music/lyrics/README
 %%DATADIR%%/metadata/Music/lyrics/azlyrics.py
+%%DATADIR%%/metadata/Music/lyrics/changelog.txt
 %%DATADIR%%/metadata/Music/lyrics/common/__init__.py
-%%DATADIR%%/metadata/Music/lyrics/common/audiofile.py
-%%DATADIR%%/metadata/Music/lyrics/common/utilities.py
+%%DATADIR%%/metadata/Music/lyrics/common/broken.py
+%%DATADIR%%/metadata/Music/lyrics/common/culrcwrap.py
+%%DATADIR%%/metadata/Music/lyrics/common/filelyrics.py
+%%DATADIR%%/metadata/Music/lyrics/common/testall.py
 %%DATADIR%%/metadata/Music/lyrics/darklyrics.py
 %%DATADIR%%/metadata/Music/lyrics/embedlrc.py
 %%DATADIR%%/metadata/Music/lyrics/examples/README
@@ -3578,15 +3507,59 @@ lib/libmythupnp-34.so.34.0.0
 %%DATADIR%%/metadata/Music/lyrics/examples/taglyrics.mp3
 %%DATADIR%%/metadata/Music/lyrics/filelyrics.py
 %%DATADIR%%/metadata/Music/lyrics/genius.py
+%%DATADIR%%/metadata/Music/lyrics/lib/audiofile.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/alsong/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/alsong/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/baidu/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/baidu/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/gomaudio/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/gomaudio/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/lyricsify/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/lyricwiki/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/lyricwiki/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/minilyrics/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/minilyrics/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/ttplayer/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/ttplayer/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/xiami/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/broken-scrapers/xiami/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/azlyrics/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/azlyrics/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/darklyrics/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/darklyrics/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/genius/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/genius/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/lrclib/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/lrclib/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/lyricscom/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/lyricscom/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/lyricsmode/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/lyricsmode/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/megalobiz/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/megalobiz/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/music163/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/music163/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/musixmatch/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/musixmatch/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/musixmatchlrc/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/musixmatchlrc/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/rclyricsband/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/supermusic/__init__.py
+%%DATADIR%%/metadata/Music/lyrics/lib/culrcscrapers/supermusic/lyricsScraper.py
+%%DATADIR%%/metadata/Music/lyrics/lib/embedlrc.py
+%%DATADIR%%/metadata/Music/lyrics/lib/scrapertest.py
+%%DATADIR%%/metadata/Music/lyrics/lib/utils.py
 %%DATADIR%%/metadata/Music/lyrics/lrclib.py
 %%DATADIR%%/metadata/Music/lyrics/lyricscom.py
-%%DATADIR%%/metadata/Music/lyrics/lyricsify.py
 %%DATADIR%%/metadata/Music/lyrics/lyricsmode.py
 %%DATADIR%%/metadata/Music/lyrics/megalobiz.py
 %%DATADIR%%/metadata/Music/lyrics/music163.py
 %%DATADIR%%/metadata/Music/lyrics/musixmatch.py
 %%DATADIR%%/metadata/Music/lyrics/musixmatchlrc.py
+%%DATADIR%%/metadata/Music/lyrics/rclyricsband.py
 %%DATADIR%%/metadata/Music/lyrics/supermusic.py
+%%DATADIR%%/metadata/Music/lyrics/testlyrics.pl
 %%DATADIR%%/metadata/Music/mbutils.py
 %%DATADIR%%/metadata/Music/musicbrainzngs/COPYING
 %%DATADIR%%/metadata/Music/musicbrainzngs/README