diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /media-tv/tvheadend | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'media-tv/tvheadend')
-rw-r--r-- | media-tv/tvheadend/Manifest | 8 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch | 115 | ||||
-rw-r--r-- | media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch | 110 | ||||
-rw-r--r-- | media-tv/tvheadend/tvheadend-4.2.7.ebuild (renamed from media-tv/tvheadend/tvheadend-4.2.6.ebuild) | 12 | ||||
-rw-r--r-- | media-tv/tvheadend/tvheadend-9999.ebuild | 8 |
5 files changed, 14 insertions, 239 deletions
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest index f794e2479f9b..bcafe939cd6c 100644 --- a/media-tv/tvheadend/Manifest +++ b/media-tv/tvheadend/Manifest @@ -1,12 +1,10 @@ AUX tvheadend-4.0.9-use_system_queue.patch 296 BLAKE2B 0986117969d9bb3463123e984aba7a73c8caf89b16f0c10e870a9b49857f8c946958a31900d99c5d332f5635cbd49ae544c2cc97f1e8a211c352bcaba965fe76 SHA512 56180b9c2fbb092530963229213805ec63e3d941c67d967e38b46f778db85db981234fe5727b5a8dcf64ab3a9e24c9d10b681abf275249e0d6f0ad63e391ecc4 AUX tvheadend-4.2.1-hdhomerun.patch 1045 BLAKE2B cad3922efbdd20c457c9570ecc75a786a997cafbe698226e31e4175394c38b79071ed7a165194ddc31e318ed015a0253dfb1f978695db35721749077154534f4 SHA512 416af870e5070001fbd0e09ec8c14160ff7c54b716564f708c6a983ca529cdf5963678c05551ad676a23c3347b4932bd7ae65e8eeea47a5f9f3955b46292c3f9 AUX tvheadend-4.2.2-dtv_scan_tables.patch 463 BLAKE2B 4e52d89d75c05d8a3cc645280794dd4570953bb5452d1067442177d7eb4c85779a8bcb96f1f8d3fbbcb6a34e770ff014bb262103eae5a92556ac4586038cdd9e SHA512 9bdecbac57ee1f30be91f9145e32f89949b5631090edc85cd5383915b09949ec9211f62474bd06afb4600e431093ce2ee5550d204b08c64b5b2e1a1cd38a517d -AUX tvheadend-4.2.5-ffmpeg_3.5.patch 5028 BLAKE2B 0a4d67473e9d3bc98a7f7c94593e0fe14a320e1ef0180356df7e7217e7469ea2044691f369837201445641a3cd30a58c5d15684834e49fc29ec997d37ffd08bf SHA512 4a6ab125c2670d3de64d81f3fce25ee671b027aba16cdefa6dfba7d28ca2f35e3b1f93f3d1774375c7ce830fef0485142a202201c05eae9a80b3b34930467d68 -AUX tvheadend-4.2.5-gcc8.patch 4104 BLAKE2B e6912ab8b9b2a787d239f94dc5d74e44db6bbad060b8398a06618859eb12b1eca893e024538643e93e99a6e79d637d0f126193dad60de541a8ba2696503c1e36 SHA512 d18368fb9923ea2fa60e5b62f69545fe4d5a2b5057fea0f97ad71b55fbe42b486d86472ae31fcfaf2520331b916c2c880f84c122c12ecdc31e5796bcfb7244ca AUX tvheadend.confd 355 BLAKE2B 36ba5a3466838b643beb877050ef6cc481adb91a433efa7429977104c9db1e6ef54901750d14dc0f43a20c89ddf504a9fc28a10a88d68105e5a5f07820696d50 SHA512 64ae0cca1e1b46a3ecb2fb4a4ba69ad1dd6a72ce57944b44be28768d293f9cca2ab29067335023f384433e8c75d976fbc4610ca574c930b9891a2f1c75ff4c0b AUX tvheadend.initd 375 BLAKE2B 6fbf53a0a67957ee5756b56189d42b741adb7603b5590aa5fa0fd6b2a1d1ba930af05de8ebedba343302aa861f7fb42d3eb25b67acf6b43aa7c956d4965ab944 SHA512 6f17fa6bee502f586b4500c5f5541c9c6ce095deed7ddb3c1d1ad129a2e22fa66de0e72b712866659f7080753c73f67154d6dcdbf8539d6c8a942bea29bb1aa7 AUX tvheadend.service 577 BLAKE2B f6762aef0f9370a7ad1e438aa4b35c500c40240bd7d66db5e32b061c0dc9776adc2b8de2c395b2299151bd5c6fc8735944a8384828b873b29fbf6c1ed76bafde SHA512 1192b98da179503bc249e0b0d3a0e6c2bf420bfb7d14a72b917fe9e1975a42d1647b5d951ead8f18419999f4c74c352b21e58c28bacc65419012d46bb83270d4 -DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419 SHA512 6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709 -EBUILD tvheadend-4.2.6.ebuild 3056 BLAKE2B 8fe71e0d2e181038928e5ee51dc530874233d7b61bce63b1832e9357e10cfbfee189d21aefcf8e5eb80a2a5bc27409b83918ba41abc218cb121f6426c48a4b7c SHA512 f878fcb7c437076329d1e2e6184da4c1c21facd7cd3786c22040bab026ed3b31f68ec950d21767c661bfa0efab808202cf7162925aa9bbbd62c0a6924e8a0416 -EBUILD tvheadend-9999.ebuild 3715 BLAKE2B a7477dd7c4417416bd96da0c8662f5c2e719a731beecf2f22341248b0e04e98a8da232a12813af0cc41b1c70326d09d849d7f265dde1dfc631a237484ae66d7e SHA512 fc8659aac79ca96cfe6a582a391e6cff5e1aed8627f05993e7b83385cfae744fcb6d9d6d281c2dab9be013ebf56f19078f22a74b7bac4b0349ad5494eba3a70c +DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537 SHA512 14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9 +EBUILD tvheadend-4.2.7.ebuild 2983 BLAKE2B 5d8f1b0cc1b0948942643fdb07d58a63c8a0fac090cdc33e0899badb9c1c39dc27a65687b27036b93516ee4493b2c58e160d33ea75cec4c7ab065f9f4f513dde SHA512 7b3a50c0cfd0a24da0a962f0870f19e63df805d6cd1adc0f2fecf32d4ae09408e0f2a0318c88c0550b3623cd5b27709076274f9827cb2d2fdf6e24806135f47b +EBUILD tvheadend-9999.ebuild 3727 BLAKE2B 043e767496b4b9754c113e880517b50eaa3467bd7f85ab56417bb6d834d43422e8a8b40565bfd8f15f41a753419dba6a5010fe32f2a3a206026978b4f32eddf7 SHA512 c51028cbe7632a7ee3b5ef3719e774d10dff6c176243cfc36bb02331863e32b0d623af7fd1e4a55ee64441a00bbc97d695a37382d897004dc0f3fbd6dec9a266 MISC metadata.xml 1445 BLAKE2B f71dc280d5fce7c0945939bcaf75d0d7f294aea6055c956b04e9e439199c2a6c107c800be6d18a0c58d154bdf7cdd0cd7d874e5cde5fc93f9b24160f536d21d8 SHA512 e26b94f14a619051e637b018d0f47ce86381821dd5207ba5b34429e0c0f83c55bfa9c37871e722af85719cf3e06322703d4709cbbd771b8f092efb8e85cb5b72 diff --git a/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch b/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch deleted file mode 100644 index eaec90eabcef..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up ./src/muxer/muxer_libav.c.orig ./src/muxer/muxer_libav.c ---- ./src/muxer/muxer_libav.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/muxer/muxer_libav.c 2018-01-23 14:24:07.923509542 +0100 -@@ -174,7 +174,7 @@ lav_muxer_add_stream(lav_muxer_t *lm, - } - - if(lm->lm_oc->oformat->flags & AVFMT_GLOBALHEADER) -- c->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - return 0; - } -diff -up ./src/plumbing/transcoding.c.orig ./src/plumbing/transcoding.c ---- ./src/plumbing/transcoding.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/plumbing/transcoding.c 2018-01-23 14:43:14.873964416 +0100 -@@ -19,7 +19,7 @@ - #include <unistd.h> - #include <libavformat/avformat.h> - #include <libavcodec/avcodec.h> --#include <libavfilter/avfiltergraph.h> -+#include <libavfilter/avfilter.h> - #include <libavfilter/buffersink.h> - #include <libavfilter/buffersrc.h> - #include <libavutil/opt.h> -@@ -574,7 +574,7 @@ transcoder_stream_audio(transcoder_t *t, - octx->channels = as->aud_channels ? as->aud_channels : ictx->channels; - octx->channel_layout = transcode_get_channel_layout(&octx->channels, ocodec); - octx->bit_rate = as->aud_bitrate ? as->aud_bitrate : 0; -- octx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - if (!octx->sample_rate) { - tvherror(LS_TRANSCODE, "%04X: audio encoder has no suitable sample rate!", shortid(t)); -@@ -619,7 +619,7 @@ transcoder_stream_audio(transcoder_t *t, - break; - - case SCT_AAC: -- octx->flags |= CODEC_FLAG_BITEXACT; -+ octx->flags |= AV_CODEC_FLAG_BITEXACT; - // use 64 kbit per channel as default - if (octx->bit_rate == 0) { - octx->bit_rate = octx->channels * 64000; -@@ -630,10 +630,10 @@ transcoder_stream_audio(transcoder_t *t, - // use vbr with quality setting as default - // and also use a user specified bitrate < 16 kbit as quality setting - if (octx->bit_rate == 0) { -- octx->flags |= CODEC_FLAG_QSCALE; -+ octx->flags |= AV_CODEC_FLAG_QSCALE; - octx->global_quality = 4 * FF_QP2LAMBDA; - } else if (t->t_props.tp_abitrate < 16) { -- octx->flags |= CODEC_FLAG_QSCALE; -+ octx->flags |= AV_CODEC_FLAG_QSCALE; - octx->global_quality = t->t_props.tp_abitrate * FF_QP2LAMBDA; - octx->bit_rate = 0; - } -@@ -1048,7 +1048,7 @@ create_video_filter(video_stream_t *vs, - AVCodecContext *ictx, AVCodecContext *octx) - { - AVFilterInOut *flt_inputs, *flt_outputs; -- AVFilter *flt_bufsrc, *flt_bufsink; -+ const AVFilter *flt_bufsrc, *flt_bufsink; - enum AVPixelFormat pix_fmts[] = { 0, AV_PIX_FMT_NONE }; - char opt[128]; - int err; -@@ -1289,12 +1289,12 @@ transcoder_stream_video(transcoder_t *t, - else - octx->pix_fmt = AV_PIX_FMT_YUV420P; - -- octx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - if (t->t_props.tp_vbitrate < 64) { - // encode with specified quality and optimize for low latency - // valid values for quality are 2-31, smaller means better quality, use 5 as default -- octx->flags |= CODEC_FLAG_QSCALE; -+ octx->flags |= AV_CODEC_FLAG_QSCALE; - octx->global_quality = FF_QP2LAMBDA * - (t->t_props.tp_vbitrate == 0 ? 5 : MINMAX(t->t_props.tp_vbitrate, 2, 31)); - } else { -@@ -1340,7 +1340,7 @@ transcoder_stream_video(transcoder_t *t, - else - octx->pix_fmt = AV_PIX_FMT_YUV420P; - -- octx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - // Default = "medium". We gain more encoding speed compared to the loss of quality when lowering it _slightly_. - // select preset according to system performance and codec type -@@ -1371,7 +1371,7 @@ transcoder_stream_video(transcoder_t *t, - - case SCT_HEVC: - octx->pix_fmt = AV_PIX_FMT_YUV420P; -- octx->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ octx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - // on all hardware ultrafast (or maybe superfast) should be safe - // select preset according to system performance -@@ -2177,7 +2177,7 @@ transcoder_get_capabilities(int experime - if (!WORKING_ENCODER(p->id)) - continue; - -- if (((p->capabilities & CODEC_CAP_EXPERIMENTAL) && !experimental) || -+ if (((p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && !experimental) || - (p->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)) { - continue; - } -@@ -2192,7 +2192,7 @@ transcoder_get_capabilities(int experime - htsmsg_add_str(m, "name", p->name); - snprintf(buf, sizeof(buf), "%s%s", - p->long_name ?: "", -- (p->capabilities & CODEC_CAP_EXPERIMENTAL) ? -+ (p->capabilities & AV_CODEC_CAP_EXPERIMENTAL) ? - " (Experimental)" : ""); - if (buf[0] != '\0') - htsmsg_add_str(m, "long_name", buf); diff --git a/media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch b/media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch deleted file mode 100644 index 1891808e4077..000000000000 --- a/media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -up ./src/dvr/dvr_rec.c.orig ./src/dvr/dvr_rec.c ---- ./src/dvr/dvr_rec.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/dvr/dvr_rec.c 2018-03-08 17:15:06.479877783 +0100 -@@ -669,7 +669,7 @@ static int - pvr_generate_filename(dvr_entry_t *de, const streaming_start_t *ss) - { - char filename[PATH_MAX]; -- char path[PATH_MAX]; -+ char path[PATH_MAX + 1]; - char ptmp[PATH_MAX]; - char number[16]; - char tmp[MAX(PATH_MAX, 512)]; -diff -up ./src/epgdb.c.orig ./src/epgdb.c ---- ./src/epgdb.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/epgdb.c 2018-03-08 17:15:06.479877783 +0100 -@@ -470,7 +470,7 @@ static int _epg_write_sect ( sbuf_t *sb, - - static void epg_save_tsk_callback ( void *p, int dearmed ) - { -- char tmppath[PATH_MAX]; -+ char tmppath[PATH_MAX + 4]; - char path[PATH_MAX]; - sbuf_t *sb = p; - size_t size = sb->sb_ptr, orig; -diff -up ./src/epggrab/module/eit.c.orig ./src/epggrab/module/eit.c ---- ./src/epggrab/module/eit.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/epggrab/module/eit.c 2018-03-08 17:15:06.480877787 +0100 -@@ -50,8 +50,8 @@ typedef struct eit_private - - typedef struct eit_event - { -- char uri[257]; -- char suri[257]; -+ char uri[529]; -+ char suri[529]; - - lang_str_t *title; - lang_str_t *summary; -diff -up ./src/imagecache.c.orig ./src/imagecache.c ---- ./src/imagecache.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/imagecache.c 2018-03-08 17:15:06.481877791 +0100 -@@ -252,7 +252,7 @@ imagecache_image_fetch ( imagecache_imag - { - int res = 1, r; - url_t url; -- char tpath[PATH_MAX] = "", path[PATH_MAX]; -+ char tpath[PATH_MAX + 4] = "", path[PATH_MAX]; - tvhpoll_event_t ev; - tvhpoll_t *efd = NULL; - http_client_t *hc = NULL; -diff -up ./src/input/mpegts/dvb_psi.c.orig ./src/input/mpegts/dvb_psi.c ---- ./src/input/mpegts/dvb_psi.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/input/mpegts/dvb_psi.c 2018-03-08 17:15:06.482877795 +0100 -@@ -678,7 +678,7 @@ static int - dvb_freesat_add_service - ( dvb_bat_id_t *bi, dvb_freesat_region_t *fr, mpegts_service_t *s, uint32_t lcn ) - { -- char name[96], src[64]; -+ char name[96], src[126]; - if (!fr->bouquet) { - strcpy(name, "???"); - if (idnode_is_instance(&bi->mm->mm_id, &dvb_mux_dvbs_class)) -diff -up ./src/input/mpegts/dvb_support.c.orig ./src/input/mpegts/dvb_support.c ---- ./src/input/mpegts/dvb_support.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/input/mpegts/dvb_support.c 2018-03-08 17:15:06.483877799 +0100 -@@ -853,7 +853,7 @@ dvb_str2val(qam); - - const char *dvb_bw2str(int p) - { -- static char __thread buf[16]; -+ static char __thread buf[17]; - const char *res = dvb_common2str(p); - if (res) - return res; -diff -up ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c.orig ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c ---- ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/input/mpegts/linuxdvb/linuxdvb_satconf.c 2018-03-08 17:15:06.484877803 +0100 -@@ -185,7 +185,7 @@ linuxdvb_satconf_class_orbitalpos_set - linuxdvb_satconf_t *ls = p; - int c = *(int*)linuxdvb_satconf_class_orbitalpos_get(p); - int n = *(int*)v; -- char buf[20]; -+ char buf[22]; - - if (n == c) - return 0; -diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c ---- ./src/input/mpegts/scanfile.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/input/mpegts/scanfile.c 2018-03-08 17:23:20.200963915 +0100 -@@ -331,7 +331,7 @@ scanfile_create_network - { - scanfile_region_t *reg = NULL; - scanfile_network_t *net; -- char buf[256], buf2[256], buf3[256], *str; -+ char buf[256], buf2[263], buf3[270], *str; - int opos; - - /* Region */ -diff -up ./src/settings.c.orig ./src/settings.c ---- ./src/settings.c.orig 2017-12-18 09:57:28.000000000 +0100 -+++ ./src/settings.c 2018-03-08 17:15:06.484877803 +0100 -@@ -129,7 +129,7 @@ void - hts_settings_save(htsmsg_t *record, const char *pathfmt, ...) - { - char path[PATH_MAX]; -- char tmppath[PATH_MAX]; -+ char tmppath[PATH_MAX + 4]; - int fd; - va_list ap; - htsbuf_queue_t hq; diff --git a/media-tv/tvheadend/tvheadend-4.2.6.ebuild b/media-tv/tvheadend/tvheadend-4.2.7.ebuild index 72be6b32f041..e72ceb2f7e33 100644 --- a/media-tv/tvheadend/tvheadend-4.2.6.ebuild +++ b/media-tv/tvheadend/tvheadend-4.2.7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit linux-info systemd toolchain-funcs user @@ -15,6 +15,10 @@ KEYWORDS="~amd64 ~arm ~x86" IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + RDEPEND=" virtual/libiconv dbus? ( sys-apps/dbus ) @@ -30,8 +34,6 @@ RDEPEND=" DEPEND=" ${RDEPEND} - sys-devel/gettext - virtual/pkgconfig dvb? ( virtual/linuxtv-dvb-headers )" RDEPEND+=" @@ -47,8 +49,6 @@ 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.5-ffmpeg_3.5.patch - "${FILESDIR}"/${PN}-4.2.5-gcc8.patch ) DOCS=( README.md ) diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild index 8ee4fdaf1183..96ff9acc83cc 100644 --- a/media-tv/tvheadend/tvheadend-9999.ebuild +++ b/media-tv/tvheadend/tvheadend-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit git-r3 linux-info systemd toolchain-funcs user @@ -15,6 +15,10 @@ KEYWORDS="" IUSE="dbus debug +ddci dvbcsa +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig" + RDEPEND=" virtual/libiconv dbus? ( sys-apps/dbus ) @@ -32,8 +36,6 @@ RDEPEND=" DEPEND=" ${RDEPEND} - sys-devel/gettext - virtual/pkgconfig dvb? ( virtual/linuxtv-dvb-headers ) ffmpeg? ( opus? ( media-libs/opus ) |