media-tv/tvheadend: Fix build with USE=-dvb

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

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 (file)
index 0000000..b398064
--- /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/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 2c44c55ed1797e35fd8f447995b518c26246ece2..7886d755c7d5275b2aeae3e200790afa5e232a8a 100644 (file)
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
        "${FILESDIR}"/${PN}-4.2.7-python3.patch
        "${FILESDIR}"/${PN}-4.2.8-gcc9.patch
+       "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
 )
 
 DOCS=( README.md )

diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index ddd46284395b1eb418d1e7d08d66936252d7f6e4..e8e5c2814ed8cd4de705e84b97414091f102dc8a 100644 (file)
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-4.3-hdhomerun.patch
        "${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
        "${FILESDIR}"/${PN}-4.2.7-python3.patch
+       "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
 )
 
 DOCS=( README.md )