diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-07-24 07:03:50 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-07-24 07:03:50 +0000 |
| commit | a2361b1f4420f07a01571ffc124de5123ca4b0a1 (patch) | |
| tree | 09c25c65507187a014c7dc3db614b56d5bc914dc /media-tv/mythtv | |
| parent | ad7a9ff5544f85de6a54047d6a94942c2ba30cc5 (diff) | |
| download | baldeagleos-repo-a2361b1f4420f07a01571ffc124de5123ca4b0a1.tar.gz baldeagleos-repo-a2361b1f4420f07a01571ffc124de5123ca4b0a1.tar.xz baldeagleos-repo-a2361b1f4420f07a01571ffc124de5123ca4b0a1.zip | |
Adding metadata
Diffstat (limited to 'media-tv/mythtv')
| -rw-r--r-- | media-tv/mythtv/Manifest | 2 | ||||
| -rw-r--r-- | media-tv/mythtv/files/mythtv-35.Fix-Qt6-compilation-on-Fedora-rawhide.patch | 108 | ||||
| -rw-r--r-- | media-tv/mythtv/mythtv-35.0_p20250723.ebuild (renamed from media-tv/mythtv/mythtv-35.0-r1.ebuild) | 17 |
3 files changed, 15 insertions, 112 deletions
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest index 9fb837da2419..b4588cfbf198 100644 --- a/media-tv/mythtv/Manifest +++ b/media-tv/mythtv/Manifest @@ -1 +1 @@ -DIST mythtv-35.0.tar.gz 120302443 BLAKE2B 0997262ebc586e500824bee738b0a3e47aa7f04f0b7e03afbdda1f67d8b8134f712af29bcd289d317d253160c36ab423aac509700d3e74d538c8b7ccb04cae40 SHA512 7a4f44400bb0a1739fb713a3e3f82dfe2e18f97103d97331b01948bc5a9f01be964076ea5f6dc68d54aa3a0e4ec95ad833cc2080e4ff79c020d991e8f5c1e28d +DIST mythtv-35.0_p20250723.tar.gz 120241715 BLAKE2B 92fc026c1e7e467c0a67a59f758978b7a67321d4b006881734b4e409081cadfae3efd6c51bf00fa6e0f15b456acb6c146e8b8e2f45b9817998876fe9dfcd6945 SHA512 80186f767fe54132171ddfdb2ab6fc4268f2519dfc80af43a07b7e61206b7c3d4a66ae344f47eca33a6bd74d143e2ea6755a83d5f971770122544701aa9fee5a diff --git a/media-tv/mythtv/files/mythtv-35.Fix-Qt6-compilation-on-Fedora-rawhide.patch b/media-tv/mythtv/files/mythtv-35.Fix-Qt6-compilation-on-Fedora-rawhide.patch deleted file mode 100644 index f7947fc6bac9..000000000000 --- a/media-tv/mythtv/files/mythtv-35.Fix-Qt6-compilation-on-Fedora-rawhide.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 80ebec6e2760f5d2a5faccdf3904cb35514cb318 Mon Sep 17 00:00:00 2001 -From: David Hampton <mythtv@love2code.net> -Date: Tue, 1 Apr 2025 09:08:30 -0400 -Subject: [PATCH] Fix Qt6 compilation on Fedora rawhide. - -The latest version of Qt6 has removed some overrides for QString::arg -and Qchar::Qchar causing compilation to break. Change the existing -casts on these function calls to use a different override that still -exists. - -diff --git a/libs/libmythtv/channelutil.cpp b/libs/libmythtv/channelutil.cpp -index ad3184c7e7..a07c942fa9 100644 ---- a/libs/libmythtv/channelutil.cpp -+++ b/libs/libmythtv/channelutil.cpp -@@ -62,7 +62,7 @@ static uint get_dtv_multiplex(uint db_source_id, const QString& sistandard, - { - query.bindValue(":TRANSPORTID", transport_id); - query.bindValue(":NETWORKID", network_id); -- query.bindValue(":POLARITY", QChar(polarity)); -+ query.bindValue(":POLARITY", static_cast<uint>(polarity)); - } - - if (!query.exec() || !query.isActive()) -@@ -102,7 +102,7 @@ static uint insert_dtv_multiplex( - QString("dbid:%1 std:'%2' ").arg(db_source_id).arg(sistandard) + - QString("freq:%1 mod:%2 ").arg(frequency).arg(modulation) + - QString("tid:%1 nid:%2 ").arg(transport_id).arg(network_id) + -- QString("pol:%1 msys:%2 ...)").arg(QChar(polarity)).arg(mod_sys) + -+ QString("pol:%1 msys:%2 ...)").arg(static_cast<uint>(polarity)).arg(mod_sys) + - QString("mplexid:%1").arg(mplex)); - - bool isDVB = (sistandard.toLower() == "dvb"); -@@ -208,7 +208,7 @@ static uint insert_dtv_multiplex( - { - query.bindValue(":TRANSPORTID", transport_id); - query.bindValue(":NETWORKID", network_id); -- query.bindValue(":WHEREPOLARITY", QChar(polarity)); -+ query.bindValue(":WHEREPOLARITY", static_cast<uint>(polarity)); - } - else - { -diff --git a/libs/libmythtv/mheg/dsmcccache.cpp b/libs/libmythtv/mheg/dsmcccache.cpp -index 9bda76811d..2113d758ef 100644 ---- a/libs/libmythtv/mheg/dsmcccache.cpp -+++ b/libs/libmythtv/mheg/dsmcccache.cpp -@@ -54,7 +54,7 @@ QString DSMCCCacheKey::toString() const - { - QString result; - for (int i = 0; i < 4 && i < size(); i++) -- result += QString("%1").arg(at(i), 2, 16, QChar('0')); -+ result += QString("%1").arg(static_cast<uint>(at(i)), 2, 16, QChar('0')); - return result; - } - -diff --git a/libs/libmythtv/mheg/mhi.cpp b/libs/libmythtv/mheg/mhi.cpp -index a6771bd0e5..0ba13d1889 100644 ---- a/libs/libmythtv/mheg/mhi.cpp -+++ b/libs/libmythtv/mheg/mhi.cpp -@@ -1299,7 +1299,7 @@ QRect MHIText::GetBounds(const QString &str, int &strLen, int maxSize) - if (glyphIndex == 0) - { - LOG(VB_MHEG, LOG_INFO, QString("[mhi] Unknown glyph 0x%1") -- .arg(ch.unicode(),0,16)); -+ .arg(static_cast<short>(ch.unicode()),0,16)); - previous = 0; - continue; - } -diff --git a/libs/libmythtv/mpeg/mpegdescriptors.cpp b/libs/libmythtv/mpeg/mpegdescriptors.cpp -index 752c0bcaf2..5585787698 100644 ---- a/libs/libmythtv/mpeg/mpegdescriptors.cpp -+++ b/libs/libmythtv/mpeg/mpegdescriptors.cpp -@@ -839,7 +839,7 @@ void RegistrationDescriptor::InitializeDescriptionMap(void) - - for (uint i = 0; i <= 99; i++) - { -- description_map[QString("US%1").arg(i, 2, QLatin1Char('0'))] = -+ description_map[QString("US%1").arg(i, 2, 16, QLatin1Char('0'))] = - "NIMA, Unspecified military application"; - } - -diff --git a/libs/libmythtv/recorders/hlsstreamhandler.cpp b/libs/libmythtv/recorders/hlsstreamhandler.cpp -index 2d85b6b19b..0f25f80457 100644 ---- a/libs/libmythtv/recorders/hlsstreamhandler.cpp -+++ b/libs/libmythtv/recorders/hlsstreamhandler.cpp -@@ -181,7 +181,7 @@ void HLSStreamHandler::run(void) - { - LOG(VB_RECORD, LOG_INFO, LOC + - QString("Packet not starting with SYNC Byte (got 0x%1)") -- .arg((char)m_readbuffer[0], 2, 16, QLatin1Char('0'))); -+ .arg(static_cast<uint>(m_readbuffer[0]), 2, 16, QLatin1Char('0'))); - continue; - } - -diff --git a/programs/mythbackend/recordingextender.h b/programs/mythbackend/recordingextender.h -index 77fd649fbf..aa18e8281d 100644 ---- a/programs/mythbackend/recordingextender.h -+++ b/programs/mythbackend/recordingextender.h -@@ -28,6 +28,7 @@ - - #include <QMutex> - #include <QJsonDocument> -+#include <QUrl> - - #include "libmythbase/mthread.h" - #include "libmythtv/recordingrule.h" --- -2.45.2 - diff --git a/media-tv/mythtv/mythtv-35.0-r1.ebuild b/media-tv/mythtv/mythtv-35.0_p20250723.ebuild index 287fb5304a65..e83bd728e950 100644 --- a/media-tv/mythtv/mythtv-35.0-r1.ebuild +++ b/media-tv/mythtv/mythtv-35.0_p20250723.ebuild @@ -12,7 +12,8 @@ inherit qmake-utils readme.gentoo-r1 systemd toolchain-funcs user-info DESCRIPTION="Open Source DVR and media center hub" HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv" if [[ ${PV} == *_p* ]] ; then - MY_COMMIT= + # https://github.com/MythTV/mythtv/tree/fixes/35 + MY_COMMIT="0a868b015e7346a9156a389acbbe395ec2e1aa24" SRC_URI="https://github.com/MythTV/mythtv/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" # mythtv and mythplugins are separate builds in the github MythTV project S="${WORKDIR}/mythtv-${MY_COMMIT}/mythtv" @@ -137,7 +138,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-33.1-libva.patch "${FILESDIR}"/${PN}-35.no-ant-java-required-if-use-system-libblur.patch - "${FILESDIR}"/${PN}-35.Fix-Qt6-compilation-on-Fedora-rawhide.patch "${FILESDIR}"/${PN}-35.freemheg-update-visibility-of-MHCreateEngine-MHSetLo.patch ) @@ -273,6 +273,13 @@ src_configure() { myconf+=( --enable-symbol-visibility ) myconf+=( --enable-pic ) + # libavformat/format.c:37:22: error: type of 'ff_mythtv_mpegtsraw_demuxer' does not match original declaration [-Werror=lto-type-mismatch] + # libavformat/mpegts-mythtv.c:3731:21: note: type 'const struct FFInputFormat' should match type 'struct AVInputFormat' + filter-lto + + # Needed just like ffmpeg (bug #860987) + tc-is-lto && myconf+=( --enable-lto ) + if tc-is-cross-compiler ; then myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) ) myconf+=( --cross-prefix="${CHOST}"- ) @@ -294,8 +301,12 @@ src_configure() { "${myconf[@]}" } +src_compile() { + emake V=1 +} + src_install() { - emake STRIP="true" INSTALL_ROOT="${D}" install + emake V=1 STRIP="true" INSTALL_ROOT="${D}" install use python && python_optimize # does all packages by default dodoc AUTHORS README readme.gentoo_create_doc |
