diff options
Diffstat (limited to 'media-tv/tvheadend/files')
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch | 28 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend.confd | 2 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend.service | 2 |
3 files changed, 30 insertions, 2 deletions
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch new file mode 100644 index 000000000000..b398064292e5 --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch @@ -0,0 +1,28 @@ +From 27ec1008df054072fac6b58ffb8d820423522442 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Sun, 10 May 2020 23:02:14 +0100 +Subject: [PATCH] dvbpsi: Fix build when DVB is not enabled at all + +--- + src/input/mpegts/dvb_psi.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c +index 15203d98c..96b1689fb 100644 +--- a/src/input/mpegts/dvb_psi.c ++++ b/src/input/mpegts/dvb_psi.c +@@ -2331,9 +2331,11 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm, + psi_tables_atsc_t(mm); + break; + case DVB_SYS_DVBC_ANNEX_B: ++#if ENABLE_MPEGTS_DVB + if (idnode_is_instance(&mm->mm_id, &dvb_mux_dvbc_class)) + psi_tables_dvb(mm); + else ++#endif + psi_tables_atsc_c(mm); + break; + case DVB_SYS_NONE: +-- +2.26.2 + diff --git a/media-tv/tvheadend/files/tvheadend.confd b/media-tv/tvheadend/files/tvheadend.confd index 8be4a5dadce9..bac19ece3ac1 100644 --- a/media-tv/tvheadend/files/tvheadend.confd +++ b/media-tv/tvheadend/files/tvheadend.confd @@ -8,7 +8,7 @@ TVHEADEND_USER="tvheadend" TVHEADEND_GROUP="video" # Path to Tvheadend config. -TVHEADEND_CONFIG="/etc/tvheadend" +TVHEADEND_CONFIG="/var/lib/tvheadend" # Other options you want to pass to Tvheadend. TVHEADEND_OPTIONS="" diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service index 6d1e27445b73..cd5c5e7f9115 100644 --- a/media-tv/tvheadend/files/tvheadend.service +++ b/media-tv/tvheadend/files/tvheadend.service @@ -9,7 +9,7 @@ Group=video RuntimeDirectory=tvheadend PIDFile=/run/tvheadend/tvheadend.pid EnvironmentFile=/etc/conf.d/tvheadend -ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c "${TVHEADEND_CONFIG}" ${TVHEADEND_OPTIONS} +ExecStart=/usr/bin/tvheadend -p /run/tvheadend/tvheadend.pid -c ${TVHEADEND_CONFIG} ${TVHEADEND_OPTIONS} TimeoutStartSec=1m TimeoutStopSec=20s Restart=always |