diff options
author | James Le Cuirot <chewi@gentoo.org> | 2024-06-02 09:33:14 +0100 |
---|---|---|
committer | James Le Cuirot <chewi@gentoo.org> | 2024-06-02 09:41:20 +0100 |
commit | 209e5bcaf9e6aec8bf154d2d9d5d870c7e97ad9c (patch) | |
tree | ecee0b7f7f39cbd404bcfc94f218d726b0f2aea6 /media-tv | |
parent | www-apps/xpra-html5: Drop old 6.1 (diff) | |
download | gentoo-209e5bcaf9e6aec8bf154d2d9d5d870c7e97ad9c.tar.gz gentoo-209e5bcaf9e6aec8bf154d2d9d5d870c7e97ad9c.tar.bz2 gentoo-209e5bcaf9e6aec8bf154d2d9d5d870c7e97ad9c.zip |
media-tv/tvheadend: Drop old 4.2.8-r2
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'media-tv')
-rw-r--r-- | media-tv/tvheadend/Manifest | 1 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch | 24 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-fno-common.patch | 55 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-gcc9.patch | 36 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch | 29 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.8-no-dvb-fix.patch | 28 | ||||
-rw-r--r-- | media-tv/tvheadend/metadata.xml | 4 | ||||
-rw-r--r-- | media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild | 138 |
8 files changed, 0 insertions, 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 -} |