From 8e499572c780cdeb3668041f1ad5ca76a93531de Mon Sep 17 00:00:00 2001 From: Alan Hicks Date: Tue, 27 Feb 2024 12:56:28 +0800 Subject: multimedia/mythtv: Update to 34.0, along with related ports multimedia/mythtv Patched to use exiv2 v 2.8 from ports Redundant references to slave port mythtv-frontend removed New Web App interface (http://example.com:6544). Replaces WebFrontend, provides all mythtv-setup access. It is recommended to use the web app instead of mythweb. audio/mythplugin-mythmusic "Play Now" any songs from "Browse Music Library" New Spectrogram and Spectrum full screen visualizations with options Music navigation controls work during full screen visual www/mythplugin-mythweb Version bump ffmpeg v5.1 is still included and required to build mythtv https://www.mythtv.org/wiki/Release_Notes_-_34 PR: 277335 --- audio/mythplugin-mythmusic/Makefile | 5 +- audio/mythplugin-mythmusic/distinfo | 6 +- multimedia/mythtv/Makefile | 9 +- multimedia/mythtv/distinfo | 6 +- multimedia/mythtv/files/patch-configure | 11 +++ .../patch-libs_libmythtv_recorders_dvbchannel.cpp | 11 --- multimedia/mythtv/pkg-plist | 101 ++++++++++++--------- www/mythplugin-mythweb/Makefile | 4 +- www/mythplugin-mythweb/distinfo | 6 +- 9 files changed, 81 insertions(+), 78 deletions(-) create mode 100644 multimedia/mythtv/files/patch-configure delete mode 100644 multimedia/mythtv/files/patch-libs_libmythtv_recorders_dvbchannel.cpp diff --git a/audio/mythplugin-mythmusic/Makefile b/audio/mythplugin-mythmusic/Makefile index cf66d399e80b..5e1166bb98f5 100644 --- a/audio/mythplugin-mythmusic/Makefile +++ b/audio/mythplugin-mythmusic/Makefile @@ -1,7 +1,6 @@ PORTNAME= mythmusic DISTVERSIONPREFIX= v -DISTVERSION= 33.1 -PORTREVISION= 1 +DISTVERSION= 34.0 CATEGORIES= audio PKGNAMEPREFIX= mythplugin- @@ -15,7 +14,7 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ libmp3lame.so:audio/lame \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ - libmyth-33.so:multimedia/mythtv + libmyth-34.so:multimedia/mythtv USES= gmake qt:5 shebangfix USE_GITHUB= yes diff --git a/audio/mythplugin-mythmusic/distinfo b/audio/mythplugin-mythmusic/distinfo index a3cacb20382e..817a516dabd2 100644 --- a/audio/mythplugin-mythmusic/distinfo +++ b/audio/mythplugin-mythmusic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676811612 -SHA256 (MythTV-mythtv-v33.1_GH0.tar.gz) = 64abc966adf03a6764ba26e8314f4667420af1b2c4dff7f3000393de1651cd3b -SIZE (MythTV-mythtv-v33.1_GH0.tar.gz) = 116920982 +TIMESTAMP = 1708697729 +SHA256 (MythTV-mythtv-v34.0_GH0.tar.gz) = 1c0a0f9ae190468d07ebfb534c720ef8c62811148a9f928c56876e9fdbd5d6bf +SIZE (MythTV-mythtv-v34.0_GH0.tar.gz) = 118820346 diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 99824aa16f7c..5733489accc8 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -1,7 +1,6 @@ PORTNAME= mythtv DISTVERSIONPREFIX= v -DISTVERSION= 33.1 -PORTREVISION= 6 +DISTVERSION= 34.0 PORTEPOCH= 1 CATEGORIES= multimedia @@ -164,7 +163,6 @@ post-patch: ${WRKSRC}/programs/scripts/database/mythconverg_backup.pl \ ${WRKSRC}/programs/scripts/database/mythconverg_restore.pl \ ${WRKSRC}/programs/mythcommflag/mythcommflag-analyze -.if !defined(SLAVEPORT) # Header file from: # https://git.linuxtv.org/media_tree.git/tree/include/uapi/linux/dvb @${MKDIR} ${LINUXDVB} @@ -219,19 +217,14 @@ post-patch: -e 's|/usr/bin/perl|${LOCALBASE}/bin/perl|g' \ -e 's|__user||g' \ ${LINUXDVB}/frontend.h -.endif pre-install: -.if !defined(SLAVEPORT) @${REINPLACE_CMD} -e '/^CPPFLAGS=/ s#$$# -I${LOCALBASE}/include#' \ ${WRKSRC}/libs/libmythbase/mythconfig.mak -.endif post-install: -.if !defined(SLAVEPORT) @${MKDIR} ${STAGEDIR}${PREFIX}/share/mythtv/database ${INSTALL_DATA} ${WRKSRC}/database/mc.sql ${STAGEDIR}${PREFIX}/share/mythtv/database -.endif @${FIND} ${STAGEDIR}${PREFIX}/bin -type f -exec ${SH} -c "${FILE} -i '{}' | \ ${GREP} -q 'x-executable; charset=binary'" \; -print | ${XARGS} ${STRIP_CMD} @${FIND} ${STAGEDIR}${PREFIX}/lib -type f -name lib\*.so.\* | ${XARGS} ${STRIP_CMD} diff --git a/multimedia/mythtv/distinfo b/multimedia/mythtv/distinfo index 9969820dc9ab..817a516dabd2 100644 --- a/multimedia/mythtv/distinfo +++ b/multimedia/mythtv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676732853 -SHA256 (MythTV-mythtv-v33.1_GH0.tar.gz) = 64abc966adf03a6764ba26e8314f4667420af1b2c4dff7f3000393de1651cd3b -SIZE (MythTV-mythtv-v33.1_GH0.tar.gz) = 116920982 +TIMESTAMP = 1708697729 +SHA256 (MythTV-mythtv-v34.0_GH0.tar.gz) = 1c0a0f9ae190468d07ebfb534c720ef8c62811148a9f928c56876e9fdbd5d6bf +SIZE (MythTV-mythtv-v34.0_GH0.tar.gz) = 118820346 diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure new file mode 100644 index 000000000000..1479055767a4 --- /dev/null +++ b/multimedia/mythtv/files/patch-configure @@ -0,0 +1,11 @@ +--- 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-libs_libmythtv_recorders_dvbchannel.cpp b/multimedia/mythtv/files/patch-libs_libmythtv_recorders_dvbchannel.cpp deleted file mode 100644 index 27cf5d5857ec..000000000000 --- a/multimedia/mythtv/files/patch-libs_libmythtv_recorders_dvbchannel.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- libs/libmythtv/recorders/dvbchannel.cpp.orig 2023-05-09 18:32:34 UTC -+++ libs/libmythtv/recorders/dvbchannel.cpp -@@ -1589,7 +1589,7 @@ bool DVBChannel::WaitForBackend(std::chrono::milliseco - const int fd = m_fdFrontend; - auto seconds = duration_cast(timeout_ms); - auto usecs = duration_cast(timeout_ms) - seconds; -- struct timeval select_timeout = { seconds.count(), usecs.count()}; -+ struct timeval select_timeout = { seconds.count(), static_cast(usecs.count())}; - fd_set fd_select_set; - FD_ZERO( &fd_select_set); // NOLINT(readability-isolate-declaration) - FD_SET (fd, &fd_select_set); diff --git a/multimedia/mythtv/pkg-plist b/multimedia/mythtv/pkg-plist index 1bca48de840a..4eca2aa57b54 100644 --- a/multimedia/mythtv/pkg-plist +++ b/multimedia/mythtv/pkg-plist @@ -471,10 +471,10 @@ include/mythtv/libswscale/version_major.h include/mythtv/mythconfig.h include/mythtv/mythconfig.mak include/mythtv/udfread.h -lib/libmyth-33.so -lib/libmyth-33.so.33 -lib/libmyth-33.so.33.0 -lib/libmyth-33.so.33.0.0 +lib/libmyth-34.so +lib/libmyth-34.so.34 +lib/libmyth-34.so.34.0 +lib/libmyth-34.so.34.0.0 lib/libmythavcodec.so lib/libmythavcodec.so.59 lib/libmythavcodec.so.59.37.100 @@ -490,60 +490,61 @@ lib/libmythavformat.so.59.27.100 lib/libmythavutil.so 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/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/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/libmythpostproc.so 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/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/libmythswresample.so lib/libmythswresample.so.4 lib/libmythswresample.so.4.7.100 lib/libmythswscale.so 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 +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 %%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-33.0-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-33.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-33.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV-33.0-py%%PYTHON_VER%%.egg-info/top_level.txt +%%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/__init__.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/_conn_mysqldb%%PYTHON_EXT_SUFFIX%%.pyc +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/_versions%%PYTHON_EXT_SUFFIX%%.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/altdict%%PYTHON_EXT_SUFFIX%%.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/connections%%PYTHON_EXT_SUFFIX%%.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/database%%PYTHON_EXT_SUFFIX%%.pyc @@ -556,6 +557,7 @@ lib/libmythupnp-33.so.33.0.0 %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/static%%PYTHON_EXT_SUFFIX%%.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/__pycache__/system%%PYTHON_EXT_SUFFIX%%.pyc %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/_conn_mysqldb.py +%%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/_versions.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/altdict.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/connections.py %%BINDINGS%%%%PYTHON_SITELIBDIR%%/MythTV/database.py @@ -2791,7 +2793,9 @@ lib/libmythupnp-33.so.33.0.0 %%DATADIR%%/html/3rdParty/primeicons-5.0.0/raw-svg/youtube.svg %%DATADIR%%/html/3rdParty/primeicons-5.0.0/selection.json %%DATADIR%%/html/apps/backend/3rdpartylicenses.txt +%%DATADIR%%/html/apps/backend/color.png %%DATADIR%%/html/apps/backend/favicon.ico +%%DATADIR%%/html/apps/backend/hue.png %%DATADIR%%/html/apps/backend/index.html %%DATADIR%%/html/apps/backend/main.js %%DATADIR%%/html/apps/backend/polyfills.js @@ -2801,6 +2805,7 @@ lib/libmythupnp-33.so.33.0.0 %%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 %%DATADIR%%/html/assets/i18n/cs.json @@ -3171,6 +3176,9 @@ lib/libmythupnp-33.so.33.0.0 %%DATADIR%%/html/images/locale/zm.png %%DATADIR%%/html/images/locale/zw.png %%DATADIR%%/html/images/menu-button-bg.gif +%%DATADIR%%/html/images/metadata/themoviedb.svg +%%DATADIR%%/html/images/metadata/thetvdb.png +%%DATADIR%%/html/images/metadata/tvmaze.png %%DATADIR%%/html/images/mythtv.png %%DATADIR%%/html/images/themes/arya-blue.png %%DATADIR%%/html/images/themes/arya-green.png @@ -3558,8 +3566,7 @@ lib/libmythupnp-33.so.33.0.0 %%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/azlyrics.py %%DATADIR%%/metadata/Music/lyrics/common/__init__.py %%DATADIR%%/metadata/Music/lyrics/common/audiofile.py %%DATADIR%%/metadata/Music/lyrics/common/utilities.py @@ -3571,11 +3578,15 @@ lib/libmythupnp-33.so.33.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/gomaudio.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/lyricswiki.py -%%DATADIR%%/metadata/Music/lyrics/ttplayer.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/supermusic.py %%DATADIR%%/metadata/Music/mbutils.py %%DATADIR%%/metadata/Music/musicbrainzngs/COPYING %%DATADIR%%/metadata/Music/musicbrainzngs/README diff --git a/www/mythplugin-mythweb/Makefile b/www/mythplugin-mythweb/Makefile index 73e7feb1d19f..7ae492fbc01d 100644 --- a/www/mythplugin-mythweb/Makefile +++ b/www/mythplugin-mythweb/Makefile @@ -1,7 +1,7 @@ PORTNAME= mythweb DISTVERSIONPREFIX= v -DISTVERSION= 33.1-0 -DISTVERSIONSUFFIX= -g92f0f9b +DISTVERSION= 34.0 +DISTVERSIONSUFFIX= -g92f0f9bc CATEGORIES= www PKGNAMEPREFIX= mythplugin- diff --git a/www/mythplugin-mythweb/distinfo b/www/mythplugin-mythweb/distinfo index bf2ca9ccc6fa..50dafafec8cb 100644 --- a/www/mythplugin-mythweb/distinfo +++ b/www/mythplugin-mythweb/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676813268 -SHA256 (MythTV-mythweb-v33.1-0-g92f0f9b_GH0.tar.gz) = 6d77d5206086bad4c4277c1257ab075b288910751c9537f93312c195865f2e8a -SIZE (MythTV-mythweb-v33.1-0-g92f0f9b_GH0.tar.gz) = 1797381 +TIMESTAMP = 1708793048 +SHA256 (MythTV-mythweb-v34.0-g92f0f9bc_GH0.tar.gz) = f6c3c4abed0d751fe75894ba5ccfcdd6d886c57185b41cd6168402530d39f886 +SIZE (MythTV-mythweb-v34.0-g92f0f9bc_GH0.tar.gz) = 1797490 -- cgit v1.2.3