From d37b97a25b8b10f748eead6574b01f893f140b01 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Dec 2017 18:23:20 +0000 Subject: gentoo resync : 06.12.2017 --- .../files/tvheadend-4.0.9-hdhomerun-include.patch | 27 ---------------------- .../files/tvheadend-4.0.9-use_system_queue.patch | 12 ++++++++++ .../files/tvheadend-4.2.1-hdhomerun.patch | 24 +++++++++++++++++++ .../files/tvheadend-4.2.2-dtv_scan_tables.patch | 12 ++++++++++ media-tv/tvheadend/files/tvheadend.service | 15 +++++++++--- 5 files changed, 60 insertions(+), 30 deletions(-) delete mode 100644 media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch create mode 100644 media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch create mode 100644 media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch create mode 100644 media-tv/tvheadend/files/tvheadend-4.2.2-dtv_scan_tables.patch (limited to 'media-tv/tvheadend/files') diff --git a/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch b/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch deleted file mode 100644 index 8a0768fa6f02..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure b/configure -index 47d2cf2..6f9fcc5 100755 ---- a/configure -+++ b/configure -@@ -290,7 +290,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 --git a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h -index 962627a..6d1c52b 100644 ---- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h -+++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h -@@ -24,7 +24,8 @@ - #include "htsbuf.h" - #include "tvhdhomerun.h" - --#include -+#include -+#include - - 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.0.9-use_system_queue.patch b/media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch new file mode 100644 index 000000000000..13ac3573ed27 --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch @@ -0,0 +1,12 @@ +diff -up ./src/queue.h.orig ./src/queue.h +--- ./src/queue.h.orig 2016-03-14 10:10:57.000000000 +0100 ++++ ./src/queue.h 2016-07-04 17:47:22.480252171 +0200 +@@ -5,7 +5,7 @@ + #ifndef HTSQ_H + #define HTSQ_H + +-#include "../vendor/include/sys/queue.h" ++#include + + /* + * Extra LIST-ops diff --git a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch new file mode 100644 index 000000000000..64f6f691b976 --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch @@ -0,0 +1,24 @@ +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 + + 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.2-dtv_scan_tables.patch b/media-tv/tvheadend/files/tvheadend-4.2.2-dtv_scan_tables.patch new file mode 100644 index 000000000000..513102628716 --- /dev/null +++ b/media-tv/tvheadend/files/tvheadend-4.2.2-dtv_scan_tables.patch @@ -0,0 +1,12 @@ +diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c +--- ./src/input/mpegts/scanfile.c.orig 2017-05-16 13:15:24.000000000 +0200 ++++ ./src/input/mpegts/scanfile.c 2017-06-01 22:30:29.150834135 +0200 +@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path + #elif defined(PLATFORM_FREEBSD) + path = "/usr/local/share/dtv-scan-tables"; + #else +- path = "/usr/share/dvb"; ++ path = "/usr/share/dvbv5"; + #endif + + if (!initialized) { diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service index 227faffcb082..2d0573ca910f 100644 --- a/media-tv/tvheadend/files/tvheadend.service +++ b/media-tv/tvheadend/files/tvheadend.service @@ -4,11 +4,20 @@ After=network.target [Service] Type=forking -PIDFile=/run/tvheadend.pid -ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid -C -c /etc/tvheadend -u tvheadend -g video -ExecStop=/usr/bin/rm /run/tvheadend.pid +User=tvheadend +Group=video +RuntimeDirectory=tvheadend +PIDFile=/run/tvheadend/tvheadend.pid +ExecStart=/usr/bin/tvheadend -6 -f -p /run/tvheadend.pid -C -c /etc/tvheadend Restart=always RestartSec=5 +DevicePolicy=closed +DeviceAllow=char-DVB rw # DVB devices +DeviceAllow=char-drm rw # GPUs for transcoding +RestrictAddressFamilies=AF_INET AF_INET6 +ProtectSystem=strict +ProtectHome=yes +NoNewPrivileges=yes [Install] WantedBy=multi-user.target -- cgit v1.2.3