* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/
@ 2017-12-04 22:29 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2017-12-04 22:29 UTC (permalink / raw
To: gentoo-commits
commit: 3f38b9c5a0536d3b1effe0af621e28b1dfe11da4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 22:28:48 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 22:28:48 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f38b9c5
media-tv/tvheadend: Drop old 4.0.9
Closes: https://bugs.gentoo.org/595032
Closes: https://bugs.gentoo.org/596930
Closes: https://bugs.gentoo.org/633966
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-tv/tvheadend/Manifest | 2 -
.../files/tvheadend-4.0.9-hdhomerun-include.patch | 27 -----
media-tv/tvheadend/metadata.xml | 1 -
media-tv/tvheadend/tvheadend-4.0.9.ebuild | 117 ---------------------
4 files changed, 147 deletions(-)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 7d3e91d7b72..37bd4a7dfce 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,3 +1 @@
-DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 BLAKE2B 569987bc91f2060e5bb18b5caf35baebe1e72d95953bc69e19a713b33521668550f04dfc7ba125e3cf5ba6badee5a80c5bcdd37e2a5ca086d5dcc29cb0031c16 SHA512 aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609
-DIST tvheadend-4.0.9.tar.gz 15825419 BLAKE2B b719032e46df24f37614c4a9d1da690b82f15906b1cff7eaa9573162a08e70e2813515972a9dd478530ad4ba984b01dd3fb3bf178e1c3973465000357b541f7e SHA512 ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e
DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796 SHA512 333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b18888a84c57810035af882df4
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 8a0768fa6f0..00000000000
--- 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 <libhdhomerun/hdhomerun.h>
-+#include <hdhomerun/hdhomerun.h>
-+#include <hdhomerun/hdhomerun_debug.h>
-
- typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
- typedef struct tvhdhomerun_device tvhdhomerun_device_t;
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index f8bdade2268..ad28ad1f4b6 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -10,7 +10,6 @@
<flag name="constcw">Enable support for the constcw protocol</flag>
<flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
<flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag>
- <flag name="dvbscan">Use scan tables from dtv-scan-tables git repository</flag>
<flag name="dvben50221">Enable support for hardware CAM</flag>
<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
<flag name="imagecache">Enable support for image caching</flag>
diff --git a/media-tv/tvheadend/tvheadend-4.0.9.ebuild b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
deleted file mode 100644
index d3627e8f13c..00000000000
--- a/media-tv/tvheadend/tvheadend-4.0.9.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils linux-info systemd toolchain-funcs user
-
-DTV_SCAN_TABLES_VERSION="2015-02-08-f2053b3"
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
- dvbscan? ( https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zeroconf zlib"
-
-# does not build with ffmpeg-3 - bug 574990
-# https://tvheadend.org/issues/3597
-RDEPEND="dev-libs/openssl:=
- virtual/libiconv
- dbus? ( sys-apps/dbus )
- ffmpeg? (
- !libav? ( <media-video/ffmpeg-3:= )
- libav? ( media-video/libav:= )
- )
- hdhomerun? ( media-libs/libhdhomerun )
- uriparser? ( dev-libs/uriparser )
- zeroconf? ( net-dns/avahi )
- zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
- dvb? ( virtual/linuxtv-dvb-headers )
- capmt? ( virtual/linuxtv-dvb-headers )
- virtual/pkgconfig"
-
-RDEPEND+="
- xmltv? ( media-tv/xmltv )"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-DOCS=( README.md )
-PATCHES=( "${FILESDIR}/${P}-hdhomerun-include.patch" )
-
-src_unpack() {
- unpack "${P}.tar.gz"
-
- if use dvbscan; then
- mkdir "${S}/data/dvb-scan" || die
- cd "${T}" || die
- unpack dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2
- rmdir "${S}/data/dvb-scan" || die
- mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die
-
- # This is needed to prevent make from removing files
- touch "${S}/data/dvb-scan/.stamp" || die
- fi
-}
-
-pkg_setup() {
- enewuser tvheadend -1 -1 /dev/null video
-}
-
-src_configure() {
- CC="$(tc-getCC)" \
- econf --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share \
- --disable-ccache \
- --nowerror \
- --disable-hdhomerun_static \
- $(use_enable capmt) \
- $(use_enable constcw) \
- $(use_enable cwc) \
- $(use_enable dbus dbus_1) \
- $(use_enable dvbscan) \
- $(use_enable dvb linuxdvb) \
- $(use_enable ffmpeg libav) \
- $(use_enable hdhomerun hdhomerun_client) \
- $(use_enable imagecache) \
- $(use_enable inotify) \
- $(use_enable iptv) \
- $(use_enable satip satip_server) \
- $(use_enable satip satip_client) \
- $(use_enable timeshift) \
- $(use_enable uriparser) \
- $(use_enable zeroconf avahi) \
- $(use_enable zlib)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}/tvheadend.initd" tvheadend
- newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
- systemd_dounit "${FILESDIR}/tvheadend.service"
-
- dodir /etc/tvheadend
- fperms 0700 /etc/tvheadend
- fowners tvheadend:video /etc/tvheadend
-}
-
-pkg_postinst() {
- elog "The Tvheadend web interface can be reached at:"
- elog "http://localhost:9981/"
- elog
- elog "Make sure that you change the default username"
- elog "and password via the Configuration / Access control"
- elog "tab in the web interface."
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/
@ 2019-01-20 21:16 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2019-01-20 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 3674bd90bada921616390a2d91be199e3365f363
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 20 21:15:57 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan 20 21:15:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3674bd90
media-tv/tvheadend: Update hdhomerun patch for 9999
Closes: https://bugs.gentoo.org/675916
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../tvheadend/files/tvheadend-4.3-hdhomerun.patch | 36 ++++++++++++++++++++++
media-tv/tvheadend/tvheadend-9999.ebuild | 2 +-
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/media-tv/tvheadend/files/tvheadend-4.3-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.3-hdhomerun.patch
new file mode 100644
index 00000000000..1689c2e4051
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.3-hdhomerun.patch
@@ -0,0 +1,36 @@
+diff -Naur a/configure b/configure
+--- a/configure 2019-01-20 21:12:12.634450200 +0000
++++ b/configure 2019-01-20 21:12:52.502298542 +0000
+@@ -411,7 +411,7 @@
+ 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 -Naur a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun.c 2019-01-20 21:12:12.707451725 +0000
++++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun.c 2019-01-20 21:12:35.990947079 +0000
+@@ -17,7 +17,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#include "libhdhomerun/hdhomerun.h"
++#include <hdhomerun/hdhomerun.h>
+
+ #include "tvheadend.h"
+ #include "input.h"
+diff -Naur a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c
+--- a/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c 2019-01-20 21:12:12.707451725 +0000
++++ b/src/input/mpegts/tvhdhomerun/tvhdhomerun_frontend.c 2019-01-20 21:12:35.991947101 +0000
+@@ -17,7 +17,7 @@
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+-#include "libhdhomerun/hdhomerun.h"
++#include <hdhomerun/hdhomerun.h>
+
+ #include <fcntl.h>
+ #include "tvheadend.h"
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 700a7cc5a1d..7fa2c9c7f25 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -57,7 +57,7 @@ REQUIRED_USE="
PATCHES=(
"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
- "${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
+ "${FILESDIR}"/${PN}-4.3-hdhomerun.patch
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
)
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/
@ 2019-11-02 12:04 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2019-11-02 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 1d77ca72c6de413343b61c2a4658b20f2fda8fc4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 11:52:01 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 12:04:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d77ca72
media-tv/tvheadend: Add Python 3 and GCC 9 patches from RPM Fusion
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../tvheadend/files/tvheadend-4.2.7-python3.patch | 91 ++++++++++++++++++++++
.../tvheadend/files/tvheadend-4.2.8-gcc9.patch | 36 +++++++++
media-tv/tvheadend/tvheadend-4.2.8.ebuild | 2 +
media-tv/tvheadend/tvheadend-9999.ebuild | 1 +
4 files changed, 130 insertions(+)
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch b/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch
new file mode 100644
index 00000000000..752b17ba08f
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.7-python3.patch
@@ -0,0 +1,91 @@
+diff -up ./lib/py/tvh/tsreader.py.orig ./lib/py/tvh/tsreader.py
+--- ./lib/py/tvh/tsreader.py.orig 2018-10-08 14:37:05.000000000 +0200
++++ ./lib/py/tvh/tsreader.py 2018-10-15 11:53:53.766850060 +0200
+@@ -31,7 +31,7 @@ def encode_utf8(c):
+
+ def conv_8859(tnum, data):
+ r = u''
+- print 'TBL %d' % tnum
++ print('TBL %d' % tnum)
+ tbl = conv_8859_table[tnum]
+ for c in data:
+ if ord(c) <= 0x7f:
+@@ -46,8 +46,8 @@ def conv_8859(tnum, data):
+
+
+ def dvb_convert_string(data, conv):
+- print 'convert(%d)' % conv
+- print repr(data)
++ print('convert(%d)' % conv)
++ print(repr(data))
+ if not conv:
+ return data
+ return conv_8859(conv, data)
+@@ -83,8 +83,8 @@ class TsSection(object):
+ # print self.tid, self.len, len(data)
+
+ def process(self):
+- print 'TS Section:'
+- print self.tid, self.len, len(self.data)
++ print('TS Section:')
++ print(self.tid, self.len, len(self.data))
+ # print str2hex(self.data, 16)
+ # print self.data
+
+@@ -112,7 +112,7 @@ class TsSection(object):
+ if l + 1 > dlen:
+ return (None, -1)
+ c = ord(data[1])
+- print c
++ print(c)
+ conv = None
+ if c == 0:
+ return (None, -1)
+@@ -162,14 +162,14 @@ class TsSection(object):
+ eid = (hdr[0] << 8) + hdr[1]
+ start = dvb_convert_date(hdr[2:])
+
+- print 'process event (%d):' % dllen
+- print ' EID : %d' % eid
+- print ' START : %d' % start
++ print('process event (%d):' % dllen)
++ print(' EID : %d' % eid)
++ print(' START : %d' % start)
+
+ while dllen > 2:
+ dtag = ord(data[0])
+ dlen = ord(data[1])
+- print 'dtag = 0x%02x, dlen = %d' % (dtag, dlen)
++ print('dtag = 0x%02x, dlen = %d' % (dtag, dlen))
+
+ dllen = dllen - 2
+ data = data[2:]
+@@ -178,8 +178,8 @@ class TsSection(object):
+
+ if dtag == 0x4d:
+ (title, summary) = self.short_event(data, dlen)
+- print ' TITLE : %s' % title
+- print ' SUMMARY : %s' % summary
++ print(' TITLE : %s' % title)
++ print(' SUMMARY : %s' % summary)
+
+ dllen = dllen - dlen
+ data = data[dlen:]
+@@ -216,7 +216,7 @@ if __name__ == '__main__':
+ # Complete?
+ if cur:
+ if len(cur.data) >= cur.len:
+- print 'Process Section:'
++ print('Process Section:')
+ # try:
+ cur.process()
+ # except: pass
+@@ -224,7 +224,7 @@ if __name__ == '__main__':
+ print
+ sys.exit(0)
+ else:
+- print 'waiting for %d bytes' % (cur.len - len(cur.data))
++ print('waiting for %d bytes' % (cur.len - len(cur.data)))
+
+ # Next
+ if nxt:
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
new file mode 100644
index 00000000000..9ccadb44c42
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch
@@ -0,0 +1,36 @@
+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/tvheadend-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
index 0673c7bc7a3..4a49b1460b5 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
@@ -49,6 +49,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
"${FILESDIR}"/${PN}-4.2.1-hdhomerun.patch
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
+ "${FILESDIR}"/${PN}-4.2.7-python3.patch
+ "${FILESDIR}"/${PN}-4.2.8-gcc9.patch
)
DOCS=( README.md )
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 7fa2c9c7f25..692d4ec897c 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
"${FILESDIR}"/${PN}-4.3-hdhomerun.patch
"${FILESDIR}"/${PN}-4.2.2-dtv_scan_tables.patch
+ "${FILESDIR}"/${PN}-4.2.7-python3.patch
)
DOCS=( README.md )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/
@ 2020-05-10 22:18 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-05-10 22:18 UTC (permalink / raw
To: gentoo-commits
commit: aa3bbeb881b99043488b3354b0d36d1ff0107aac
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 22:15:26 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 10 22:15:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3bbeb8
media-tv/tvheadend: Apply GLEP 81 and move default config directory
This moves the HOME directory for the tvheadend user, and hence the
config directory, from /etc/tvheadend to /var/lib/tvheadend. The
daemon does not check the HOME directory so no change is effectively
made until TVHEADEND_CONFIG in /etc/conf.d/tvheadend is updated.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-tv/tvheadend/files/tvheadend.confd | 2 +-
...dend-4.2.8.ebuild => tvheadend-4.2.8-r1.ebuild} | 22 ++++++++++++++--------
media-tv/tvheadend/tvheadend-9999.ebuild | 22 ++++++++++++++--------
3 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/media-tv/tvheadend/files/tvheadend.confd b/media-tv/tvheadend/files/tvheadend.confd
index 8be4a5dadce..bac19ece3ac 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/tvheadend-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
similarity index 83%
rename from media-tv/tvheadend/tvheadend-4.2.8.ebuild
rename to media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index a20bac30f22..2c44c55ed17 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-info systemd toolchain-funcs user
+inherit linux-info systemd toolchain-funcs
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
@@ -20,6 +20,7 @@ BDEPEND="
virtual/pkgconfig"
RDEPEND="
+ acct-user/tvheadend
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
@@ -58,8 +59,6 @@ DOCS=( README.md )
pkg_setup() {
use inotify &&
CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
- enewuser tvheadend -1 -1 /etc/tvheadend video
}
src_configure() {
@@ -106,10 +105,6 @@ src_install() {
use systemd &&
systemd_dounit "${FILESDIR}"/tvheadend.service
-
- dodir /etc/tvheadend
- fperms 0700 /etc/tvheadend
- fowners tvheadend:video /etc/tvheadend
}
pkg_postinst() {
@@ -119,4 +114,15 @@ pkg_postinst() {
elog "Make sure that you change the default username"
elog "and password via the Configuration / Access control"
elog "tab in the web interface."
+
+ . "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
+
+ if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
+ echo
+ ewarn "The HOME directory for the tvheadend user has changed from"
+ ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
+ ewarn "to use the old location until you update TVHEADEND_CONFIG in"
+ ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
+ ewarn "before you do so."
+ fi
}
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 692d4ec897c..ddd46284395 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit git-r3 linux-info systemd toolchain-funcs user
+inherit git-r3 linux-info systemd toolchain-funcs
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
@@ -20,6 +20,7 @@ BDEPEND="
virtual/pkgconfig"
RDEPEND="
+ acct-user/tvheadend
virtual/libiconv
dbus? ( sys-apps/dbus )
dvbcsa? ( media-libs/libdvbcsa )
@@ -67,8 +68,6 @@ DOCS=( README.md )
pkg_setup() {
use inotify &&
CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
- enewuser tvheadend -1 -1 /etc/tvheadend video
}
# We unconditionally enable codecs that do not require additional
@@ -130,10 +129,6 @@ src_install() {
use systemd &&
systemd_dounit "${FILESDIR}"/tvheadend.service
-
- dodir /etc/tvheadend
- fperms 0700 /etc/tvheadend
- fowners tvheadend:video /etc/tvheadend
}
pkg_postinst() {
@@ -143,4 +138,15 @@ pkg_postinst() {
elog "Make sure that you change the default username"
elog "and password via the Configuration / Access control"
elog "tab in the web interface."
+
+ . "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
+
+ if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
+ echo
+ ewarn "The HOME directory for the tvheadend user has changed from"
+ ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
+ ewarn "to use the old location until you update TVHEADEND_CONFIG in"
+ ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
+ ewarn "before you do so."
+ fi
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/
@ 2020-05-24 16:19 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2020-05-24 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 774e5570787961d0c03ae16185095c3f5bc9b72e
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:19:14 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:19:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=774e5570
media-tv/tvheadend: Fix building with -fno-common
Closes: https://bugs.gentoo.org/707768
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/tvheadend-4.2.8-fno-common.patch | 55 ++++++++++++++++++++++
media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 1 +
media-tv/tvheadend/tvheadend-9999.ebuild | 1 +
3 files changed, 57 insertions(+)
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
new file mode 100644
index 00000000000..23f48652f9d
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch
@@ -0,0 +1,55 @@
+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/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
index 7886d755c7d..9c12a6de1a1 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.7-python3.patch
"${FILESDIR}"/${PN}-4.2.8-gcc9.patch
"${FILESDIR}"/${PN}-4.2.8-no-dvb-fix.patch
+ "${FILESDIR}"/${PN}-4.2.8-fno-common.patch
)
DOCS=( README.md )
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index e8e5c2814ed..43d6c88ec8d 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${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
+ "${FILESDIR}"/${PN}-4.2.8-fno-common.patch
)
DOCS=( README.md )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/
@ 2024-06-02 8:41 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-06-02 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 209e5bcaf9e6aec8bf154d2d9d5d870c7e97ad9c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 08:33:14 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 08:41:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209e5bca
media-tv/tvheadend: Drop old 4.2.8-r2
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-tv/tvheadend/Manifest | 1 -
.../files/tvheadend-4.2.1-hdhomerun.patch | 24 ----
.../files/tvheadend-4.2.8-fno-common.patch | 55 --------
.../tvheadend/files/tvheadend-4.2.8-gcc9.patch | 36 ------
.../files/tvheadend-4.2.8-hdhomerun.patch | 29 -----
.../files/tvheadend-4.2.8-no-dvb-fix.patch | 28 -----
media-tv/tvheadend/metadata.xml | 4 -
media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 138 ---------------------
8 files changed, 315 deletions(-)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 66b6b6e2df8e..a435496b5a38 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1 @@
-DIST tvheadend-4.2.8.tar.gz 21875281 BLAKE2B fdd99ca6aff56f8daa073394f9c58e9cba4ea988a2884e24c2288fd4870dd0460624fb700838ba92867a57473cc4133fed5fbd56f0e40f02a0878ffcd0642c00 SHA512 e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0 SHA512 068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da
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/metadata.xml b/media-tv/tvheadend/metadata.xml
index 7dfa9e2d079e..8c2259f17cf7 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -6,12 +6,8 @@
<name>James Le Cuirot</name>
</maintainer>
<use>
- <flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
- <flag name="constcw">Enable support for the constcw protocol</flag>
- <flag name="cwc">Enable support for the cwc (newcamd) protocol</flag>
<flag name="ddci">Enable support for DDCI hardware</flag>
<flag name="dvbcsa">Enable decryption of the DVB Common Scrambling Algorithm</flag>
- <flag name="dvben50221">Enable support for hardware CAM</flag>
<flag name="hdhomerun">Enable support for the HDHomeRun device</flag>
<flag name="imagecache">Enable support for image caching</flag>
<flag name="iptv">Enable support for Internet Protocol TV</flag>
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
deleted file mode 100644
index 11b918469163..000000000000
--- a/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
-HOMEPAGE="https://tvheadend.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
-
-BDEPEND="
- ${PYTHON_DEPS}
- sys-devel/gettext
- virtual/pkgconfig
-"
-# <ffmpeg-5 dep for bug #834399, https://github.com/tvheadend/tvheadend/pull/1460
-RDEPEND="
- acct-user/tvheadend
- virtual/libiconv
- dbus? ( sys-apps/dbus )
- dvbcsa? ( media-libs/libdvbcsa )
- dvben50221? ( media-tv/linuxtv-dvb-apps )
- ffmpeg? ( <media-video/ffmpeg-5:= )
- hdhomerun? ( media-libs/libhdhomerun )
- dev-libs/openssl:0=
- uriparser? ( dev-libs/uriparser )
- zeroconf? ( net-dns/avahi )
- zlib? ( sys-libs/zlib )
-"
-
-DEPEND="
- ${RDEPEND}
- dvb? ( sys-kernel/linux-headers )
-"
-
-RDEPEND+="
- dvb? ( media-tv/dtv-scan-tables )
- xmltv? ( media-tv/xmltv )
-"
-
-REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
-
-# Some patches from:
-# https://github.com/rpmfusion/tvheadend
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
- "${FILESDIR}"/${PN}-4.2.{1,8}-hdhomerun.patch
- "${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
- "${FILESDIR}"/${PN}-4.2.8-fno-common.patch
-)
-
-DOCS=( README.md )
-
-pkg_setup() {
- python-any-r1_pkg_setup
-
- use inotify &&
- CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-}
-
-src_configure() {
- CC="$(tc-getCC)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- econf \
- --disable-bundle \
- --disable-ccache \
- --disable-dvbscan \
- --disable-ffmpeg_static \
- --disable-hdhomerun_static \
- --nowerror \
- $(use_enable capmt) \
- $(use_enable constcw) \
- $(use_enable cwc) \
- $(use_enable dbus dbus_1) \
- $(use_enable debug trace) \
- $(use_enable dvb linuxdvb) \
- $(use_enable dvbcsa) \
- $(use_enable dvben50221) \
- $(use_enable ffmpeg libav) \
- $(use_enable hdhomerun hdhomerun_client) \
- $(use_enable imagecache) \
- $(use_enable inotify) \
- $(use_enable iptv) \
- $(use_enable satip satip_server) \
- $(use_enable satip satip_client) \
- $(use_enable systemd libsystemd_daemon) \
- $(use_enable timeshift) \
- $(use_enable uriparser) \
- $(use_enable zeroconf avahi) \
- $(use_enable zlib)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/tvheadend.initd tvheadend
- newconfd "${FILESDIR}"/tvheadend.confd tvheadend
-
- use systemd &&
- systemd_dounit "${FILESDIR}"/tvheadend.service
-}
-
-pkg_postinst() {
- elog "The Tvheadend web interface can be reached at:"
- elog "http://localhost:9981/"
- elog
- elog "Make sure that you change the default username"
- elog "and password via the Configuration / Access control"
- elog "tab in the web interface."
-
- . "${EROOT}"/etc/conf.d/tvheadend &>/dev/null
-
- if [[ ${TVHEADEND_CONFIG} = ${EPREFIX}/etc/tvheadend ]]; then
- echo
- ewarn "The HOME directory for the tvheadend user has changed from"
- ewarn "${EPREFIX}/etc/tvheadend to ${EPREFIX}/var/lib/tvheadend. The daemon will continue"
- ewarn "to use the old location until you update TVHEADEND_CONFIG in"
- ewarn "${EPREFIX}/etc/conf.d/tvheadend. Please manually move your existing files"
- ewarn "before you do so."
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/
@ 2024-06-22 22:00 James Le Cuirot
0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-06-22 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 2ebcc4c065037a790df488d1a7874d9b8f9701b9
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 22 21:57:41 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 22:00:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebcc4c0
media-tv/tvheadend: Bump snapshot to 20240618, fix systemd service
UNIX socket permission is needed for xmltv integration.
The PID file is not created or used because the systemd service is
"simple" with tvheadend running in the foreground.
Closes: https://bugs.gentoo.org/690120
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-tv/tvheadend/Manifest | 2 +-
media-tv/tvheadend/files/tvheadend.service | 5 ++---
...vheadend-4.3_p20240322.ebuild => tvheadend-4.3_p20240618.ebuild} | 6 ++----
media-tv/tvheadend/tvheadend-9999.ebuild | 1 -
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index a435496b5a38..4be00c4079ab 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1 +1 @@
-DIST tvheadend-4.3_p20240322.tar.gz 22572932 BLAKE2B b3c09c170a13765194885854ca162a2a55e8b10fca2f6c24eb7b03b9670adb0c88f082986ac974a174abc52db3c49704735b371de28050d12d4aad6cb4a8dfc0 SHA512 068e8f6c1d3b3da9af8babd25705c754b2d72173751d65086663a64a45c332c1e1b478f65b86665a531a1f3b9b2168df23f93583b82d96c08e80c475406986da
+DIST tvheadend-4.3_p20240618.tar.gz 22578849 BLAKE2B 49941eef965bdc5483116ba591ec92d1a2bd903df3a4fe610cfb77e5d1b90eb6328a2aff344bd1be0ed2b1a4299e3f3d7fd566035a649482f4b0f67f54b5218b SHA512 1fc2b5f7323ef5b919999fbb9c6ca86a12ff45c0fce10c86dc063070b62a9899b7320356153bd86cbd9b988a634a74b65737789006ff0b5928486f08a1869b46
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
diff --git a/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild b/media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
similarity index 98%
rename from media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
rename to media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
index 3839b754d85b..e9fefcd6df55 100644
--- a/media-tv/tvheadend/tvheadend-4.3_p20240322.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.3_p20240618.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-COMMIT="c63115464d8f6556fb4cac93ce8740afea1b00d5"
+COMMIT="e855f62e6697cf756ad2eed2ed03b8d06ba2019b"
PYTHON_COMPAT=( python3_{10..12} )
inherit linux-info python-single-r1 systemd toolchain-funcs
@@ -11,7 +11,7 @@ inherit linux-info python-single-r1 systemd toolchain-funcs
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
SRC_URI="https://github.com/tvheadend/tvheadend/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
+S="${WORKDIR}/${PN}-${COMMIT}"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="amd64 arm arm64 x86"
@@ -64,8 +64,6 @@ RDEPEND+="
xmltv? ( media-tv/xmltv )
"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
# Some patches from:
# https://github.com/rpmfusion/tvheadend
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 21d9095d7d84..aa832d625e41 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -10,7 +10,6 @@ inherit git-r3 linux-info python-single-r1 systemd toolchain-funcs
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-
LICENSE="GPL-3"
SLOT="0"
IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-06-22 22:00 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-02 8:41 [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/, media-tv/tvheadend/files/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2024-06-22 22:00 James Le Cuirot
2020-05-24 16:19 James Le Cuirot
2020-05-10 22:18 James Le Cuirot
2019-11-02 12:04 James Le Cuirot
2019-01-20 21:16 James Le Cuirot
2017-12-04 22:29 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox