Created attachment 233243 [details] Patch to update to 32 This updates the MythTV family to version 32 audio/mythplugin-mythmusic multimedia/mythtv-frontend multimedia/mythtv www/mythplugin-mythweb https://github.com/MythTV/mythtv/tree/fixes/32 Branch fixes/32 hence change to: +DISTVERSION= 32.0-21 +DISTVERSIONSUFFIX= -gbbd8355d8d Coding standards have been bumped to C++17 https://www.mythtv.org/wiki/Coding_Standards Barf mythconfig.mak pre-install to allow building mythplugin-mythmusic Take maintainership of mythplugin-mythmusic https://www.mythtv.org/wiki/Release_Notes_-_32
Poudriere logs https://p-o.co.uk/downloads/mythtv-32.0.21,1.log https://p-o.co.uk/downloads/mythplugin-mythmusic-32.0.21.log https://p-o.co.uk/downloads/mythtv-frontend-32.0.21,1.log https://p-o.co.uk/downloads/mythplugin-mythweb-32.0.40.log
Created attachment 235087 [details] Updates the MythTV family to version 32 Updates the MythTV family to the latest 32.0 https://www.mythtv.org/wiki/Release_Notes_-_32 Poudriere log files https://p-o.co.uk/downloads/mythtv-32.0.46,1.log (3.4m) https://p-o.co.uk/downloads/mythplugin-mythmusic-32.0.46.log (241k) https://p-o.co.uk/downloads/mythplugin-mythweb-32.0.42.log (20k)
Created attachment 236054 [details] Updates the MythTV family to version 32 - does not build in poudriere As there are build failures for version 31, this WIP is offered as interim. This patch updates and build in /usr/ports/ but does not build in poudriere It is provided for those who need version 32
Created attachment 236335 [details] Upgrade mythtv family from 31 to 32 Poudriere logs: https://p-o.co.uk/downloads/mythtv-32.0.60,1.log (3.4Mb) https://p-o.co.uk/downloads/mythtv-frontend-32.0.60_3,1.log (2.7M) https://p-o.co.uk/downloads/mythplugin-mythmusic-32.0.60.log (248K) https://p-o.co.uk/downloads/mythplugin-mythweb-32.0.40.log (20k) In addition to a version bump, freetype2 pulls in pulls in archivers/brotli that adds -I/usr/local/include This causes issues as the locally installed ffmpeg is seen before the one included with and required by mythtv
Committed!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=bcdd480bd6aced5eeb9b47bbb773754df450cc63 commit bcdd480bd6aced5eeb9b47bbb773754df450cc63 Author: Alan Hicks <ahicks@p-o.co.uk> AuthorDate: 2022-09-04 00:05:02 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-09-04 00:08:15 +0000 MythTV: Update port group to version 32 PR: 263311 audio/mythplugin-mythmusic/Makefile | 10 +- audio/mythplugin-mythmusic/distinfo | 6 +- .../files/patch-configure (gone) | 24 - .../files/patch-settings.pro (gone) | 12 - multimedia/mythtv-frontend/pkg-plist | 2518 +++++++++++++++++- multimedia/mythtv/Makefile | 36 +- multimedia/mythtv/distinfo | 6 +- .../mythtv/files/extrapatch-programs_programs.pro | 10 +- .../files/patch-bindings-python-setup.py (gone) | 10 - multimedia/mythtv/files/patch-dav1d-1.0 (gone) | 111 - ...FFmpeg_libswscale_ppc_swscale__altivec.c (gone) | 55 - ...nal_FFmpeg_libswscale_ppc_swscale__vsx.c (gone) | 1268 ---------- .../patch-libs_libmythui_mythpainter.cpp (gone) | 10 - multimedia/mythtv/pkg-plist | 2672 +++++++++++++++++++- www/mythplugin-mythweb/Makefile | 4 +- www/mythplugin-mythweb/distinfo | 6 +- www/mythplugin-mythweb/pkg-plist | 36 +- 17 files changed, 5089 insertions(+), 1705 deletions(-)
The following fragment of the patch got missed, it adds files/patch-configure and ensures the port's ffmpeg is called before the locally installed one: diff --git a/multimedia/mythtv/files/patch-configure b/multimedia/mythtv/files/patch-configure new file mode 100644 index 0000000000..5949bca281 --- /dev/null +++ b/multimedia/mythtv/files/patch-configure @@ -0,0 +1,11 @@ +--- 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 +