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."
+}

Reply via email to