git: 3c275abe771a - main - */myth*: update the mythtv family of ports to 33.1

From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Tue, 11 Apr 2023 23:04:15 UTC
The branch main has been updated by fuz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c275abe771ac68aea284c473a4850a78224b4b7

commit 3c275abe771ac68aea284c473a4850a78224b4b7
Author:     Alan Hicks <ahicks@p-o.co.uk>
AuthorDate: 2023-04-08 10:37:08 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2023-04-11 23:02:41 +0000

    */myth*: update the mythtv family of ports to 33.1
    
    Selected upstream changes:
    
     - The minimum Qt version has been bumped from 5.9 to 5.12
     - FFmpeg upgraded to version 5.1
     - New Waveform visualisation for MythMusic
     - DiSEqC support for SAT>IP
     - Automatic channel groups per video source
     - Nearly 300 continued code modernization and restructuring (not in commits below)
     - Version 2 of the Services API is under development
    
    Changelog: https://www.mythtv.org/wiki/Release_Notes_-_33
    
    PR:             270344
---
 audio/mythplugin-mythmusic/Makefile                |  13 +-
 audio/mythplugin-mythmusic/distinfo                |   6 +-
 .../mythplugin-mythmusic/files/patch-settings.pro  |  11 +
 multimedia/mythtv-frontend/pkg-plist               | 505 +++++++++++----------
 multimedia/mythtv/Makefile                         |  16 +-
 multimedia/mythtv/distinfo                         |   6 +-
 .../mythtv/files/extrapatch-programs_programs.pro  |  24 -
 multimedia/mythtv/files/patch-configure            |  11 -
 ...ternal_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c |  11 -
 .../patch-libs_libmyth_audio_audiooutpututil.cpp   |  14 -
 .../files/patch-libs_libmyth_audio_eldutils.cpp    |  17 -
 .../patch-libs_libmythtv_io_mythavformatwriter.cpp |  11 -
 ...ibs_libmythtv_recorders_NuppelVideoRecorder.cpp |  19 -
 multimedia/mythtv/files/pkg-message.in             |   6 +-
 multimedia/mythtv/pkg-descr                        |   4 -
 multimedia/mythtv/pkg-plist                        | 458 +++++++++----------
 www/mythplugin-mythweb/Makefile                    |   5 +-
 www/mythplugin-mythweb/distinfo                    |   6 +-
 18 files changed, 513 insertions(+), 630 deletions(-)

diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile
index 20942bb8ed0d..b54213f0da21 100644
--- a/audio/mythplugin-mythmusic/Makefile
+++ b/audio/mythplugin-mythmusic/Makefile
@@ -1,12 +1,10 @@
 PORTNAME=	mythmusic
 DISTVERSIONPREFIX=	v
-DISTVERSION=	32.0-60
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-ge5c974e402
+DISTVERSION=	33.1
 CATEGORIES=	audio
 PKGNAMEPREFIX=	mythplugin-
 
-MAINTAINER?=	ahicks@p-o.co.uk
+MAINTAINER=	ahicks@p-o.co.uk
 COMMENT=	Music playing plugin for MythTV
 WWW=		https://www.mythtv.org/wiki/MythMusic
 
@@ -16,14 +14,15 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libmp3lame.so:audio/lame \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
-		libmyth-32.so:multimedia/mythtv
+		libmyth-33.so:multimedia/mythtv
 
-USES=		gmake qt:5
+USES=		gmake qt:5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 GH_PROJECT=	mythtv
 USE_LDCONFIG=	yes
 USE_QT=		buildtools:build core gui qmake:build sql widgets xml
+SHEBANG_FILES=	../mythtv/programs/scripts/metadata/Music/mbutils.py
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
@@ -37,7 +36,7 @@ DESTDIRNAME=	INSTALL_ROOT
 PLIST_SUB=	MYTHSHARE="share/mythtv"
 WRKSRC_SUBDIR=	mythplugins
 
-OPTIONS_DEFINE=	CDIO FFTW
+OPTIONS_DEFINE=	CDIO
 
 CDIO_LIB_DEPENDS=	libcdio.so:sysutils/libcdio \
 			libcdio_paranoia.so:sysutils/libcdio-paranoia
diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo
index a98649d9313a..a3cacb20382e 100644
--- a/audio/mythplugin-mythmusic/distinfo
+++ b/audio/mythplugin-mythmusic/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1662209393
-SHA256 (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = fe4f06933a855969f05766946372e19af6527cdc47a58b4c36e426d737b4412e
-SIZE (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = 115969769
+TIMESTAMP = 1676811612
+SHA256 (MythTV-mythtv-v33.1_GH0.tar.gz) = 64abc966adf03a6764ba26e8314f4667420af1b2c4dff7f3000393de1651cd3b
+SIZE (MythTV-mythtv-v33.1_GH0.tar.gz) = 116920982
diff --git a/audio/mythplugin-mythmusic/files/patch-settings.pro b/audio/mythplugin-mythmusic/files/patch-settings.pro
new file mode 100644
index 000000000000..4eed071e9511
--- /dev/null
+++ b/audio/mythplugin-mythmusic/files/patch-settings.pro
@@ -0,0 +1,11 @@
+--- settings.pro.orig	2023-03-19 16:48:43.345465000 +0000
++++ settings.pro	2023-03-19 16:42:27.786115000 +0000
+@@ -8,7 +8,7 @@
+ include(settings2.pro)
+ 
+ MY_INSTALL_INCLUDE = $${SYSROOT}$${PREFIX}/include
+-!contains(MY_INSTALL_INCLUDE, /usr/include$) {
++!contains(MY_INSTALL_INCLUDE, /usr/local/include$) {
+     INCLUDEPATH += $${SYSROOT}$${PREFIX}/include
+ }
+ 
diff --git a/multimedia/mythtv-frontend/pkg-plist b/multimedia/mythtv-frontend/pkg-plist
index 226b5faedd1a..b6c6bbc0e91e 100644
--- a/multimedia/mythtv-frontend/pkg-plist
+++ b/multimedia/mythtv-frontend/pkg-plist
@@ -1,29 +1,26 @@
 bin/mythavtest
+bin/mythbackend
 bin/mythccextractor
 bin/mythcommflag
+bin/mythexternrecorder
 bin/mythffmpeg
 bin/mythffprobe
+bin/mythfilerecorder
+bin/mythfilldatabase
 bin/mythfrontend
 bin/mythjobqueue
 bin/mythlcdserver
 bin/mythmediaserver
+bin/mythmetadatalookup
 bin/mythpreviewgen
 bin/mythreplex
 bin/mythscreenwizard
 bin/mythshutdown
 bin/mythtranscode
+bin/mythtv-setup
 bin/mythutil
 bin/mythwelcome
-include/mythtv/audioconvert.h
-include/mythtv/audiooutput.h
-include/mythtv/audiooutputsettings.h
-include/mythtv/audiooutpututil.h
-include/mythtv/audiosettings.h
-include/mythtv/autodeletedeque.h
 include/mythtv/blockinput.h
-include/mythtv/bonjourregister.h
-include/mythtv/compat.h
-include/mythtv/dbutil.h
 include/mythtv/dvdnav/dvd_types.h
 include/mythtv/dvdnav/dvdnav.h
 include/mythtv/dvdnav/dvdnav_events.h
@@ -32,8 +29,6 @@ include/mythtv/dvdread/ifo_read.h
 include/mythtv/dvdread/ifo_types.h
 include/mythtv/dvdread/nav_read.h
 include/mythtv/dvdread/nav_types.h
-include/mythtv/eldutils.h
-include/mythtv/exitcodes.h
 include/mythtv/exiv2/basicio.hpp
 include/mythtv/exiv2/bigtiffimage.hpp
 include/mythtv/exiv2/bmpimage.hpp
@@ -75,25 +70,6 @@ include/mythtv/exiv2/version.hpp
 include/mythtv/exiv2/webpimage.hpp
 include/mythtv/exiv2/xmp_exiv2.hpp
 include/mythtv/exiv2/xmpsidecar.hpp
-include/mythtv/ffmpeg-mmx.h
-include/mythtv/filesysteminfo.h
-include/mythtv/goom/drawmethods.h
-include/mythtv/goom/filters.h
-include/mythtv/goom/goom_core.h
-include/mythtv/goom/goom_tools.h
-include/mythtv/goom/goomconfig.h
-include/mythtv/goom/graphic.h
-include/mythtv/goom/ifs.h
-include/mythtv/goom/lines.h
-include/mythtv/goom/mathtools.h
-include/mythtv/goom/mmx.h
-include/mythtv/goom/tentacle3d.h
-include/mythtv/goom/v3d.h
-include/mythtv/hardwareprofile.h
-include/mythtv/iso3166.h
-include/mythtv/iso639.h
-include/mythtv/langsettings.h
-include/mythtv/lcddevice.h
 include/mythtv/libavcodec/ac3_parser.h
 include/mythtv/libavcodec/adts_parser.h
 include/mythtv/libavcodec/avcodec.h
@@ -105,6 +81,7 @@ include/mythtv/libavcodec/codec_desc.h
 include/mythtv/libavcodec/codec_id.h
 include/mythtv/libavcodec/codec_par.h
 include/mythtv/libavcodec/d3d11va.h
+include/mythtv/libavcodec/defs.h
 include/mythtv/libavcodec/dirac.h
 include/mythtv/libavcodec/dv_profile.h
 include/mythtv/libavcodec/dxva2.h
@@ -112,21 +89,24 @@ include/mythtv/libavcodec/jni.h
 include/mythtv/libavcodec/mediacodec.h
 include/mythtv/libavcodec/packet.h
 include/mythtv/libavcodec/qsv.h
-include/mythtv/libavcodec/vaapi.h
 include/mythtv/libavcodec/vdpau.h
 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
 include/mythtv/libavfilter/avfilter.h
 include/mythtv/libavfilter/buffersink.h
 include/mythtv/libavfilter/buffersrc.h
 include/mythtv/libavfilter/version.h
+include/mythtv/libavfilter/version_major.h
 include/mythtv/libavformat/avformat.h
 include/mythtv/libavformat/avio.h
 include/mythtv/libavformat/version.h
+include/mythtv/libavformat/version_major.h
 include/mythtv/libavutil/adler32.h
 include/mythtv/libavutil/aes.h
 include/mythtv/libavutil/aes_ctr.h
@@ -147,7 +127,9 @@ include/mythtv/libavutil/channel_layout.h
 include/mythtv/libavutil/common.h
 include/mythtv/libavutil/cpu.h
 include/mythtv/libavutil/crc.h
+include/mythtv/libavutil/csp.h
 include/mythtv/libavutil/des.h
+include/mythtv/libavutil/detection_bbox.h
 include/mythtv/libavutil/dict.h
 include/mythtv/libavutil/display.h
 include/mythtv/libavutil/dovi_meta.h
@@ -162,6 +144,7 @@ include/mythtv/libavutil/film_grain_params.h
 include/mythtv/libavutil/frame.h
 include/mythtv/libavutil/hash.h
 include/mythtv/libavutil/hdr_dynamic_metadata.h
+include/mythtv/libavutil/hdr_dynamic_vivid_metadata.h
 include/mythtv/libavutil/hmac.h
 include/mythtv/libavutil/hwcontext.h
 include/mythtv/libavutil/hwcontext_cuda.h
@@ -211,36 +194,28 @@ include/mythtv/libavutil/timestamp.h
 include/mythtv/libavutil/tree.h
 include/mythtv/libavutil/twofish.h
 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/xtea.h
-include/mythtv/libmyth/audioconvert.h
-include/mythtv/libmyth/audiooutput.h
-include/mythtv/libmyth/audiooutputsettings.h
-include/mythtv/libmyth/audiooutpututil.h
-include/mythtv/libmyth/audiosettings.h
-include/mythtv/libmyth/eldutils.h
+include/mythtv/libmyth/audio/audioconvert.h
+include/mythtv/libmyth/audio/audiooutput.h
+include/mythtv/libmyth/audio/audiooutputsettings.h
+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/mythcontext.h
 include/mythtv/libmyth/mythexp.h
 include/mythtv/libmyth/mythmediamonitor.h
-include/mythtv/libmyth/mythrssmanager.h
 include/mythtv/libmyth/mythterminal.h
-include/mythtv/libmyth/netgrabbermanager.h
-include/mythtv/libmyth/netutils.h
 include/mythtv/libmyth/output.h
-include/mythtv/libmyth/programinfo.h
-include/mythtv/libmyth/programtypeflags.h
-include/mythtv/libmyth/programtypes.h
-include/mythtv/libmyth/recordingtypes.h
-include/mythtv/libmyth/remoteutil.h
-include/mythtv/libmyth/rssparse.h
 include/mythtv/libmyth/schemawizard.h
 include/mythtv/libmyth/standardsettings.h
 include/mythtv/libmyth/storagegroupeditor.h
 include/mythtv/libmyth/visual.h
-include/mythtv/libmyth/volumebase.h
 include/mythtv/libmythbase/autodeletedeque.h
 include/mythtv/libmythbase/bonjourregister.h
 include/mythtv/libmythbase/compat.h
@@ -259,8 +234,6 @@ include/mythtv/libmythbase/mythbaseexp.h
 include/mythtv/libmythbase/mythcdrom.h
 include/mythtv/libmythbase/mythchrono.h
 include/mythtv/libmythbase/mythcommandlineparser.h
-include/mythtv/libmythbase/mythconfig.h
-include/mythtv/libmythbase/mythconfig.mak
 include/mythtv/libmythbase/mythcorecontext.h
 include/mythtv/libmythbase/mythcoreutil.h
 include/mythtv/libmythbase/mythdate.h
@@ -279,6 +252,7 @@ include/mythtv/libmythbase/mythmiscutil.h
 include/mythtv/libmythbase/mythobservable.h
 include/mythtv/libmythbase/mythplugin.h
 include/mythtv/libmythbase/mythpluginapi.h
+include/mythtv/libmythbase/mythpluginexport.h
 include/mythtv/libmythbase/mythrandom.h
 include/mythtv/libmythbase/mythsession.h
 include/mythtv/libmythbase/mythsingledownload.h
@@ -292,15 +266,64 @@ include/mythtv/libmythbase/mythtimer.h
 include/mythtv/libmythbase/mythtranslation.h
 include/mythtv/libmythbase/mythtypes.h
 include/mythtv/libmythbase/mythversion.h
+include/mythtv/libmythbase/netgrabbermanager.h
+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
 include/mythtv/libmythbase/referencecounterlist.h
 include/mythtv/libmythbase/remotefile.h
+include/mythtv/libmythbase/remoteutil.h
+include/mythtv/libmythbase/rssmanager.h
+include/mythtv/libmythbase/rssparse.h
 include/mythtv/libmythbase/serverpool.h
 include/mythtv/libmythbase/signalhandling.h
+include/mythtv/libmythbase/sizetliteral.h
 include/mythtv/libmythbase/storagegroup.h
+include/mythtv/libmythbase/stringutil.h
 include/mythtv/libmythbase/threadedfilewriter.h
+include/mythtv/libmythbase/unziputil.h
 include/mythtv/libmythbase/verbosedefs.h
 include/mythtv/libmythbase/version.h
+include/mythtv/libmythmetadata/bluraymetadata.h
+include/mythtv/libmythmetadata/cleanup.h
+include/mythtv/libmythmetadata/dbaccess.h
+include/mythtv/libmythmetadata/dirscan.h
+include/mythtv/libmythmetadata/globals.h
+include/mythtv/libmythmetadata/imagemanager.h
+include/mythtv/libmythmetadata/imagemetadata.h
+include/mythtv/libmythmetadata/imagetypes.h
+include/mythtv/libmythmetadata/lyricsdata.h
+include/mythtv/libmythmetadata/metadatacommon.h
+include/mythtv/libmythmetadata/metadatadownload.h
+include/mythtv/libmythmetadata/metadatafactory.h
+include/mythtv/libmythmetadata/metadatagrabber.h
+include/mythtv/libmythmetadata/metadataimagedownload.h
+include/mythtv/libmythmetadata/metaio.h
+include/mythtv/libmythmetadata/metaioavfcomment.h
+include/mythtv/libmythmetadata/metaioflacvorbis.h
+include/mythtv/libmythmetadata/metaioid3.h
+include/mythtv/libmythmetadata/metaiomp4.h
+include/mythtv/libmythmetadata/metaiooggvorbis.h
+include/mythtv/libmythmetadata/metaiotaglib.h
+include/mythtv/libmythmetadata/metaiowavpack.h
+include/mythtv/libmythmetadata/musicfilescanner.h
+include/mythtv/libmythmetadata/musicmetadata.h
+include/mythtv/libmythmetadata/musicutils.h
+include/mythtv/libmythmetadata/mythmetaexp.h
+include/mythtv/libmythmetadata/mythuiimageresults.h
+include/mythtv/libmythmetadata/mythuimetadataresults.h
+include/mythtv/libmythmetadata/parentalcontrols.h
+include/mythtv/libmythmetadata/quicksp.h
+include/mythtv/libmythmetadata/videometadata.h
+include/mythtv/libmythmetadata/videometadatalistmanager.h
+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
@@ -360,7 +383,6 @@ 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/enums/recStatus.h
 include/mythtv/libmythservicecontracts/service.h
 include/mythtv/libmythservicecontracts/serviceexp.h
 include/mythtv/libmythservicecontracts/services/captureServices.h
@@ -374,6 +396,23 @@ 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
+include/mythtv/libmythtv/mythtvexp.h
+include/mythtv/libmythtv/playgroup.h
+include/mythtv/libmythtv/visualisations/goom/drawmethods.h
+include/mythtv/libmythtv/visualisations/goom/filters.h
+include/mythtv/libmythtv/visualisations/goom/goom_core.h
+include/mythtv/libmythtv/visualisations/goom/goom_tools.h
+include/mythtv/libmythtv/visualisations/goom/goomconfig.h
+include/mythtv/libmythtv/visualisations/goom/graphic.h
+include/mythtv/libmythtv/visualisations/goom/ifs.h
+include/mythtv/libmythtv/visualisations/goom/lines.h
+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/mythcolourspace.h
 include/mythtv/libmythui/mythdialogbox.h
 include/mythtv/libmythui/mythfontproperties.h
@@ -428,221 +467,120 @@ include/mythtv/libmythui/mythvirtualkeyboard.h
 include/mythtv/libmythui/themeinfo.h
 include/mythtv/libmythui/x11colors.h
 include/mythtv/libmythui/xmlparsebase.h
+include/mythtv/libmythupnp/bufferedsocketdevice.h
+include/mythtv/libmythupnp/eventing.h
+include/mythtv/libmythupnp/htmlserver.h
+include/mythtv/libmythupnp/httprequest.h
+include/mythtv/libmythupnp/httpserver.h
+include/mythtv/libmythupnp/mmembuf.h
+include/mythtv/libmythupnp/mythxmlclient.h
+include/mythtv/libmythupnp/serializers/jsonSerializer.h
+include/mythtv/libmythupnp/serializers/serializer.h
+include/mythtv/libmythupnp/serializers/soapSerializer.h
+include/mythtv/libmythupnp/serializers/xmlSerializer.h
+include/mythtv/libmythupnp/serverSideScripting.h
+include/mythtv/libmythupnp/servicehost.h
+include/mythtv/libmythupnp/soapclient.h
+include/mythtv/libmythupnp/ssdp.h
+include/mythtv/libmythupnp/ssdpcache.h
+include/mythtv/libmythupnp/taskqueue.h
+include/mythtv/libmythupnp/upnp.h
+include/mythtv/libmythupnp/upnpcds.h
+include/mythtv/libmythupnp/upnpcdsobjects.h
+include/mythtv/libmythupnp/upnpcmgr.h
+include/mythtv/libmythupnp/upnpdevice.h
+include/mythtv/libmythupnp/upnphelpers.h
+include/mythtv/libmythupnp/upnpsubscription.h
+include/mythtv/libmythupnp/upnptaskcache.h
+include/mythtv/libmythupnp/upnptaskevent.h
+include/mythtv/libmythupnp/upnptasknotify.h
+include/mythtv/libmythupnp/upnptasksearch.h
+include/mythtv/libmythupnp/upnputil.h
+include/mythtv/libmythupnp/wsdl.h
+include/mythtv/libmythupnp/xsd.h
 include/mythtv/libpostproc/postprocess.h
 include/mythtv/libpostproc/version.h
+include/mythtv/libpostproc/version_major.h
 include/mythtv/libswresample/swresample.h
 include/mythtv/libswresample/version.h
+include/mythtv/libswresample/version_major.h
 include/mythtv/libswscale/swscale.h
 include/mythtv/libswscale/version.h
-include/mythtv/loggingserver.h
-include/mythtv/metadata/bluraymetadata.h
-include/mythtv/metadata/cleanup.h
-include/mythtv/metadata/dbaccess.h
-include/mythtv/metadata/dirscan.h
-include/mythtv/metadata/globals.h
-include/mythtv/metadata/imagemanager.h
-include/mythtv/metadata/imagemetadata.h
-include/mythtv/metadata/imagetypes.h
-include/mythtv/metadata/lyricsdata.h
-include/mythtv/metadata/metadatacommon.h
-include/mythtv/metadata/metadatadownload.h
-include/mythtv/metadata/metadatafactory.h
-include/mythtv/metadata/metadatagrabber.h
-include/mythtv/metadata/metadataimagedownload.h
-include/mythtv/metadata/metaio.h
-include/mythtv/metadata/metaioavfcomment.h
-include/mythtv/metadata/metaioflacvorbis.h
-include/mythtv/metadata/metaioid3.h
-include/mythtv/metadata/metaiomp4.h
-include/mythtv/metadata/metaiooggvorbis.h
-include/mythtv/metadata/metaiotaglib.h
-include/mythtv/metadata/metaiowavpack.h
-include/mythtv/metadata/musicfilescanner.h
-include/mythtv/metadata/musicmetadata.h
-include/mythtv/metadata/musicutils.h
-include/mythtv/metadata/mythmetaexp.h
-include/mythtv/metadata/mythuiimageresults.h
-include/mythtv/metadata/mythuimetadataresults.h
-include/mythtv/metadata/parentalcontrols.h
-include/mythtv/metadata/quicksp.h
-include/mythtv/metadata/videometadata.h
-include/mythtv/metadata/videometadatalistmanager.h
-include/mythtv/metadata/videoscan.h
-include/mythtv/metadata/videoutils.h
-include/mythtv/metadataimagehelper.h
-include/mythtv/mpeg2dec/mpeg2.h
-include/mythtv/mthread.h
-include/mythtv/mthreadpool.h
-include/mythtv/mythaverror.h
-include/mythtv/mythavutil.h
-include/mythtv/mythbaseexp.h
-include/mythtv/mythcdrom.h
-include/mythtv/mythchrono.h
-include/mythtv/mythcommandlineparser.h
+include/mythtv/libswscale/version_major.h
 include/mythtv/mythconfig.h
 include/mythtv/mythconfig.mak
-include/mythtv/mythcontext.h
-include/mythtv/mythcorecontext.h
-include/mythtv/mythcoreutil.h
-include/mythtv/mythdate.h
-include/mythtv/mythdb.h
-include/mythtv/mythdbcheck.h
-include/mythtv/mythdbcon.h
-include/mythtv/mythdbparams.h
-include/mythtv/mythdeque.h
-include/mythtv/mythdirs.h
-include/mythtv/mythdownloadmanager.h
-include/mythtv/mythevent.h
-include/mythtv/mythexp.h
-include/mythtv/mythframe.h
-include/mythtv/mythlocale.h
-include/mythtv/mythlogging.h
-include/mythtv/mythmedia.h
-include/mythtv/mythmediamonitor.h
-include/mythtv/mythmiscutil.h
-include/mythtv/mythobservable.h
-include/mythtv/mythplugin.h
-include/mythtv/mythpluginapi.h
-include/mythtv/mythrandom.h
-include/mythtv/mythrssmanager.h
-include/mythtv/mythsession.h
-include/mythtv/mythsingledownload.h
-include/mythtv/mythsocket.h
-include/mythtv/mythsocket_cb.h
-include/mythtv/mythsorthelper.h
-include/mythtv/mythstorage.h
-include/mythtv/mythsystem.h
-include/mythtv/mythsystemlegacy.h
-include/mythtv/mythterminal.h
-include/mythtv/mythtimer.h
-include/mythtv/mythtranslation.h
-include/mythtv/mythtvexp.h
-include/mythtv/mythtypes.h
-include/mythtv/mythversion.h
-include/mythtv/netgrabbermanager.h
-include/mythtv/netutils.h
-include/mythtv/output.h
-include/mythtv/playgroup.h
-include/mythtv/programinfo.h
-include/mythtv/programtypeflags.h
-include/mythtv/programtypes.h
-include/mythtv/recordingtypes.h
-include/mythtv/referencecounter.h
-include/mythtv/referencecounterlist.h
-include/mythtv/remotefile.h
-include/mythtv/remoteutil.h
-include/mythtv/rssparse.h
-include/mythtv/schemawizard.h
-include/mythtv/serverpool.h
-include/mythtv/signalhandling.h
-include/mythtv/standardsettings.h
-include/mythtv/storagegroup.h
-include/mythtv/storagegroupeditor.h
-include/mythtv/threadedfilewriter.h
 include/mythtv/udfread.h
-include/mythtv/upnp/bufferedsocketdevice.h
-include/mythtv/upnp/eventing.h
-include/mythtv/upnp/htmlserver.h
-include/mythtv/upnp/httprequest.h
-include/mythtv/upnp/httpserver.h
-include/mythtv/upnp/jsonSerializer.h
-include/mythtv/upnp/mmembuf.h
-include/mythtv/upnp/mythxmlclient.h
-include/mythtv/upnp/serializer.h
-include/mythtv/upnp/serverSideScripting.h
-include/mythtv/upnp/servicehost.h
-include/mythtv/upnp/soapSerializer.h
-include/mythtv/upnp/soapclient.h
-include/mythtv/upnp/ssdp.h
-include/mythtv/upnp/ssdpcache.h
-include/mythtv/upnp/taskqueue.h
-include/mythtv/upnp/upnp.h
-include/mythtv/upnp/upnpcds.h
-include/mythtv/upnp/upnpcdsobjects.h
-include/mythtv/upnp/upnpcmgr.h
-include/mythtv/upnp/upnpdevice.h
-include/mythtv/upnp/upnphelpers.h
-include/mythtv/upnp/upnpsubscription.h
-include/mythtv/upnp/upnptaskcache.h
-include/mythtv/upnp/upnptaskevent.h
-include/mythtv/upnp/upnptasknotify.h
-include/mythtv/upnp/upnptasksearch.h
-include/mythtv/upnp/upnputil.h
-include/mythtv/upnp/wsdl.h
-include/mythtv/upnp/xmlSerializer.h
-include/mythtv/upnp/xsd.h
-include/mythtv/verbosedefs.h
-include/mythtv/version.h
-include/mythtv/visual.h
-include/mythtv/volumebase.h
-lib/libmyth-32.so
-lib/libmyth-32.so.32
-lib/libmyth-32.so.32.0
-lib/libmyth-32.so.32.0.0
+lib/libmyth-33.so
+lib/libmyth-33.so.33
+lib/libmyth-33.so.33.0
+lib/libmyth-33.so.33.0.0
 lib/libmythavcodec.so
-lib/libmythavcodec.so.58
-lib/libmythavcodec.so.58.134.100
+lib/libmythavcodec.so.59
+lib/libmythavcodec.so.59.37.100
 lib/libmythavdevice.so
-lib/libmythavdevice.so.58
-lib/libmythavdevice.so.58.13.100
+lib/libmythavdevice.so.59
+lib/libmythavdevice.so.59.7.100
 lib/libmythavfilter.so
-lib/libmythavfilter.so.7
-lib/libmythavfilter.so.7.110.100
+lib/libmythavfilter.so.8
+lib/libmythavfilter.so.8.44.100
 lib/libmythavformat.so
-lib/libmythavformat.so.58
-lib/libmythavformat.so.58.76.100
+lib/libmythavformat.so.59
+lib/libmythavformat.so.59.27.100
 lib/libmythavutil.so
-lib/libmythavutil.so.56
-lib/libmythavutil.so.56.70.100
-lib/libmythbase-32.so
-lib/libmythbase-32.so.32
-lib/libmythbase-32.so.32.0
-lib/libmythbase-32.so.32.0.0
+lib/libmythavutil.so.57
+lib/libmythavutil.so.57.28.100
+lib/libmythbase-33.so
+lib/libmythbase-33.so.33
+lib/libmythbase-33.so.33.0
+lib/libmythbase-33.so.33.0.0
 lib/libmythexiv2-0.28.so
-lib/libmythexiv2-0.28.so.32
-lib/libmythexiv2-0.28.so.32.0
-lib/libmythexiv2-0.28.so.32.0.0
-lib/libmythfreemheg-32.so
-lib/libmythfreemheg-32.so.32
-lib/libmythfreemheg-32.so.32.0
-lib/libmythfreemheg-32.so.32.0.0
-lib/libmythmetadata-32.so
-lib/libmythmetadata-32.so.32
-lib/libmythmetadata-32.so.32.0
-lib/libmythmetadata-32.so.32.0.0
+lib/libmythexiv2-0.28.so.33
+lib/libmythexiv2-0.28.so.33.0
+lib/libmythexiv2-0.28.so.33.0.0
+lib/libmythfreemheg-33.so
+lib/libmythfreemheg-33.so.33
+lib/libmythfreemheg-33.so.33.0
+lib/libmythfreemheg-33.so.33.0.0
+lib/libmythmetadata-33.so
+lib/libmythmetadata-33.so.33
+lib/libmythmetadata-33.so.33.0
+lib/libmythmetadata-33.so.33.0.0
 lib/libmythpostproc.so
-lib/libmythpostproc.so.55
-lib/libmythpostproc.so.55.9.100
-lib/libmythprotoserver-32.so
-lib/libmythprotoserver-32.so.32
-lib/libmythprotoserver-32.so.32.0
-lib/libmythprotoserver-32.so.32.0.0
-lib/libmythservicecontracts-32.so
-lib/libmythservicecontracts-32.so.32
-lib/libmythservicecontracts-32.so.32.0
-lib/libmythservicecontracts-32.so.32.0.0
+lib/libmythpostproc.so.56
+lib/libmythpostproc.so.56.6.100
+lib/libmythprotoserver-33.so
+lib/libmythprotoserver-33.so.33
+lib/libmythprotoserver-33.so.33.0
+lib/libmythprotoserver-33.so.33.0.0
+lib/libmythservicecontracts-33.so
+lib/libmythservicecontracts-33.so.33
+lib/libmythservicecontracts-33.so.33.0
+lib/libmythservicecontracts-33.so.33.0.0
 lib/libmythswresample.so
-lib/libmythswresample.so.3
-lib/libmythswresample.so.3.9.100
+lib/libmythswresample.so.4
+lib/libmythswresample.so.4.7.100
 lib/libmythswscale.so
-lib/libmythswscale.so.5
-lib/libmythswscale.so.5.9.100
-lib/libmythtv-32.so
-lib/libmythtv-32.so.32
-lib/libmythtv-32.so.32.0
-lib/libmythtv-32.so.32.0.0
-lib/libmythui-32.so
-lib/libmythui-32.so.32
-lib/libmythui-32.so.32.0
-lib/libmythui-32.so.32.0.0
-lib/libmythupnp-32.so
-lib/libmythupnp-32.so.32
-lib/libmythupnp-32.so.32.0
-lib/libmythupnp-32.so.32.0.0
+lib/libmythswscale.so.6
+lib/libmythswscale.so.6.7.100
+lib/libmythtv-33.so
+lib/libmythtv-33.so.33
+lib/libmythtv-33.so.33.0
+lib/libmythtv-33.so.33.0.0
+lib/libmythui-33.so
+lib/libmythui-33.so.33
+lib/libmythui-33.so.33.0
+lib/libmythui-33.so.33.0.0
+lib/libmythupnp-33.so
+lib/libmythupnp-33.so.33
+lib/libmythupnp-33.so.33.0
+lib/libmythupnp-33.so.33.0.0
 %%DATADIR%%/CDS_scpd.xml
 %%DATADIR%%/CMGR_scpd.xml
 %%DATADIR%%/MFEXML_scpd.xml
 %%DATADIR%%/MSRR_scpd.xml
+%%DATADIR%%/MXML_scpd.xml
+%%DATADIR%%/backend-config/config_backend_database.xml
+%%DATADIR%%/backend-config/config_backend_general.xml
 %%DATADIR%%/bindings/php/MythBackend.php
 %%DATADIR%%/bindings/php/MythBase.php
 %%DATADIR%%/bindings/php/MythFrontend.php
@@ -651,6 +589,15 @@ lib/libmythupnp-32.so.32.0.0
 %%DATADIR%%/bindings/php/MythTVProgram.php
 %%DATADIR%%/bindings/php/MythTVRecording.php
 %%DATADIR%%/bindings/php/MythTVStorageGroup.php
+%%DATADIR%%/devicemaster.xml
+%%DATADIR%%/deviceslave.xml
+%%DATADIR%%/externrecorder/ffmpeg-channels.conf
+%%DATADIR%%/externrecorder/ffmpeg.conf
+%%DATADIR%%/externrecorder/gstreamer-sdi.conf
+%%DATADIR%%/externrecorder/twitch-channels.conf
+%%DATADIR%%/externrecorder/twitch.conf
+%%DATADIR%%/externrecorder/vlc-channels.conf
+%%DATADIR%%/externrecorder/vlc.conf
 %%DATADIR%%/fonts/DroidSans-Bold.ttf
 %%DATADIR%%/fonts/DroidSans.ttf
 %%DATADIR%%/fonts/DroidSansMono.ttf
@@ -2735,6 +2682,37 @@ lib/libmythupnp-32.so.32.0.0
 %%DATADIR%%/html/apps/frontend.css.map
 %%DATADIR%%/html/apps/frontend.js
 %%DATADIR%%/html/apps/frontend.js.map
+%%DATADIR%%/html/assets/i18n/bg.json
+%%DATADIR%%/html/assets/i18n/ca.json
+%%DATADIR%%/html/assets/i18n/cs.json
+%%DATADIR%%/html/assets/i18n/da.json
+%%DATADIR%%/html/assets/i18n/de.json
+%%DATADIR%%/html/assets/i18n/el.json
+%%DATADIR%%/html/assets/i18n/en_CA.json
+%%DATADIR%%/html/assets/i18n/en_GB.json
+%%DATADIR%%/html/assets/i18n/en_US.json
+%%DATADIR%%/html/assets/i18n/es.json
+%%DATADIR%%/html/assets/i18n/es_ES.json
+%%DATADIR%%/html/assets/i18n/et.json
+%%DATADIR%%/html/assets/i18n/fi.json
+%%DATADIR%%/html/assets/i18n/fr.json
+%%DATADIR%%/html/assets/i18n/he.json
+%%DATADIR%%/html/assets/i18n/hr.json
+%%DATADIR%%/html/assets/i18n/hu.json
+%%DATADIR%%/html/assets/i18n/is.json
+%%DATADIR%%/html/assets/i18n/it.json
+%%DATADIR%%/html/assets/i18n/ja.json
+%%DATADIR%%/html/assets/i18n/nb.json
+%%DATADIR%%/html/assets/i18n/nl.json
+%%DATADIR%%/html/assets/i18n/pl.json
+%%DATADIR%%/html/assets/i18n/pt.json
+%%DATADIR%%/html/assets/i18n/pt_BR.json
+%%DATADIR%%/html/assets/i18n/ru.json
+%%DATADIR%%/html/assets/i18n/sl.json
+%%DATADIR%%/html/assets/i18n/sv.json
+%%DATADIR%%/html/assets/i18n/tr.json
+%%DATADIR%%/html/assets/i18n/zh_CN.json
+%%DATADIR%%/html/assets/i18n/zh_HK.json
 %%DATADIR%%/html/assets/themes/arya-blue.css
 %%DATADIR%%/html/assets/themes/arya-green.css
 %%DATADIR%%/html/assets/themes/arya-orange.css
@@ -3301,6 +3279,47 @@ lib/libmythupnp-32.so.32.0.0
 %%DATADIR%%/locales/ru_ru.xml
 %%DATADIR%%/locales/zh_hk.xml
 %%DATADIR%%/locales/zh_tw.xml
+%%DATADIR%%/metadata/Music/discid/.gitignore
+%%DATADIR%%/metadata/Music/discid/COPYING.LESSER
+%%DATADIR%%/metadata/Music/discid/README
+%%DATADIR%%/metadata/Music/discid/__init__.py
+%%DATADIR%%/metadata/Music/discid/disc.py
+%%DATADIR%%/metadata/Music/discid/libdiscid.py
+%%DATADIR%%/metadata/Music/discid/track.py
+%%DATADIR%%/metadata/Music/discid/util.py
+%%DATADIR%%/metadata/Music/lyrics/README
+%%DATADIR%%/metadata/Music/lyrics/alsong.py
+%%DATADIR%%/metadata/Music/lyrics/baidu.py
+%%DATADIR%%/metadata/Music/lyrics/common/.gitignore
+%%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/darklyrics.py
+%%DATADIR%%/metadata/Music/lyrics/embedlrc.py
+%%DATADIR%%/metadata/Music/lyrics/examples/README
+%%DATADIR%%/metadata/Music/lyrics/examples/filelyrics.lrc
+%%DATADIR%%/metadata/Music/lyrics/examples/filelyrics.mp3
+%%DATADIR%%/metadata/Music/lyrics/examples/taglyrics.mp3
+%%DATADIR%%/metadata/Music/lyrics/filelyrics.py
+%%DATADIR%%/metadata/Music/lyrics/genius.py
+%%DATADIR%%/metadata/Music/lyrics/gomaudio.py
+%%DATADIR%%/metadata/Music/lyrics/lyricscom.py
+%%DATADIR%%/metadata/Music/lyrics/lyricsmode.py
+%%DATADIR%%/metadata/Music/lyrics/lyricswiki.py
+%%DATADIR%%/metadata/Music/lyrics/ttplayer.py
+%%DATADIR%%/metadata/Music/mbutils.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/.gitignore
+%%DATADIR%%/metadata/Music/musicbrainzngs/COPYING
+%%DATADIR%%/metadata/Music/musicbrainzngs/README
+%%DATADIR%%/metadata/Music/musicbrainzngs/__init__.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/caa.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/compat.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/mbxml.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/musicbrainz.py
+%%DATADIR%%/metadata/Music/musicbrainzngs/util.py
+%%DATADIR%%/mythconverg_backup.pl
+%%DATADIR%%/mythconverg_restore.pl
+%%DATADIR%%/setup.xml
 %%DATADIR%%/themes/DVR/dvr-preview.png
 %%DATADIR%%/themes/DVR/main_settings.xml
 %%DATADIR%%/themes/DVR/mainmenu.xml
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 9de9fb51153c..e5a6fe50914b 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -1,8 +1,6 @@
 PORTNAME=	mythtv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	32.0-60
-DISTVERSIONSUFFIX=	-ge5c974e402
-PORTREVISION=	4
+DISTVERSION=	33.1
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 
@@ -45,7 +43,8 @@ BUILD_DEPENDS=	yasm:devel/yasm \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 
 USES=		compiler:c++17-lang gmake gl iconv libtool pkgconfig pathfix \
-		qmake:no_env qt:5 ssl xorg
+		perl5 python:3.5+ qmake:no_env qt:5 shebangfix ssl xorg
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	MythTV
 USE_GL=		gl
@@ -53,7 +52,10 @@ USE_LDCONFIG=	yes
 USE_QT=		buildtools:build core dbus gui imageformats:run \
 		linguist:build multimedia network opengl qmake:build script \
 		sql sql-mysql:run webkit widgets xml
+USE_PERL5=	run build
 USE_XORG=	x11 xv xrandr xxf86vm xinerama xext xcb
+SHEBANG_FILES=	programs/scripts/database/*.pl \
+		programs/scripts/metadata/Music/mbutils.py
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --cc="${CC}" --cxx="${CXX}" \
@@ -81,16 +83,13 @@ CONFLICTS_INSTALL=	mythtv
 CONFIGURE_ARGS+=--disable-dvb --disable-firewire --disable-hdhomerun \
 		--without-bindings=perl,python
 
-EXTRA_PATCHES=	${.CURDIR}/../../multimedia/mythtv/files/extrapatch-programs_programs.pro
-
 OPTIONS_EXCLUDE+=	BINDINGS LIRC MYSQL
+PLIST_SUB+=	MYTHBACKEND="@comment "
 .else
 CONFLICTS_INSTALL=	mythtv-frontend
 
 RUN_DEPENDS+=	tv_check:textproc/p5-xmltv \
 		wget:ftp/wget
-USES+=		perl5 python:3.5+ shebangfix
-USE_PERL5=	run build
 USE_RC_SUBR=	mythbackend
 SHEBANG_FILES=	programs/scripts/database/*.pl \
 		programs/scripts/internetcontent/*.py \
@@ -108,6 +107,7 @@ GROUPS=		mythtv
 
 DATADIR=	${PREFIX}/share/mythtv
 SUB_FILES=	pkg-message
+PLIST_SUB+=	MYTHBACKEND=""
 .endif
 
 OPTIONS_DEFINE=		BINDINGS HDHOMERUN JACK LIRC MYSQL PULSEAUDIO VDPAU
diff --git a/multimedia/mythtv/distinfo b/multimedia/mythtv/distinfo
index c991c2ad0d4b..9969820dc9ab 100644
--- a/multimedia/mythtv/distinfo
+++ b/multimedia/mythtv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660634284
-SHA256 (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = fe4f06933a855969f05766946372e19af6527cdc47a58b4c36e426d737b4412e
-SIZE (MythTV-mythtv-v32.0-60-ge5c974e402_GH0.tar.gz) = 115969769
+TIMESTAMP = 1676732853
+SHA256 (MythTV-mythtv-v33.1_GH0.tar.gz) = 64abc966adf03a6764ba26e8314f4667420af1b2c4dff7f3000393de1651cd3b
+SIZE (MythTV-mythtv-v33.1_GH0.tar.gz) = 116920982
diff --git a/multimedia/mythtv/files/extrapatch-programs_programs.pro b/multimedia/mythtv/files/extrapatch-programs_programs.pro
deleted file mode 100644
index 46e402056af8..000000000000
--- a/multimedia/mythtv/files/extrapatch-programs_programs.pro
+++ /dev/null
@@ -1,24 +0,0 @@
-Disable backend components for multimedia/mythtv-frontend
-
---- programs/programs.pro.orig	2018-01-11 12:39:22 UTC
-+++ programs/programs.pro
-@@ -19,21 +19,6 @@
-     unix:QMAKE_EXTRA_TARGETS += mythfrontend-test
- }
- 
--using_backend {
--    SUBDIRS += mythbackend mythfilldatabase mythtv-setup 
--    SUBDIRS += mythmetadatalookup
--
--    !win32-msvc*:SUBDIRS += scripts
--    !mingw:!win32-msvc*: SUBDIRS += mythfilerecorder
--    !mingw:!win32-msvc*: SUBDIRS += mythexternrecorder
--
--    # unit tests mythbackend
--    mythbackend-test.depends = sub-mythbackend
--    mythbackend-test.target = buildtestmythbackend
--    mythbackend-test.commands = cd mythbackend/test && $(QMAKE) && $(MAKE)
--    unix:QMAKE_EXTRA_TARGETS += mythbackend-test
--}
--
- using_mythtranscode: SUBDIRS += mythtranscode
diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure
deleted file mode 100644
index 9f829109ec11..000000000000
--- a/multimedia/mythtv/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure  2022-09-02 15:59:37.029607000 +0100
-+++ work/mythtv-32.0-60-ge5c974e402/mythtv/configure   2022-09-02 16:15:16.034232000 +0100
-@@ -7786,7 +7786,7 @@
- fi
- 
- if enabled freetype2; then
--    echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags freetype2)" >> $TMPMAK
-+    echo "FREETYPE_CFLAGS=$($pkg_config --cflags $pkg_config_flags freetype2 |awk '{print $1, $2}')" >> $TMPMAK
-     echo "FREETYPE_LIBS=$($pkg_config --libs $pkg_config_flags freetype2)" >> $TMPMAK
- fi
-
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 d9938c7f7fc5..000000000000
--- a/multimedia/mythtv/files/patch-external_FFmpeg_libswscale_ppc_yuv2rgb__altivec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c.orig	2022-09-13 01:58:14 UTC
-+++ external/FFmpeg/libswscale/ppc/yuv2rgb_altivec.c
-@@ -284,7 +284,7 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector s
-  * ------------------------------------------------------------------------------
-  */
- 
--#if !HAVE_VSX
-+#if !HAVE_VSX && !defined(__clang__)
- static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
- {
-     const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
diff --git a/multimedia/mythtv/files/patch-libs_libmyth_audio_audiooutpututil.cpp b/multimedia/mythtv/files/patch-libs_libmyth_audio_audiooutpututil.cpp
deleted file mode 100644
index 8b3a653f828e..000000000000
--- a/multimedia/mythtv/files/patch-libs_libmyth_audio_audiooutpututil.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- libs/libmyth/audio/audiooutpututil.cpp.orig	2022-08-13 16:59:56 UTC
-+++ libs/libmyth/audio/audiooutpututil.cpp
-@@ -212,9 +212,9 @@ char *AudioOutputUtil::GeneratePinkFrames(char *frames
-                     static_cast<float>(0x03fffffff);
-                 int32_t ires = res;
-                 if (bits == 16)
--                    *samp16++ = qToLittleEndian<int16_t>(ires >> 16);
-+                    *samp16++ = qToLittleEndian<qint16>(ires >> 16);
-                 else
--                    *samp32++ = qToLittleEndian<int32_t>(ires);
-+                    *samp32++ = qToLittleEndian<qint32>(ires);
-             }
-             else
-             {
diff --git a/multimedia/mythtv/files/patch-libs_libmyth_audio_eldutils.cpp b/multimedia/mythtv/files/patch-libs_libmyth_audio_eldutils.cpp
deleted file mode 100644
index b88b52454706..000000000000
--- a/multimedia/mythtv/files/patch-libs_libmyth_audio_eldutils.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- libs/libmyth/audio/eldutils.cpp.orig	2022-08-13 16:59:56 UTC
-+++ libs/libmyth/audio/eldutils.cpp
-@@ -257,11 +257,11 @@ int eld::update_eld(const char *buf, int size)
*** 751 LINES SKIPPED ***