media-tv/tvheadend: bump to -4.0.6, patch to fixing issues re IUSE iconv
authorIan Delaney <idella4@gentoo.org>
Tue, 13 Oct 2015 11:22:54 +0000 (19:22 +0800)
committerIan Delaney <idella4@gentoo.org>
Tue, 13 Oct 2015 11:23:51 +0000 (19:23 +0800)
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
media-tv/tvheadend/files/glibc_iconv.patch [new file with mode: 0644]
media-tv/tvheadend/metadata.xml
media-tv/tvheadend/tvheadend-2.12.ebuild [deleted file]
media-tv/tvheadend/tvheadend-3.2.ebuild [deleted file]
media-tv/tvheadend/tvheadend-3.4.27.ebuild
media-tv/tvheadend/tvheadend-4.0.6.ebuild [new file with mode: 0644]
media-tv/tvheadend/tvheadend-9999.ebuild

index a40c11b49b91e392f1e03377544603e4596b96f8..8d82a28e6104ea75f6c68df44765ec68a6f8cf06 100644 (file)
@@ -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 (file)
index 0000000..9118786
--- /dev/null
@@ -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
+
index e6ede4196eb1932ed3b7ab40a5afe43037f95f81..8cda002d31f28733ac7a2d8f10dec7fbb1d91079 100644 (file)
@@ -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 (file)
index aa19691..0000000
+++ /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 (file)
index 7d9b290..0000000
+++ /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."
-}
index b5e760f7488298e5fdd67c7e3e9a0891dbd67546..0a8d85fee5529c2bb424c5a71af78a8eb88bc6ff 100644 (file)
@@ -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-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
new file mode 100644 (file)
index 0000000..fc0031e
--- /dev/null
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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
+               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 ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+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 )
+       xmltv? ( media-tv/xmltv )"
+
+DEPEND="${DEPEND}
+       virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+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() {
+       # remove '-Werror' wrt bug #438424
+       sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+       epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
+}
+
+src_configure() {
+       econf --prefix="${EPREFIX}"/usr \
+               --datadir="${EPREFIX}"/usr/share \
+               --mandir="${EPREFIX}"/usr/share/man/man1 \
+               $(use_enable avahi) \
+               $(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)
+}
+
+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."
+}
index 1744e4722b9fa92b50ead04207317f9340ef5a84..495a3d139734f924254e45b23b00880d4b57609c 100644 (file)
@@ -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 )