diff options
Diffstat (limited to 'media-tv/tvheadend/files')
6 files changed, 2 insertions, 175 deletions
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch deleted file mode 100644 index 64f6f691b976..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up ./configure.orig ./configure ---- ./configure.orig 2017-04-21 10:32:22.000000000 +0200 -+++ ./configure 2017-04-23 13:31:08.717237211 +0200 -@@ -357,7 +357,7 @@ if enabled hdhomerun_static; then - else - - if enabled_or_auto hdhomerun_client; then -- if check_cc_header 'libhdhomerun/hdhomerun' libhdhomerun; then -+ if check_cc_header 'hdhomerun/hdhomerun' libhdhomerun; then - enable hdhomerun_client - LDFLAGS="$LDFLAGS -lhdhomerun" - fi -diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h ---- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig 2017-04-21 10:32:22.000000000 +0200 -+++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 2017-04-23 13:31:08.717237211 +0200 -@@ -24,7 +24,7 @@ - #include "htsbuf.h" - #include "tvhdhomerun.h" - --#include "libhdhomerun/hdhomerun.h" -+#include <hdhomerun/hdhomerun.h> - - typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t; - typedef struct tvhdhomerun_device tvhdhomerun_device_t; diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch deleted file mode 100644 index 23f48652f9de..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 1f2a0a59e3acaef88509d3ac899b905c73b7b8f8 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Fri, 15 May 2020 17:45:30 +0100 -Subject: [PATCH] Fix building with -fno-common (default from GCC 10) - ---- - src/input.h | 4 ++-- - src/input/mpegts.c | 2 ++ - src/input/mpegts.h | 2 +- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/input.h b/src/input.h -index a9c96df04..3dce355c6 100644 ---- a/src/input.h -+++ b/src/input.h -@@ -133,8 +133,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th ); - extern const idclass_t tvh_input_class; - extern const idclass_t tvh_input_instance_class; - --tvh_input_list_t tvh_inputs; --tvh_hardware_list_t tvh_hardware; -+extern tvh_input_list_t tvh_inputs; -+extern tvh_hardware_list_t tvh_hardware; - - #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link) - #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link) -diff --git a/src/input/mpegts.c b/src/input/mpegts.c -index e02d491f1..fca4f3429 100644 ---- a/src/input/mpegts.c -+++ b/src/input/mpegts.c -@@ -20,6 +20,8 @@ - #include "mpegts/fastscan.h" - #include "memoryinfo.h" - -+struct mpegts_listeners mpegts_listeners; -+ - extern memoryinfo_t mpegts_input_queue_memoryinfo; - extern memoryinfo_t mpegts_input_table_memoryinfo; - -diff --git a/src/input/mpegts.h b/src/input/mpegts.h -index 9dda3baca..9c4c57b73 100644 ---- a/src/input/mpegts.h -+++ b/src/input/mpegts.h -@@ -1149,7 +1149,7 @@ typedef struct mpegts_listener - void (*ml_mux_delete) (mpegts_mux_t *mm, void *p); - } mpegts_listener_t; - --LIST_HEAD(,mpegts_listener) mpegts_listeners; -+extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners; - - #define mpegts_add_listener(ml)\ - LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link) --- -2.26.2 - diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch deleted file mode 100644 index 9ccadb44c42c..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c ---- ./src/plumbing/transcoding.c.orig 2019-01-12 09:58:47.000000000 +0100 -+++ ./src/plumbing/transcoding.c 2019-03-12 15:49:24.922314869 +0100 -@@ -1804,7 +1804,7 @@ transcoder_init_video(transcoder_t *t, s - char *str, *token, *saveptr, codec_list[sizeof(tp->tp_src_vcodec)]; - int codec_match=0; - -- strncpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); -+ memcpy(codec_list, tp->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); - - tvhtrace(LS_TRANSCODE, "src_vcodec=\"%s\" ssc_type=%d (%s)\n", - tp->tp_src_vcodec, -@@ -2130,10 +2130,10 @@ transcoder_set_properties(streaming_targ - transcoder_t *t = (transcoder_t *)st; - transcoder_props_t *tp = &t->t_props; - -- strncpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1); -- strncpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1); -- strncpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1); -- strncpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1); -+ memcpy(tp->tp_vcodec, props->tp_vcodec, sizeof(tp->tp_vcodec)-1); -+ memcpy(tp->tp_vcodec_preset, props->tp_vcodec_preset, sizeof(tp->tp_vcodec_preset)-1); -+ memcpy(tp->tp_acodec, props->tp_acodec, sizeof(tp->tp_acodec)-1); -+ memcpy(tp->tp_scodec, props->tp_scodec, sizeof(tp->tp_scodec)-1); - tp->tp_channels = props->tp_channels; - tp->tp_vbitrate = props->tp_vbitrate; - tp->tp_abitrate = props->tp_abitrate; -@@ -2141,7 +2141,7 @@ transcoder_set_properties(streaming_targ - - memcpy(tp->tp_language, props->tp_language, 4); - -- strncpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); -+ memcpy(tp->tp_src_vcodec, props->tp_src_vcodec, sizeof(tp->tp_src_vcodec)-1); - } - - diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch deleted file mode 100644 index c30af8aba2a1..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 13cd23c371e3377973502f8dc65654b6a0ff372b Mon Sep 17 00:00:00 2001 -From: Michael Marley <michael@michaelmarley.com> -Date: Wed, 26 Jun 2019 19:35:50 -0400 -Subject: [PATCH] Fix compilation with libhdhomerun 20190621 - -They renamed the symbol that was used to determine whether the -"hdhomerun_discover_find_devices_custom" needed to be aliased, -causing an FTBFS. Instead, recognize both the old and new symbols. ---- - src/input/mpegts/tvhdhomerun/tvhdhomerun.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c -index 58dec51ab..18068faf5 100644 ---- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c -+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c -@@ -32,7 +32,8 @@ - - #include "config.h" - --#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN -+#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) \ -+ || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED) - #define hdhomerun_discover_find_devices_custom \ - hdhomerun_discover_find_devices_custom_v2 - #endif --- -2.23.0 - 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 deleted file mode 100644 index b398064292e5..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -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.service b/media-tv/tvheadend/files/tvheadend.service index 11d3fe7a814f..778786b7c1b7 100644 --- a/media-tv/tvheadend/files/tvheadend.service +++ b/media-tv/tvheadend/files/tvheadend.service @@ -7,9 +7,8 @@ Type=simple User=tvheadend 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 -c ${TVHEADEND_CONFIG} $TVHEADEND_OPTIONS TimeoutStartSec=1m TimeoutStopSec=20s Restart=always @@ -17,7 +16,7 @@ RestartSec=5s DevicePolicy=closed DeviceAllow=char-DVB rw DeviceAllow=char-drm rw -RestrictAddressFamilies=AF_INET AF_INET6 +RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX ProtectSystem=yes ProtectHome=yes NoNewPrivileges=yes |