| 1 |
commit: 4d3156597c2c25b6063a9b3328f95e9f1250021d |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 10 22:16:36 2020 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 10 22:16:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d315659 |
| 7 |
|
| 8 |
media-tv/tvheadend: Fix build with USE=-dvb |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/tvheadend-4.2.8-no-dvb-fix.patch | 28 ++++++++++++++++++++++ |
| 14 |
media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 1 + |
| 15 |
media-tv/tvheadend/tvheadend-9999.ebuild | 1 + |
| 16 |
3 files changed, 30 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..b398064292e |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch |
| 23 |
@@ -0,0 +1,28 @@ |
| 24 |
+From 27ec1008df054072fac6b58ffb8d820423522442 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: James Le Cuirot <chewi@g.o> |
| 26 |
+Date: Sun, 10 May 2020 23:02:14 +0100 |
| 27 |
+Subject: [PATCH] dvbpsi: Fix build when DVB is not enabled at all |
| 28 |
+ |
| 29 |
+--- |
| 30 |
+ src/input/mpegts/dvb_psi.c | 2 ++ |
| 31 |
+ 1 file changed, 2 insertions(+) |
| 32 |
+ |
| 33 |
+diff --git a/src/input/mpegts/dvb_psi.c b/src/input/mpegts/dvb_psi.c |
| 34 |
+index 15203d98c..96b1689fb 100644 |
| 35 |
+--- a/src/input/mpegts/dvb_psi.c |
| 36 |
++++ b/src/input/mpegts/dvb_psi.c |
| 37 |
+@@ -2331,9 +2331,11 @@ psi_tables_install ( mpegts_input_t *mi, mpegts_mux_t *mm, |
| 38 |
+ psi_tables_atsc_t(mm); |
| 39 |
+ break; |
| 40 |
+ case DVB_SYS_DVBC_ANNEX_B: |
| 41 |
++#if ENABLE_MPEGTS_DVB |
| 42 |
+ if (idnode_is_instance(&mm->mm_id, &dvb_mux_dvbc_class)) |
| 43 |
+ psi_tables_dvb(mm); |
| 44 |
+ else |
| 45 |
++#endif |
| 46 |
+ psi_tables_atsc_c(mm); |
| 47 |
+ break; |
| 48 |
+ case DVB_SYS_NONE: |
| 49 |
+-- |
| 50 |
+2.26.2 |
| 51 |
+ |
| 52 |
|
| 53 |
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild |
| 54 |
index 2c44c55ed17..7886d755c7d 100644 |
| 55 |
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild |
| 56 |
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild |
| 57 |
@@ -52,6 +52,7 @@ PATCHES=( |
| 58 |
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch |
| 59 |
"${FILESDIR}"/${PN}-4.2.7-python3.patch |
| 60 |
"${FILESDIR}"/${PN}-4.2.8-gcc9.patch |
| 61 |
+ "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch |
| 62 |
) |
| 63 |
|
| 64 |
DOCS=( README.md ) |
| 65 |
|
| 66 |
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild |
| 67 |
index ddd46284395..e8e5c2814ed 100644 |
| 68 |
--- a/media-tv/tvheadend/tvheadend-9999.ebuild |
| 69 |
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild |
| 70 |
@@ -61,6 +61,7 @@ PATCHES=( |
| 71 |
"${FILESDIR}"/${PN}-4.3-hdhomerun.patch |
| 72 |
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch |
| 73 |
"${FILESDIR}"/${PN}-4.2.7-python3.patch |
| 74 |
+ "${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch |
| 75 |
) |
| 76 |
|
| 77 |
DOCS=( README.md ) |
Archives