* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2015-10-13 11:24 Ian Delaney
0 siblings, 0 replies; 9+ messages in thread
From: Ian Delaney @ 2015-10-13 11:24 UTC (permalink / raw
To: gentoo-commits
commit: 90707a8ef54250b4bca083184beed7d39aff17e3
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 11:22:54 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 11:23:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90707a8e
media-tv/tvheadend: bump to -4.0.6, patch to fixing issues re IUSE iconv
patch submitted thanks to Olliver Schinagl, ebuild prepared by new
designated proxy maintainer 'wraeth' submitted via gentoo bug,
old versions removed on request of maintainer.
Gnetoo bug: #551884
Package-Manager: portage-2.2.20.1
media-tv/tvheadend/Manifest | 4 +-
media-tv/tvheadend/files/glibc_iconv.patch | 40 ++++++++++++
media-tv/tvheadend/metadata.xml | 33 ++++++----
media-tv/tvheadend/tvheadend-2.12.ebuild | 73 ----------------------
media-tv/tvheadend/tvheadend-3.2.ebuild | 71 ---------------------
media-tv/tvheadend/tvheadend-3.4.27.ebuild | 4 +-
...eadend-3.4.27.ebuild => tvheadend-4.0.6.ebuild} | 65 +++++++++++++------
media-tv/tvheadend/tvheadend-9999.ebuild | 4 +-
8 files changed, 113 insertions(+), 181 deletions(-)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index a40c11b..8d82a28 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,3 +1,3 @@
-DIST hts-tvheadend_2.12.tar.gz 1475053 SHA256 c2e33384b24356be036bf8e58a026efeed247b001d3674929dc0016bf2b0e11b SHA512 87808a57454b58f458e8e7db6d381e34917064a0f196ed4e91f2ee912575282e121ada72d11ce6c3f8c5e2913dc4510b0b1e6a7d252b702946c033ef35e85c68 WHIRLPOOL 953735a6796972dbf5a7b2f541fc07c7dc2666e4a15f007fdefd92b7445055c227ce8b570088e4fd0810ffebd3271a19af7fd023eb58dfd046b24d45be5053cc
-DIST tvheadend-3.2.tar.gz 2155532 SHA256 4bda0da2488c2078c6bd7e92ea5099c7c1e6c52fd361af965c83e82070cfb651 SHA512 f4f87a42c10bf9989606ca932ba916f9c70d0adfc1c0f6ee1f1dd3c23545de8e1699c4f519c56a7f5df0b27521d7f714c02ea5d30432756511baefb00ddd8d22 WHIRLPOOL 8dbf8c7eeff31b132f61d7ff8cf5412659e430e3fe47733ec54e7e804b8be608bd9886d8149975a91653608edeb641781e08c6f3df819dc08a4f7d96abe41dfb
+DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609 WHIRLPOOL afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a WHIRLPOOL b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
+DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266 WHIRLPOOL 6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b
diff --git a/media-tv/tvheadend/files/glibc_iconv.patch b/media-tv/tvheadend/files/glibc_iconv.patch
new file mode 100644
index 0000000..9118786
--- /dev/null
+++ b/media-tv/tvheadend/files/glibc_iconv.patch
@@ -0,0 +1,40 @@
+From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
+From: Olliver Schinagl <oliver@schinagl.nl>
+Date: Sat, 26 Sep 2015 22:36:08 +0200
+Subject: [PATCH] Use glibc version iconv
+
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+---
+ Makefile | 2 +-
+ configure | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 07d6965..0ec0259 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@ else
+ LDFLAGS += -ldl -lpthread -lm
+ endif
+ ifeq ($(CONFIG_LIBICONV),yes)
+-LDFLAGS += -liconv
++LDFLAGS +=
+ endif
+ ifeq ($(PLATFORM), darwin)
+ LDFLAGS += -framework CoreServices
+diff --git a/configure b/configure
+index 487456b..a6cce11 100755
+--- a/configure
++++ b/configure
+@@ -214,7 +214,7 @@ int test(void)
+ iconv_t ic = iconv_open("ASCII", "ASCII");
+ return 0;
+ }
+-' -liconv
++'
+
+ if enabled_or_auto dvben50221; then
+ check_cc_snippet libdvben50221 '
+--
+2.4.6
+
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index e6ede41..8cda002 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,16 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>leho@kraav.com</email>
- <name>Leho Kraav</name>
- </maintainer>
- <use>
- <flag name='xmltv'>Use <pkg>media-tv/xmltv</pkg></flag>
- <flag name='ccache'>Use <pkg>dev-util/ccache</pkg></flag>
- <flag name='dvbscan'>Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
- <flag name='imagecache'>Enable support for image caching</flag>
- <flag name='uriparser'>Use <pkg>dev-libs/uriparser</pkg></flag>
- </use>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>wraeth@wraeth.id.au</email>
+ <name>Sam Jorna</name>
+ <description>Proxy maintaner, to be assugned to bugs</description>
+ </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='epoll'>Enable epoll Linux system call</flag>
+ <flag name='hdhomerun'>Enable support for the HDHomeRun device</flag>
+ <flag name='iptv'>Enable support for Internet Protocol TV</flag>
+ <flag name='satip'>Enable support for IP-based Satellite TV</flag>
+ <flag name='timeshift'>Enable TimeShift support</flag>
+ <flag name='xmltv'>Use <pkg>media-tv/xmltv</pkg></flag>
+ <flag name='ccache'>Use <pkg>dev-util/ccache</pkg></flag>
+ <flag name='dvbscan'>Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
+ <flag name='imagecache'>Enable support for image caching</flag>
+ <flag name='uriparser'>Use <pkg>dev-libs/uriparser</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/media-tv/tvheadend/tvheadend-2.12.ebuild b/media-tv/tvheadend/tvheadend-2.12.ebuild
deleted file mode 100644
index aa19691..0000000
--- a/media-tv/tvheadend/tvheadend-2.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs user
-
-MY_PN="hts-${PN}"
-
-DESCRIPTION="A combined DVB receiver, Digital Video Recorder and Live TV streaming server"
-HOMEPAGE="http://www.lonelycoder.com/hts/"
-SRC_URI="http://www.lonelycoder.com/debian/dists/hts/main/source/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi xmltv"
-
-DEPEND="virtual/linuxtv-dvb-headers"
-RDEPEND="${DEPEND}
- avahi? ( net-dns/avahi )
- xmltv? ( media-tv/xmltv )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
- enewuser tvheadend -1 -1 /dev/null video
-}
-
-src_prepare() {
- # set version number to avoid subversion and git dependencies
- sed -e 's:\$(shell support/version.sh):${PV}:' \
- -i Makefile || die "sed failed!"
-
- # remove stripping
- sed -e 's:install -s:install:' \
- -i support/posix.mk || die "sed failed!"
-
- # remove '-Werror' wrt bug #438424
- sed -i 's:-Werror::' Makefile || die "sed on removing '-Werror' failed!"
-}
-
-src_configure() {
- econf $(use_enable avahi) --release
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc ChangeLog README
- doman man/tvheadend.1
-
- newinitd "${FILESDIR}/tvheadend.initd" tvheadend
- newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
- 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."
-}
diff --git a/media-tv/tvheadend/tvheadend-3.2.ebuild b/media-tv/tvheadend/tvheadend-3.2.ebuild
deleted file mode 100644
index 7d9b290..0000000
--- a/media-tv/tvheadend/tvheadend-3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A combined DVB receiver, Digital Video Recorder and Live TV streaming server"
-HOMEPAGE="https://www.lonelycoder.com/redmine/projects/tvheadend/"
-SRC_URI="mirror://github/tvheadend/tvheadend/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi xmltv zlib"
-
-DEPEND="dev-libs/openssl
- virtual/linuxtv-dvb-headers
- avahi? ( net-dns/avahi )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- xmltv? ( media-tv/xmltv )"
-
-DOCS=( README )
-
-pkg_setup() {
- enewuser tvheadend -1 -1 /dev/null video
-}
-
-src_prepare() {
- # set the correct version number
- sed -e "s:(3.1.694):(${PV}):" -i debian/changelog || die 'sed failed!'
-
- # remove '-Werror' wrt bug #438424
- sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
-}
-
-src_configure() {
- econf --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/"${PN}" \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --release \
- --disable-dvbscan \
- $(use_enable avahi) \
- $(use_enable zlib)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}/tvheadend.initd" tvheadend
- newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
- 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."
-}
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index b5e760f..0a8d85f 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,7 +20,7 @@ IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify xmltv zlib"
REQUIRED_USE="dvbscan? ( dvb )"
-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:0=
avahi? ( net-dns/avahi )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
similarity index 51%
copy from media-tv/tvheadend/tvheadend-3.4.27.ebuild
copy to media-tv/tvheadend/tvheadend-4.0.6.ebuild
index b5e760f..fc0031e 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,49 +6,62 @@ EAPI=5
inherit eutils linux-info systemd toolchain-funcs user
-MY_PV="3.4patch1"
-
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 )"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify xmltv zlib"
-
-REQUIRED_USE="dvbscan? ( dvb )"
+IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
-DEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:=
avahi? ( net-dns/avahi )
+ capmt? ( virtual/linuxtv-dvb-headers )
+ ccache? ( dev-util/ccache sys-libs/zlib )
+ dbus? ( sys-apps/dbus )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
+ hdhomerun? ( media-libs/libhdhomerun )
+ iconv? ( virtual/libiconv )
+ libav? ( media-video/libav )
imagecache? ( net-misc/curl )
+ uriparser? ( dev-libs/uriparser )
zlib? ( sys-libs/zlib )
- virtual/pkgconfig"
-
-RDEPEND="${DEPEND}
- dvbscan? ( media-tv/linuxtv-dvb-apps )
xmltv? ( media-tv/xmltv )"
-S="${WORKDIR}/${PN}-${MY_PV}"
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
CONFIG_CHECK="~INOTIFY_USER"
-DOCS=( README )
+DOCS=( README.md )
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+
+ if use dvbscan; then
+ mkdir "${S}/data/dvb-scan" || die
+ cd "${T}"
+ unpack dtv-scan-tables-2015-02-08-f2053b3.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_prepare() {
- # set the version number
- echo "const char *tvheadend_version = \"${PV}\";" \
- > src/version.c || die "setting version failed!"
-
# remove '-Werror' wrt bug #438424
sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+ epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
}
src_configure() {
@@ -56,11 +69,25 @@ src_configure() {
--datadir="${EPREFIX}"/usr/share \
--mandir="${EPREFIX}"/usr/share/man/man1 \
$(use_enable avahi) \
- --disable-dvbscan \
+ $(use_enable ccache) \
+ $(use_enable capmt) \
+ $(use_enable constcw) \
+ $(use_enable cwc) \
+ $(use_enable dbus) \
$(use_enable dvb linuxdvb) \
+ $(use_enable dvbscan) \
+ $(use_enable epoll) \
+ --disable-kqueue \
$(use_enable ffmpeg libav) \
+ $(use_enable hdhomerun hdhomerun_client) \
+ $(use_enable libav) \
$(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 zlib)
}
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 1744e47..495a3d1 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ KEYWORDS=""
IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:0=
avahi? ( net-dns/avahi )
ccache? ( dev-util/ccache )
dvb? ( virtual/linuxtv-dvb-headers )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2016-01-24 23:04 Sven Wegener
0 siblings, 0 replies; 9+ messages in thread
From: Sven Wegener @ 2016-01-24 23:04 UTC (permalink / raw
To: gentoo-commits
commit: a728d8583db95ba7dbe768bbc2e14dfcfed82709
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 09:21:52 2016 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 23:03:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a728d858
media-tv/tvheadend: Remove iconv patch and USE flag
The patch is wrong. The configure check only checks whether we need to
link against libiconv for the iconv functions. iconv support is always
activated and we need to unconditionally depend on virtual/libiconv.
Signed-off-by: Sven Wegener <swegener <AT> gentoo.org>
.../files/4.0.6-use-glibc-version-iconv.patch | 40 ----------------------
media-tv/tvheadend/tvheadend-4.0.6.ebuild | 5 ++-
media-tv/tvheadend/tvheadend-9999.ebuild | 1 +
3 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch b/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
deleted file mode 100644
index 9118786..0000000
--- a/media-tv/tvheadend/files/4.0.6-use-glibc-version-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
-From: Olliver Schinagl <oliver@schinagl.nl>
-Date: Sat, 26 Sep 2015 22:36:08 +0200
-Subject: [PATCH] Use glibc version iconv
-
-Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
----
- Makefile | 2 +-
- configure | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 07d6965..0ec0259 100644
---- a/Makefile
-+++ b/Makefile
-@@ -39,7 +39,7 @@ else
- LDFLAGS += -ldl -lpthread -lm
- endif
- ifeq ($(CONFIG_LIBICONV),yes)
--LDFLAGS += -liconv
-+LDFLAGS +=
- endif
- ifeq ($(PLATFORM), darwin)
- LDFLAGS += -framework CoreServices
-diff --git a/configure b/configure
-index 487456b..a6cce11 100755
---- a/configure
-+++ b/configure
-@@ -214,7 +214,7 @@ int test(void)
- iconv_t ic = iconv_open("ASCII", "ASCII");
- return 0;
- }
--' -liconv
-+'
-
- if enabled_or_auto dvben50221; then
- check_cc_snippet libdvben50221 '
---
-2.4.6
-
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
index 596042b..5512e71 100644
--- a/media-tv/tvheadend/tvheadend-4.0.6.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -17,9 +17,10 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
RDEPEND="dev-libs/openssl:=
+ virtual/libiconv
avahi? ( net-dns/avahi )
capmt? ( virtual/linuxtv-dvb-headers )
ccache? ( dev-util/ccache sys-libs/zlib )
@@ -30,7 +31,6 @@ RDEPEND="dev-libs/openssl:=
libav? ( media-video/libav:= )
)
hdhomerun? ( media-libs/libhdhomerun )
- iconv? ( virtual/libiconv )
imagecache? ( net-misc/curl )
uriparser? ( dev-libs/uriparser )
zlib? ( sys-libs/zlib )
@@ -65,7 +65,6 @@ pkg_setup() {
src_prepare() {
# remove '-Werror' wrt bug #438424
sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
- epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
}
src_configure() {
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 495a3d1..184366e 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -17,6 +17,7 @@ KEYWORDS=""
IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
DEPEND="dev-libs/openssl:0=
+ virtual/libiconv
avahi? ( net-dns/avahi )
ccache? ( dev-util/ccache )
dvb? ( virtual/linuxtv-dvb-headers )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2016-05-07 15:43 Sam Jorna
0 siblings, 0 replies; 9+ messages in thread
From: Sam Jorna @ 2016-05-07 15:43 UTC (permalink / raw
To: gentoo-commits
commit: 1c7530a056684f82f60b801ea2f2fdee235ce976
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 11:11:30 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sat May 7 15:43:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7530a0
media-tv/tvheadend: bump to 4.0.9
Bumps to v4.0.9, additionally fixes build issue against hdhomerun.
Gentoo-bug: 578816
Package-Manager: portage-2.2.28
media-tv/tvheadend/Manifest | 1 +
.../files/tvheadend-4.0.9-hdhomerun-include.patch | 27 +++++
media-tv/tvheadend/tvheadend-4.0.9.ebuild | 120 +++++++++++++++++++++
3 files changed, 148 insertions(+)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 37da342..2fa330c 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -2,3 +2,4 @@ DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 83ed1b669009ef325e
DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a WHIRLPOOL b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266 WHIRLPOOL 6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b
DIST tvheadend-4.0.8.tar.gz 15826229 SHA256 04f485c25fcca604165622679e9e7be7aee7575d67f326f5ed8b4ceff63d8f4c SHA512 b506dfbb5a4bbb44e772953cbd9bbdd8fdd3d5d22e13977ea5b186eb61a421c32196ab92d2f851907e48880b1fd2d543cbee95ba0004e4040fa0064156775e59 WHIRLPOOL f89c1d3675762b474857b83edbc61b0c074ead2dac08511efd073855d9573ec5dd16e3e2350f0945960148fea6a55a02f5d61a2fa303d842dcff62ca7047ca45
+DIST tvheadend-4.0.9.tar.gz 15825419 SHA256 cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977 SHA512 ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e WHIRLPOOL c0db6afa8d16201eab5fb188f81d062f84066037395f7e47e496d377e8207e2ffef021a58e07cba4af1217963fb2541b1822681fd33799113858329e9ff287bf
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
new file mode 100644
index 0000000..8a0768f
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.0.9-hdhomerun-include.patch
@@ -0,0 +1,27 @@
+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/tvheadend-4.0.9.ebuild b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
new file mode 100644
index 0000000..770aa5f
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.9.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${DTV_SCAN_TABLES_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+# does not build with ffmpeg-3 - bug 574990
+# https://tvheadend.org/issues/3597
+RDEPEND="dev-libs/openssl:=
+ virtual/libiconv
+ avahi? ( net-dns/avahi )
+ dbus? ( sys-apps/dbus )
+ ffmpeg? (
+ !libav? (
+ media-video/ffmpeg:0=
+ <media-video/ffmpeg-3
+ )
+ libav? ( media-video/libav:= )
+ )
+ hdhomerun? ( media-libs/libhdhomerun )
+ uriparser? ( dev-libs/uriparser )
+ 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() {
+ econf --prefix="${EPREFIX}"/usr \
+ --datadir="${EPREFIX}"/usr/share \
+ --disable-ccache \
+ --nowerror \
+ --disable-hdhomerun_static \
+ $(use_enable avahi) \
+ $(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 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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2017-12-04 22:20 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2017-12-04 22:20 UTC (permalink / raw
To: gentoo-commits
commit: f3544384630a818ea97571db41ee93919ad9c719
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 22:11:05 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 22:20:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3544384
media-tv/tvheadend: Version bump to 4.2.4 and 9999 update
* Add support for dvbcsa via USE flag
* Add support for dvben50221 via USE flag
* Drop support for libav (fails version checks, missing symbols)
* Source DTV scan tables from new media-tv/dtv-scan-tables package
* Set tvheadend user HOME to /etc/tvheadend to allow for XMLTV data
* Tighten up the systemd service unit
* Add debug USE flag for trace support
* Fix inotify kernel config check
* Add ffmpeg sub-dependencies and associated USE flags (9999 only)
Closes: https://bugs.gentoo.org/579048
Closes: https://bugs.gentoo.org/579986
Closes: https://bugs.gentoo.org/586448
Closes: https://bugs.gentoo.org/588210
Closes: https://bugs.gentoo.org/626238
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-tv/tvheadend/Manifest | 5 +-
.../files/tvheadend-4.0.9-use_system_queue.patch | 12 +++
.../files/tvheadend-4.2.1-hdhomerun.patch | 24 ++++++
.../files/tvheadend-4.2.2-dtv_scan_tables.patch | 12 +++
media-tv/tvheadend/files/tvheadend.service | 15 +++-
media-tv/tvheadend/metadata.xml | 12 ++-
...vheadend-9999.ebuild => tvheadend-4.2.4.ebuild} | 73 +++++++++++-------
media-tv/tvheadend/tvheadend-9999.ebuild | 90 +++++++++++++++-------
8 files changed, 180 insertions(+), 63 deletions(-)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index f74c515869a..7d3e91d7b72 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1,3 @@
-DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609 WHIRLPOOL afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
-DIST tvheadend-4.0.9.tar.gz 15825419 SHA256 cea1106f45e286e8c25e6b2f0a581c28bd85e93ce3801ecaac7041568a214977 SHA512 ba8c6edcef126c6a260a9251b0948747074061c8f16fb20f03b250c6698645172c9396530b7fa44bf9cf4d8305fcece08c672c812ba6c48211edfbb2691fb58e WHIRLPOOL c0db6afa8d16201eab5fb188f81d062f84066037395f7e47e496d377e8207e2ffef021a58e07cba4af1217963fb2541b1822681fd33799113858329e9ff287bf
+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-use_system_queue.patch b/media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch
new file mode 100644
index 00000000000..13ac3573ed2
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.0.9-use_system_queue.patch
@@ -0,0 +1,12 @@
+diff -up ./src/queue.h.orig ./src/queue.h
+--- ./src/queue.h.orig 2016-03-14 10:10:57.000000000 +0100
++++ ./src/queue.h 2016-07-04 17:47:22.480252171 +0200
+@@ -5,7 +5,7 @@
+ #ifndef HTSQ_H
+ #define HTSQ_H
+
+-#include "../vendor/include/sys/queue.h"
++#include <sys/queue.h>
+
+ /*
+ * Extra LIST-ops
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
new file mode 100644
index 00000000000..64f6f691b97
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.1-hdhomerun.patch
@@ -0,0 +1,24 @@
+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.2-dtv_scan_tables.patch b/media-tv/tvheadend/files/tvheadend-4.2.2-dtv_scan_tables.patch
new file mode 100644
index 00000000000..51310262871
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.2-dtv_scan_tables.patch
@@ -0,0 +1,12 @@
+diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c
+--- ./src/input/mpegts/scanfile.c.orig 2017-05-16 13:15:24.000000000 +0200
++++ ./src/input/mpegts/scanfile.c 2017-06-01 22:30:29.150834135 +0200
+@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path
+ #elif defined(PLATFORM_FREEBSD)
+ path = "/usr/local/share/dtv-scan-tables";
+ #else
+- path = "/usr/share/dvb";
++ path = "/usr/share/dvbv5";
+ #endif
+
+ if (!initialized) {
diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service
index 227faffcb08..2d0573ca910 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -4,11 +4,20 @@ After=network.target
[Service]
Type=forking
-PIDFile=/run/tvheadend.pid
-ExecStart=/usr/bin/tvheadend -f -p /run/tvheadend.pid -C -c /etc/tvheadend -u tvheadend -g video
-ExecStop=/usr/bin/rm /run/tvheadend.pid
+User=tvheadend
+Group=video
+RuntimeDirectory=tvheadend
+PIDFile=/run/tvheadend/tvheadend.pid
+ExecStart=/usr/bin/tvheadend -6 -f -p /run/tvheadend.pid -C -c /etc/tvheadend
Restart=always
RestartSec=5
+DevicePolicy=closed
+DeviceAllow=char-DVB rw # DVB devices
+DeviceAllow=char-drm rw # GPUs for transcoding
+RestrictAddressFamilies=AF_INET AF_INET6
+ProtectSystem=strict
+ProtectHome=yes
+NoNewPrivileges=yes
[Install]
WantedBy=multi-user.target
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 9d99f123841..f8bdade2268 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -9,14 +9,20 @@
<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="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>
<flag name="iptv">Enable support for Internet Protocol TV</flag>
+ <flag name="opus">Enable transcoding with the Opus audio codec</flag>
<flag name="satip">Enable support for IP-based Satellite TV</flag>
<flag name="timeshift">Enable TimeShift support</flag>
- <flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag>
- <flag name="dvbscan">Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
- <flag name="imagecache">Enable support for image caching</flag>
<flag name="uriparser">Use <pkg>dev-libs/uriparser</pkg></flag>
+ <flag name="vpx">Enable transcoding with the VP8/VP9 video codecs</flag>
+ <flag name="x264">Enable transcoding with the H.264 video codec</flag>
+ <flag name="x265">Enable transcoding with the HEVC video codec</flag>
+ <flag name="xmltv">Use <pkg>media-tv/xmltv</pkg></flag>
</use>
<upstream>
<remote-id type="github">tvheadend/tvheadend</remote-id>
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-4.2.4.ebuild
similarity index 51%
copy from media-tv/tvheadend/tvheadend-9999.ebuild
copy to media-tv/tvheadend/tvheadend-4.2.4.ebuild
index e6779acb3c1..d56276ff4fc 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.4.ebuild
@@ -1,67 +1,80 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils git-r3 linux-info systemd toolchain-funcs user
+inherit linux-info systemd toolchain-funcs user
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
-IUSE="capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zeroconf zlib"
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv satip systemd +timeshift uriparser xmltv zeroconf zlib"
-RDEPEND="dev-libs/openssl:=
+RDEPEND="
+ dev-libs/openssl:=
virtual/libiconv
dbus? ( sys-apps/dbus )
- ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3:= )
- libav? ( media-video/libav:= )
- )
+ dvbcsa? ( media-libs/libdvbcsa )
+ dvben50221? ( media-tv/linuxtv-dvb-apps )
+ ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
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"
+DEPEND="
+ ${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ dvb? ( virtual/linuxtv-dvb-headers )"
RDEPEND+="
- dvbscan? ( media-tv/linuxtv-dvb-apps )
+ dvb? ( media-tv/dtv-scan-tables )
xmltv? ( media-tv/xmltv )"
-CONFIG_CHECK="~INOTIFY_USER"
+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-hdhomerun.patch"
+ "${FILESDIR}/${PN}-4.2.2-dtv_scan_tables.patch"
+)
DOCS=( README.md )
pkg_setup() {
- enewuser tvheadend -1 -1 /dev/null video
-}
+ use inotify &&
+ CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-src_prepare() {
- # remove '-Werror' wrt bug #438424
- sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+ enewuser tvheadend -1 -1 /etc/tvheadend video
}
src_configure() {
CC="$(tc-getCC)" \
- econf --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share \
- --disable-hdhomerun_static \
- --disable-ffmpeg_static \
+ PKG_CONFIG="${CHOST}-pkg-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) \
+ $(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) \
@@ -69,6 +82,7 @@ src_configure() {
$(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) \
@@ -82,10 +96,11 @@ src_compile() {
src_install() {
default
- newinitd "${FILESDIR}/tvheadend.initd" tvheadend
- newconfd "${FILESDIR}/tvheadend.confd" tvheadend
+ newinitd "${FILESDIR}"/tvheadend.initd tvheadend
+ newconfd "${FILESDIR}"/tvheadend.confd tvheadend
- systemd_dounit "${FILESDIR}/tvheadend.service"
+ use systemd &&
+ systemd_dounit "${FILESDIR}"/tvheadend.service
dodir /etc/tvheadend
fperms 0700 /etc/tvheadend
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index e6779acb3c1..b3eb58292b3 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils git-r3 linux-info systemd toolchain-funcs user
+inherit git-r3 linux-info systemd toolchain-funcs user
DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
HOMEPAGE="https://tvheadend.org/"
@@ -13,64 +13,101 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS=""
-IUSE="capmt constcw +cwc dbus +dvb +dvbscan ffmpeg hdhomerun libav imagecache inotify iptv satip +timeshift uriparser xmltv zeroconf zlib"
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv opus satip systemd +timeshift uriparser vpx x264 x265 xmltv zeroconf zlib"
-RDEPEND="dev-libs/openssl:=
+RDEPEND="
+ dev-libs/openssl:=
virtual/libiconv
dbus? ( sys-apps/dbus )
- ffmpeg? (
- !libav? ( >=media-video/ffmpeg-3:= )
- libav? ( media-video/libav:= )
- )
+ dvbcsa? ( media-libs/libdvbcsa )
+ dvben50221? ( media-tv/linuxtv-dvb-apps )
+ ffmpeg? ( media-video/ffmpeg:0/55.57.57[opus?,vpx?,x264?,x265?] )
hdhomerun? ( media-libs/libhdhomerun )
uriparser? ( dev-libs/uriparser )
zeroconf? ( net-dns/avahi )
zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
+# ffmpeg sub-dependencies needed for headers only. Check under
+# src/transcoding/codec/codecs/libs for include statements.
+
+DEPEND="
+ ${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
dvb? ( virtual/linuxtv-dvb-headers )
- capmt? ( virtual/linuxtv-dvb-headers )
- virtual/pkgconfig"
+ ffmpeg? (
+ opus? ( media-libs/opus )
+ vpx? ( media-libs/libvpx )
+ x264? ( media-libs/x264 )
+ x265? ( media-libs/x265 )
+ )"
RDEPEND+="
- dvbscan? ( media-tv/linuxtv-dvb-apps )
+ dvb? ( media-tv/dtv-scan-tables )
xmltv? ( media-tv/xmltv )"
-CONFIG_CHECK="~INOTIFY_USER"
+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-hdhomerun.patch"
+ "${FILESDIR}/${PN}-4.2.2-dtv_scan_tables.patch"
+)
DOCS=( README.md )
pkg_setup() {
- enewuser tvheadend -1 -1 /dev/null video
-}
+ use inotify &&
+ CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-src_prepare() {
- # remove '-Werror' wrt bug #438424
- sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+ enewuser tvheadend -1 -1 /etc/tvheadend video
}
+# We unconditionally enable codecs that do not require additional
+# dependencies when building tvheadend. If support is missing from
+# ffmpeg at runtime then tvheadend will simply disable these codecs.
+
+# It is not necessary to specific all the --disable-*-static options as
+# most of them only take effect when --enable-ffmpeg_static is given.
+
src_configure() {
CC="$(tc-getCC)" \
- econf --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share \
- --disable-hdhomerun_static \
- --disable-ffmpeg_static \
+ PKG_CONFIG="${CHOST}-pkg-config" \
+ econf \
+ --disable-bundle \
--disable-ccache \
--disable-dvbscan \
+ --disable-ffmpeg_static \
+ --disable-hdhomerun_static \
+ --enable-libfdkaac \
+ --enable-libtheora \
+ --enable-libvorbis \
+ --nowerror \
$(use_enable capmt) \
$(use_enable constcw) \
$(use_enable cwc) \
- $(use_enable dbus) \
+ $(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 opus libopus) \
$(use_enable satip satip_server) \
$(use_enable satip satip_client) \
+ $(use_enable systemd libsystemd_daemon) \
$(use_enable timeshift) \
$(use_enable uriparser) \
+ $(use_enable vpx libvpx) \
+ $(use_enable x264 libx264) \
+ $(use_enable x265 libx265) \
$(use_enable zeroconf avahi) \
$(use_enable zlib)
}
@@ -82,10 +119,11 @@ src_compile() {
src_install() {
default
- newinitd "${FILESDIR}/tvheadend.initd" tvheadend
- newconfd "${FILESDIR}/tvheadend.confd" tvheadend
+ newinitd "${FILESDIR}"/tvheadend.initd tvheadend
+ newconfd "${FILESDIR}"/tvheadend.confd tvheadend
- systemd_dounit "${FILESDIR}/tvheadend.service"
+ use systemd &&
+ systemd_dounit "${FILESDIR}"/tvheadend.service
dodir /etc/tvheadend
fperms 0700 /etc/tvheadend
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2018-09-02 11:43 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2018-09-02 11:43 UTC (permalink / raw
To: gentoo-commits
commit: 739b54d63d1152757c3367ac57f249b751caa990
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 2 11:27:54 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 2 11:43:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=739b54d6
media-tv/tvheadend: Version bump to 4.2.6
Closes: https://bugs.gentoo.org/665086
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-tv/tvheadend/Manifest | 1 +
.../files/tvheadend-4.2.5-ffmpeg_3.5.patch | 115 ++++++++++++++++++++
.../tvheadend/files/tvheadend-4.2.5-gcc8.patch | 110 +++++++++++++++++++
media-tv/tvheadend/tvheadend-4.2.6.ebuild | 120 +++++++++++++++++++++
4 files changed, 346 insertions(+)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 37bd4a7dfce..931e594621d 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1 +1,2 @@
DIST tvheadend-4.2.4.tar.gz 21526564 BLAKE2B 19c571bb253041bd122306eaa516071d096d747b03eaf623b45b79fc0511633a75f1a0925a890207c994da001a2ba3404d1860b91236adae34e307bcf8c57796 SHA512 333a3509da198f5d96316f30fd010a216262315614db302c83405de78d29b32b1d878c0abd7fae2214713107e6955478ee3222b18888a84c57810035af882df4
+DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419 SHA512 6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709
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
new file mode 100644
index 00000000000..eaec90eabce
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.5-ffmpeg_3.5.patch
@@ -0,0 +1,115 @@
+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
new file mode 100644
index 00000000000..1891808e407
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.5-gcc8.patch
@@ -0,0 +1,110 @@
+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.6.ebuild
new file mode 100644
index 00000000000..72be6b32f04
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.2.6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs user
+
+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 ~x86"
+
+IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib"
+
+RDEPEND="
+ virtual/libiconv
+ dbus? ( sys-apps/dbus )
+ dvbcsa? ( media-libs/libdvbcsa )
+ dvben50221? ( media-tv/linuxtv-dvb-apps )
+ ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
+ hdhomerun? ( media-libs/libhdhomerun )
+ !libressl? ( dev-libs/openssl:= )
+ libressl? ( dev-libs/libressl:= )
+ uriparser? ( dev-libs/uriparser )
+ zeroconf? ( net-dns/avahi )
+ zlib? ( sys-libs/zlib )"
+
+DEPEND="
+ ${RDEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig
+ dvb? ( virtual/linuxtv-dvb-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-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 )
+
+pkg_setup() {
+ use inotify &&
+ CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
+
+ enewuser tvheadend -1 -1 /etc/tvheadend video
+}
+
+src_configure() {
+ CC="$(tc-getCC)" \
+ PKG_CONFIG="${CHOST}-pkg-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
+
+ 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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2018-11-10 15:22 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2018-11-10 15:22 UTC (permalink / raw
To: gentoo-commits
commit: b77d4a2c460d0c29a87f7b61bc7df50231e2e2f4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 10 15:20:11 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 15:21:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b77d4a2c
media-tv/tvheadend: Drop old 4.2.6
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-tv/tvheadend/Manifest | 1 -
.../files/tvheadend-4.2.5-ffmpeg_3.5.patch | 115 --------------------
.../tvheadend/files/tvheadend-4.2.5-gcc8.patch | 110 -------------------
media-tv/tvheadend/tvheadend-4.2.6.ebuild | 120 ---------------------
4 files changed, 346 deletions(-)
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index 4f11f8ea5bd..7026baf3a26 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,2 +1 @@
-DIST tvheadend-4.2.6.tar.gz 21528720 BLAKE2B 358373bc19bd4c27ddb597bb14e29e2f451d4a1efd075f40c0324d692b5fdcac0d23f2f626ba9d0ca235f7d0c91930c5bf2438d0b6537af187a9fb3fcf36c419 SHA512 6291b0ba1d9af11d5295bf6804988835e746db2d3ebbd465a22e293a1108225c8c361762b78213c881cd15d7dedd16092f28a97c9e5b38f44920848bfbaf9709
DIST tvheadend-4.2.7.tar.gz 21815613 BLAKE2B 2a90801189901c8129209d9157fbca826e5e46c2641aa08676a44f3076f4dd82c7732e188e87835ce22b19aedea96b8c816733998241a213904c9f9aff1a2537 SHA512 14dd4f452a785359614e2dfe3c210543e0bddf011b8bb994a282cfcff3f3e2573e48636e4c778c7fea39c01318053211e674911fcec3ad5f7b536bdd9e5f5aa9
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 eaec90eabce..00000000000
--- 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 1891808e407..00000000000
--- 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.6.ebuild
deleted file mode 100644
index 72be6b32f04..00000000000
--- a/media-tv/tvheadend/tvheadend-4.2.6.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs user
-
-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 ~x86"
-
-IUSE="+capmt +constcw +cwc dbus debug dvbcsa dvben50221 +dvb +ffmpeg hdhomerun +imagecache +inotify iptv libressl satip systemd +timeshift uriparser xmltv zeroconf zlib"
-
-RDEPEND="
- virtual/libiconv
- dbus? ( sys-apps/dbus )
- dvbcsa? ( media-libs/libdvbcsa )
- dvben50221? ( media-tv/linuxtv-dvb-apps )
- ffmpeg? ( media-video/ffmpeg:0/55.57.57 )
- hdhomerun? ( media-libs/libhdhomerun )
- !libressl? ( dev-libs/openssl:= )
- libressl? ( dev-libs/libressl:= )
- uriparser? ( dev-libs/uriparser )
- zeroconf? ( net-dns/avahi )
- zlib? ( sys-libs/zlib )"
-
-DEPEND="
- ${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
- dvb? ( virtual/linuxtv-dvb-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-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 )
-
-pkg_setup() {
- use inotify &&
- CONFIG_CHECK="~INOTIFY_USER" linux-info_pkg_setup
-
- enewuser tvheadend -1 -1 /etc/tvheadend video
-}
-
-src_configure() {
- CC="$(tc-getCC)" \
- PKG_CONFIG="${CHOST}-pkg-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
-
- 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] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2019-11-02 12:04 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2019-11-02 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 7cafcb0803138fba20bc535c732115d6658a9b93
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 12:02:57 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 12:04:21 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cafcb08
media-tv/tvheadend: Take upstream patch for libhdhomerun-20190621
Closes: https://bugs.gentoo.org/698592
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../files/tvheadend-4.2.8-hdhomerun.patch | 29 ++++++++++++++++++++++
media-tv/tvheadend/tvheadend-4.2.8.ebuild | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
new file mode 100644
index 00000000000..c30af8aba2a
--- /dev/null
+++ b/media-tv/tvheadend/files/tvheadend-4.2.8-hdhomerun.patch
@@ -0,0 +1,29 @@
+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/tvheadend-4.2.8.ebuild b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
index 4a49b1460b5..a20bac30f22 100644
--- a/media-tv/tvheadend/tvheadend-4.2.8.ebuild
+++ b/media-tv/tvheadend/tvheadend-4.2.8.ebuild
@@ -47,7 +47,7 @@ REQUIRED_USE="dvbcsa? ( || ( capmt constcw cwc dvben50221 ) )"
PATCHES=(
"${FILESDIR}"/${PN}-4.0.9-use_system_queue.patch
- "${FILESDIR}"/${PN}-4.2.1-hdhomerun.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
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2020-05-10 22:18 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2020-05-10 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 4d3156597c2c25b6063a9b3328f95e9f1250021d
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 22:16:36 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 10 22:16:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d315659
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 <AT> gentoo.org>
.../files/tvheadend-4.2.8-no-dvb-fix.patch | 28 ++++++++++++++++++++++
media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild | 1 +
media-tv/tvheadend/tvheadend-9999.ebuild | 1 +
3 files changed, 30 insertions(+)
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
index 00000000000..b398064292e
--- /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 2c44c55ed17..7886d755c7d 100644
--- 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 ddd46284395..e8e5c2814ed 100644
--- 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 )
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/
@ 2021-05-30 14:40 James Le Cuirot
0 siblings, 0 replies; 9+ messages in thread
From: James Le Cuirot @ 2021-05-30 14:40 UTC (permalink / raw
To: gentoo-commits
commit: de8d29d5038faa33c3bdb099df5192abc89f2172
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 14:39:44 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 30 14:39:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8d29d5
media-tv/tvheadend: Fix variable handling in systemd service file
Closes: https://bugs.gentoo.org/792456
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-tv/tvheadend/files/tvheadend.service | 2 +-
.../tvheadend/{tvheadend-4.2.8-r1.ebuild => tvheadend-4.2.8-r2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-tv/tvheadend/files/tvheadend.service b/media-tv/tvheadend/files/tvheadend.service
index cd5c5e7f911..11d3fe7a814 100644
--- a/media-tv/tvheadend/files/tvheadend.service
+++ b/media-tv/tvheadend/files/tvheadend.service
@@ -9,7 +9,7 @@ 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 -p /run/tvheadend/tvheadend.pid -c ${TVHEADEND_CONFIG} $TVHEADEND_OPTIONS
TimeoutStartSec=1m
TimeoutStopSec=20s
Restart=always
diff --git a/media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild b/media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
similarity index 100%
rename from media-tv/tvheadend/tvheadend-4.2.8-r1.ebuild
rename to media-tv/tvheadend/tvheadend-4.2.8-r2.ebuild
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-05-30 14:40 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-02 11:43 [gentoo-commits] repo/gentoo:master commit in: media-tv/tvheadend/files/, media-tv/tvheadend/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2021-05-30 14:40 James Le Cuirot
2020-05-10 22:18 James Le Cuirot
2019-11-02 12:04 James Le Cuirot
2018-11-10 15:22 James Le Cuirot
2017-12-04 22:20 James Le Cuirot
2016-05-07 15:43 Sam Jorna
2016-01-24 23:04 Sven Wegener
2015-10-13 11:24 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox