From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- media-tv/mythtv/files/mythbackend.init-r3 | 72 ++++++++++++++++++++++ .../files/mythtv-31.0-Include_QPainterPath.patch | 15 +++++ .../mythtv/files/mythtv-31.0-Remove_ldconfig.patch | 13 ++++ 3 files changed, 100 insertions(+) create mode 100644 media-tv/mythtv/files/mythbackend.init-r3 create mode 100644 media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch create mode 100644 media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch (limited to 'media-tv/mythtv/files') diff --git a/media-tv/mythtv/files/mythbackend.init-r3 b/media-tv/mythtv/files/mythbackend.init-r3 new file mode 100644 index 000000000000..41ad04f0fa01 --- /dev/null +++ b/media-tv/mythtv/files/mythbackend.init-r3 @@ -0,0 +1,72 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="MythTV backend recording daemon" +extra_started_commands="resched upnprebuild" +description_resched="Forces the recording scheduler to update" +description_upnprebuild="Rebuilds the UPnP media cache" + +MYTHBACKEND_OPTS=${MYTHBACKEND_OPTS:-"${MYTHBACKEND_OPTS}"} +MYTHBACKEND_VERBOSE=${MYTHBACKEND_VERBOSE:-"general"} +MYTHBACKEND_LOGGING=${MYTHBACKEND_LOGGING:-"files"} + +name="MythTV backend" +command="/usr/bin/mythbackend" +pidfile="/run/mythtv/mythbackend.pid" +start_stop_daemon_args="--pidfile ${pidfile} --user mythtv:mythtv" +command_args="--daemon --pidfile ${pidfile} --verbose ${MYTHBACKEND_VERBOSE} ${MYTHBACKEND_OPTS}" + +depend() { + # mythbackend doesn't need to run on the same machine that + # mysql runs on. so its use for that reason + use logger net.lo mysql LCDd +} + +start_pre() { + case "${MYTHBACKEND_LOGGING}" in + database) logging="--enable-dblog" ;; + syslog\ *) logging="--${MYTHBACKEND_LOGGING}" ;; + files) logging="--logpath /var/log/mythtv" ;; + console) logging="--nologserver" ;; + *) + eerror "Invalid MYTHBACKEND_LOGGING value" + exit 1 + ;; + esac + + #fixes for bug #101308 + unset DISPLAY + unset SESSION_MANAGER + + # Work around any strange permissions that may be on these files. + [ "x${MYTHBACKEND_LOGGING}" = "xfiles" ] && \ + checkpath --directory --owner mythtv:mythtv --mode 0755 /var/log/mythtv + checkpath --directory --owner mythtv:mythtv --mode 0775 "{$HOME}" + checkpath --directory --owner mythtv:mythtv --mode 0750 /run/mythtv +} + +start() { + ebegin "Starting ${name}" + start-stop-daemon --start ${start_stop_daemon_args} --exec ${command} \ + -- ${command_args} ${logging} + eend $? +} + +stop() { + ebegin "Stopping ${name}" + start-stop-daemon --stop --retry 10 --progress --pidfile ${pidfile} + eend $? +} + +resched() { + ebegin "Updating the recording scheduler" + ${command} --resched + eend $? +} + +upnprebuild() { + ebegin "Rebuilding UPnP media cache" + ${command} --upnprebuild + eend $? +} diff --git a/media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch b/media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch new file mode 100644 index 000000000000..f0f09a5c4517 --- /dev/null +++ b/media-tv/mythtv/files/mythtv-31.0-Include_QPainterPath.patch @@ -0,0 +1,15 @@ +# Change in upstream master after release mythtv-31.0 + +diff --git a/mythtv/libs/libmythui/mythpainter.cpp b/mythtv/libs/libmythui/mythpainter.cpp +index 639ea41b30..221a7fe2b7 100644 +--- a/libs/libmythui/mythpainter.cpp ++++ b/libs/libmythui/mythpainter.cpp +@@ -5,6 +5,7 @@ + // QT headers + #include + #include ++#include + + // libmythbase headers + #include "mythlogging.h" + diff --git a/media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch b/media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch new file mode 100644 index 000000000000..7182f4e69f86 --- /dev/null +++ b/media-tv/mythtv/files/mythtv-31.0-Remove_ldconfig.patch @@ -0,0 +1,13 @@ +diff --git a/mythtv/programs/mythfrontend/mythfrontend.pro b/mythtv/programs/mythfrontend/mythfrontend.pro +index 82c9ea1bb6..cd6894dcbc 100644 +--- a/programs/mythfrontend/mythfrontend.pro ++++ b/programs/mythfrontend/mythfrontend.pro +@@ -21,7 +21,6 @@ INSTALLS = target + + setting.path = $${PREFIX}/share/mythtv/ + setting.files += MFEXML_scpd.xml +-setting.extra = -ldconfig + + INSTALLS += setting + + -- cgit v1.2.3